Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Tag: v2.6.21-rc4
Commits on Mar 16, 2007
  1. Linux 2.6.21-rc4

    Linus Torvalds authored
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Mar 15, 2007
  1. Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/ker…

    Linus Torvalds authored
    …nel/git/jgarzik/netdev-2.6
    
    * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
      natsemi: Avoid IntrStatus lossage if RX state machine resets.
      natsemi: Fix NAPI for interrupt sharing
      natsemi: Consistently use interrupt enable/disable functions
      NetXen: Fix softlockup seen during hardware access
      NetXen: Bug fix for Jumbo frames on XG card
      skge: set mac address bonding fix
  2. [PATCH] sysfs: reinstate exclusion between method calls and attribute…

    Alan Stern authored Linus Torvalds committed
    … unregistration
    
    This patch (as869) reinstates the mutual exclusion between sysfs
    attribute method calls and attribute unregistration.  The
    previously-reported deadlocks have been fixed, and this exclusion is
    by far the simplest way to avoid races during driver unbinding.
    
    The check for orphaned read-buffers has been moved down slightly, so
    that the remainder of a partially-read buffer will still be available
    to userspace even after the attribute has been unregistered.
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Cc: Hugh Dickins <hugh@veritas.com>
    Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
    Cc: Oliver Neukum <oneukum@suse.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. [PATCH] sysfs and driver core: add callback helper, used by SCSI and …

    Alan Stern authored Linus Torvalds committed
    …S390
    
    This patch (as868) adds a helper routine for device drivers that need
    to set up a callback to perform some action in a different process's
    context.  This is intended for use by attribute methods that want to
    unregister themselves or their parent device.  Attribute method calls
    are mutually exclusive with unregistration, so such actions cannot be
    taken directly.
    
    Two attribute methods are converted to use the new helper routine: one
    for SCSI device deletion and one for System/390 ccwgroup devices.
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Cc: Hugh Dickins <hugh@veritas.com>
    Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
    Cc: Oliver Neukum <oneukum@suse.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/g…

    Linus Torvalds authored
    …it/jikos/hid
    
    * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid:
      HID: zeroing of bytes in output fields is bogus
      HID: allocate hid_parser in a proper way
  5. @broonie

    natsemi: Avoid IntrStatus lossage if RX state machine resets.

    broonie authored Jeff Garzik committed
    This patch fixes the poll routine for the natsemi driver so that if the
    driver detects an RX state machine lockup then no interrupts will be
    lost while the driver recovers from that.
    
    Signed-Off-By: Mark Brown <broonie@sirena.org.uk>
    
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  6. @broonie

    natsemi: Fix NAPI for interrupt sharing

    broonie authored Jeff Garzik committed
    The interrupt status register for the natsemi chips is clear on read and
    was read unconditionally from both the interrupt and from the NAPI poll
    routine, meaning that if the interrupt service routine was called (for
    example, due to a shared interrupt) while a NAPI poll was scheduled
    interrupts could be missed.  This patch fixes that by ensuring that the
    interrupt status register is only read by the interrupt handler when
    interrupts are enabled from the chip.
    
    It also reverts a workaround for this problem from the netpoll hook and
    improves the trace for interrupt events.
    
    Thanks to Sergei Shtylyov <sshtylyov@ru.mvista.com> for spotting the
    issue, Mark Huth <mhuth@mvista.com> for a simpler method and Simon
    Blake <simon@citylink.co.nz> for testing resources.
    
    Signed-Off-By: Mark Brown <broonie@sirena.org.uk>
    
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  7. @broonie

    natsemi: Consistently use interrupt enable/disable functions

    broonie authored Jeff Garzik committed
    The natsemi drivers include functions for enabling and disabling
    interrupts from the chip but these are not used in all code paths.  This
    patch changes the code paths that touch the interrupt enable register to
    use the functions.  In all cases this adds an extra PCI read to post the
    operation but since none of these are in fast paths this shouldn't be
    too much of a problem.
    
    Signed-Off-By: Mark Brown <broonie@sirena.org.uk>
    
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  8. NetXen: Fix softlockup seen during hardware access

    Linsys Contractor Mithlesh Thukral authored Jeff Garzik committed
    NetXen: This will fix a softlock seen on some machines.
    The reason was too much time was spent waiting for hardware access
    to go through.
    
    Signed-off by: Mithlesh Thukral <mithlesh@netxen.com>
    
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  9. NetXen: Bug fix for Jumbo frames on XG card

    Linsys Contractor Mithlesh Thukral authored Jeff Garzik committed
    NetXen: Set the MTU for the right port depending upon the port number
    for XG cards.
    
    Signed-off by: Mithlesh Thukral <mithlesh@netxen.com>
    
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  10. skge: set mac address bonding fix

    Stephen Hemminger authored Jeff Garzik committed
    When bonding does fail over it calls set_mac_address.  When this happens
    as the result of another port going down, the phy_mutex that is common to
    both ports is held, so it deadlocks. Setting the address doesn't need to do
    anything that needs the phy_mutex, it already has the RTNL to protect against
    other admin actions.
    
    This change just disables the receiver to avoid any hardware confusion
    while address is changing.
    
    Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
  11. Disable NMI watchdog by default properly

    Linus Torvalds authored
    This reverts commit 6ebf622 and
    replaces it with one that actually works.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Mar 14, 2007
  1. Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/ker…

    Linus Torvalds authored
    …nel/git/mfasheh/ocfs2
    
    * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/mfasheh/ocfs2:
      ocfs2_dlm: Add missing locks in dlm_empty_lockres
      ocfs2_dlm: Missing get/put lockres in dlm_run_purge_lockres
      configfs: add missing mutex_unlock()
      ocfs2: add some missing address space callbacks
      ocfs2: Concurrent access of o2hb_region->hr_task was not locked
      ocfs2: Proper cleanup in case of error in ocfs2_register_hb_callbacks()
  2. Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

    Linus Torvalds authored
    * master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
      [WATCHDOG] i8xx TCO driver - mark for removal
  3. [PATCH] m68k dma-mapping: gfp_t annotations

    Al Viro authored Linus Torvalds committed
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. [PATCH] paride endianness annotations

    Al Viro authored Linus Torvalds committed
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. [PATCH] kill bogus casts in amd64 uaccess.h

    Al Viro authored Linus Torvalds committed
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. [PATCH] atl1 trivial endianness misannotations

    Al Viro authored Linus Torvalds committed
    NB: driver is choke-full of code that will break on big-endian; as long
    as the hardware is onboard-only we can live with that, but sooner or
    later that'll need fixing.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Acked-by: Jeff Garzik <jgarzik@pobox.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. [PATCH] ANSIfy powerpc floppy.h

    Al Viro authored Linus Torvalds committed
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. [PATCH] hid-core endianness annotations

    Al Viro authored Linus Torvalds committed
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. [PATCH] cifs endianness annotations

    Al Viro authored Linus Torvalds committed
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  10. [PATCH] C99 initializers, proper use of const in drivers/ps3

    Al Viro authored Linus Torvalds committed
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Acked-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  11. [PATCH] qeth gfp_t annotations

    Al Viro authored Linus Torvalds committed
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  12. [PATCH] cciss endian annotations

    Al Viro authored Linus Torvalds committed
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  13. [PATCH] trivial ATA iomem annotations

    Al Viro authored Linus Torvalds committed
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Acked-by: Jeff Garzik <jgarzik@pobox.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  14. [PATCH] sparc: nr_free_pages() is unsigned long

    Al Viro authored Linus Torvalds committed
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Acked-by: William Irwin <wli@holomorphy.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  15. [PATCH] pasemi trivial iomem annotations

    Al Viro authored Linus Torvalds committed
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Acked-by: Olof Johansson <olof@lixom.net>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  16. [PATCH] constant should be long

    Al Viro authored Linus Torvalds committed
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Acked-by: Olof Johansson <olof@lixom.net>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  17. [PATCH] dmfe trivial endianness annotations

    Al Viro authored Linus Torvalds committed
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Acked-by: Jeff Garzik <jgarzik@pobox.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  18. [PATCH] fastcall still doesn't make sense in paravirt

    Al Viro authored Linus Torvalds committed
    Andi had removed a bunch of those, but one more had creeped in...
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  19. [PATCH] misc NULL noise

    Al Viro authored Linus Torvalds committed
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  20. [PATCH] rtc-cmos needs RTC_ALWAYS_BCD known

    Al Viro authored Linus Torvalds committed
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  21. [PATCH] sparc: have dma-mapping.h include generic/dma-mapping-broken …

    Al Viro authored Linus Torvalds committed
    …in non-PCI case
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  22. [PATCH] BLK_DEV_IDE_CELLEB dependency fix

    Al Viro authored Linus Torvalds committed
    It's bool and it depends on IDE => should depend on IDE=y
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  23. [PATCH] include of asm/pgtable.h in nfsfh is bogus

    Al Viro authored Linus Torvalds committed
    not needed and actually breaks build on frv, while we are at it
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Something went wrong with that request. Please try again.