Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Oct 11, 2009
  1. @torvalds

    Linux 2.6.32-rc4

    torvalds authored
  2. @torvalds

    pci: increase alignment to make more space for hidden code

    Yinghai Lu authored torvalds committed
    As reported in
    
    	http://bugzilla.kernel.org/show_bug.cgi?id=13940
    
    on some system when acpi are enabled, acpi clears some BAR for some
    devices without reason, and kernel will need to allocate devices for
    them.  It then apparently hits some undocumented resource conflict,
    resulting in non-working devices.
    
    Try to increase alignment to get more safe range for unassigned devices.
    
    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. @torvalds

    Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

    torvalds authored
    * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (21 commits)
      [S390] dasd: fix race condition in resume code
      [S390] Add EX_TABLE for addressing exception in usercopy functions.
      [S390] 64-bit register support for 31-bit processes
      [S390] hibernate: Use correct place for CPU address in lowcore
      [S390] pm: ignore time spend in suspended state
      [S390] zcrypt: Improve some comments
      [S390] zcrypt: Fix sparse warning.
      [S390] perf_counter: fix vdso detection
      [S390] ftrace: drop nmi protection
      [S390] compat: fix truncate system call wrapper
      [S390] Provide arch specific mdelay implementation.
      [S390] Fix enabled udelay for short delays.
      [S390] cio: allow setting boxed devices offline
      [S390] cio: make not operational handling consistent
      [S390] cio: make disconnected handling consistent
      [S390] Fix memory leak in /proc/cio_ignore
      [S390] cio: channel path memory leak
      [S390] module: fix memory leak in s390 module loader
      [S390] Enable kmemleak on s390.
      [S390] 3270 console build fix
      ...
  4. @bernds @torvalds

    ROMFS: fix length used with romfs_dev_strnlen() function

    bernds authored torvalds committed
    An interestingly corrupted romfs file system exposed a problem with the
    romfs_dev_strnlen function: it's passing the wrong value to its helpers.
    Rather than limit the string to the length passed in by the callers, it
    uses the size of the device as the limit.
    
    Signed-off-by: Bernd Schmidt <bernds_cb1@t-online.de>
    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (32 commits)
      USB: serial: no unnecessary GFP_ATOMIC in oti6858
      USB: serial: fix race between unthrottle and completion handler in visor
      USB: serial: fix assumption that throttle/unthrottle cannot sleep
      USB: serial: fix race between unthrottle and completion handler in symbolserial
      USB: serial: fix race between unthrottle and completion handler in opticon
      USB: ehci: Fix isoc scheduling boundary checking.
      USB: storage: When a device returns no sense data, call it a Hardware Error
      USB: small fix in error case of suspend in generic usbserial code
      USB: visor: fix trivial accounting bug in visor driver
      USB: Fix throttling in generic usbserial driver
      USB: cp210x: Add support for the DW700 UART
      USB: ipaq: fix oops when device is plugged in
      USB: isp1362: fix build warnings on 64-bit systems
      USB: gadget: imx_udc: Use resource size
      USB: storage: iRiver P7 UNUSUAL_DEV patch
      USB: musb: make HAVE_CLK support optional
      USB: xhci: Fix dropping endpoints from the xHC schedule.
      USB: xhci: Don't wait for a disable slot cmd when HC dies.
      USB: xhci: Handle canceled URBs when HC dies.
      USB: xhci: Stop debugging polling loop when HC dies.
      ...
  6. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
      Staging: comedi: fix build on arches that don't want comedi drivers
      Staging: comedi: pcmcia irq fixes
      Staging: comedi: ni_pcimio: Added device id for pxi-6225.
      Staging: comedi: ni_65xx.c: fix output inversion problem.
      Staging: comedi: ni_65xx.c: fix insn_bits shift calculation.
      Staging: comedi: s526: fixes for pulse generator
      Staging: comedi: s526: Take account of arch's byte order.
      Staging: comedi: s526: Get rid of global variable 'cmReg'.
      Staging: comedi: s526: Fix number of channels on DIO subdevice
      Staging: comedi: cb_pcidio: fix "section mismatch" error
      Staging: comedi: jr3_pci: Initialize transf variable fully in jr3_pci_poll_subdevice().
      Staging: comedi: Corrected type of a printk argument in resize_async_buffer().
      Staging: p9auth: a few fixes
      Staging: rtl8192e: Add #include <linux/vmalloc.h>
      Staging: iio: Don't build on s390
      Staging: winbond: implement prepare_multicast and fix API usage
      Staging: w35und: Fix ->beacon_int breakage
      Staging: remove cowloop driver
      Staging: remove agnx driver
      Staging: comedi: serial2002: fix include build issue
  7. @torvalds

    Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/…

    torvalds authored
    …kernel/git/jdelvare/staging
    
    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
      hwmon: (s3c-hwmon) Disable build for S3C64xx
      MAINTAINERS: Fix Riku Voipio's address
      hwmon: (asus_atk0110) Enable the EC
      hwmon: (asus_atk0110) Refactor the code
      hwmon: (sht15) Fix spurious section mismatch warning
  8. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
      Btrfs: fix file clone ioctl for bookend extents
      Btrfs: fix uninit compiler warning in cow_file_range_nocow
      Btrfs: constify dentry_operations
      Btrfs: optimize back reference update during btrfs_drop_snapshot
      Btrfs: remove negative dentry when deleting subvolumne
      Btrfs: optimize fsync for the single writer case
      Btrfs: async delalloc flushing under space pressure
      Btrfs: release delalloc reservations on extent item insertion
      Btrfs: delay clearing EXTENT_DELALLOC for compressed extents
      Btrfs: cleanup extent_clear_unlock_delalloc flags
      Btrfs: fix possible softlockup in the allocator
      Btrfs: fix deadlock on async thread startup
  9. @torvalds

    headers: remove sched.h from interrupt.h

    Alexey Dobriyan authored torvalds committed
    After m68k's task_thread_info() doesn't refer to current,
    it's possible to remove sched.h from interrupt.h and not break m68k!
    Many thanks to Heiko Carstens for allowing this.
    
    Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
  10. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixe…

    torvalds authored
    …s-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (34 commits)
      [SCSI] qla2xxx: Fix NULL ptr deref bug in fail path during queue create
      [SCSI] st: fix possible memory use after free after MTSETBLK ioctl
      [SCSI] be2iscsi: Moving to pci_pools v3
      [SCSI] libiscsi: iscsi_session_setup to allow for private space
      [SCSI] be2iscsi: add 10Gbps iSCSI - BladeEngine 2 driver
      [SCSI] zfcp: Fix hang when offlining device with offline chpid
      [SCSI] zfcp: Fix lockdep warning when offlining device with offline chpid
      [SCSI] zfcp: Fix oops during shutdown of offline device
      [SCSI] zfcp: Fix initial device and cfdc for delayed adapter allocation
      [SCSI] zfcp: correctly initialize unchained requests
      [SCSI] mpt2sas: Bump version 02.100.03.00
      [SCSI] mpt2sas: Support dev remove when phy status is MPI2_EVENT_SAS_TOPO_PHYSTATUS_VACANT
      [SCSI] mpt2sas: Timeout occurred within the HANDSHAKE logic while waiting on firmware to ACK.
      [SCSI] mpt2sas: Call init_completion on a per request basis.
      [SCSI] mpt2sas: Target Reset will be issued from Interrupt context.
      [SCSI] mpt2sas: Added SCSIIO, Internal and high priority memory pools to support multiple TM
      [SCSI] mpt2sas: Copyright change to 2009.
      [SCSI] mpt2sas: Added mpi2_history.txt for MPI2 headers.
      [SCSI] mpt2sas: Update driver to MPI2 REV K headers.
      [SCSI] bfa: Brocade BFA FC SCSI driver
      ...
Commits on Oct 9, 2009
  1. @gregkh

    USB: serial: no unnecessary GFP_ATOMIC in oti6858

    Oliver Neukum authored gregkh committed
    GFP_ATOMIC without good cause is evil.
    
    Signed-off-by: Oliver Neukum <oliver@neukum.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  2. @gregkh

    USB: serial: fix race between unthrottle and completion handler in visor

    Oliver Neukum authored gregkh committed
    usb:usbserial:visor: fix race between unthrottle and completion handler
    
    visor_unthrottle() mustn't resubmit the URB unconditionally
    as the URB may still be running.
    
    the same bug as opticon.
    
    Signed-off-by: Oliver Neukum <oliver@neukum.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  3. @gregkh

    USB: serial: fix assumption that throttle/unthrottle cannot sleep

    Oliver Neukum authored gregkh committed
    many serial subdrivers are clearly written as if throttle/unthrottle
    cannot sleep. This leads to unneeded atomic submissions. This
    patch converts affected drivers in a way to makes very clear that
    throttle/unthrottle can sleep. Thus future misdesigns can be avoided
    and efficiency and reliability improved.
    
    This removes any such assumption using GFP_KERNEL and spin_lock_irq()
    
    Signed-off-by: Oliver Neukum <oliver@neukum.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  4. @gregkh

    USB: serial: fix race between unthrottle and completion handler in sy…

    Oliver Neukum authored gregkh committed
    …mbolserial
    
    usb:usbserial:symbolserial: fix race between unthrottle and completion handler
    
    symbol_unthrottle() mustn't resubmit the URB unconditionally
    as the URB may still be running.
    
    the same bug as opticon.
    
    Signed-off-by: Oliver Neukum <oliver@neukum.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  5. @gregkh

    USB: serial: fix race between unthrottle and completion handler in op…

    Oliver Neukum authored gregkh committed
    …ticon
    
    usb:usbserial:opticon: fix race between unthrottle and completion handler
    
    opticon_unthrottle() mustn't resubmit the URB unconditionally
    as the URB may still be running.
    
    Signed-off-by: Oliver Neukum <oliver@neukum.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  6. @gregkh

    USB: ehci: Fix isoc scheduling boundary checking.

    Sarah Sharp authored gregkh committed
    The EHCI driver does some bounds checking when it's scheduling an iTD for
    an active endpoint.  It sets the local variable start to
    stream->next_uframe and moves that variable further in the schedule if
    necessary.  However, the driver fails to do anything with start before
    jumping to the ready label and setting the URB's starting frame to
    stream->next_uframe.  Alan Stern confirms the EHCI driver should set
    stream->next_uframe to start before jumping.
    
    Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
    Acked-by: Alan Stern <stern@rowland.harvard.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  7. @gregkh

    USB: storage: When a device returns no sense data, call it a Hardware…

    Alan Stern authored gregkh committed
    … Error
    
    This patch (as1294) fixes a problem that has plagued users for several
    kernel releases.  Some USB mass-storage devices don't return any sense
    data when they encounter certain kinds of errors.  The SCSI layer
    interprets this to mean that the operation should be retried, and the
    same thing happens -- over and over again with no limit.  In some
    circumstances (such as when a bus reset occurs) that is the right
    thing to do, but not here.
    
    The patch checks for this condition (a transport failure with no sense
    data) and changes the result code to DID_ERROR and the sense code to
    Hardware Error.  This does get only a limited number of retries, and
    so the command will fail relatively quickly instead of getting stuck
    in an infinite loop.
    
    This fixes a large part of Bugzilla #14118.
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Tested-by: Mantas Mikulenas <grawity@gmail.com>
    CC: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  8. @gregkh

    USB: small fix in error case of suspend in generic usbserial code

    Oliver Neukum authored gregkh committed
    usb:usbserial: fix flags in error case of suspension
    
    suspended flag must be reset in error case
    
    Signed-off-by: Oliver Neukum <oliver@neukum.org>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  9. @gregkh

    USB: visor: fix trivial accounting bug in visor driver

    Oliver Neukum authored gregkh committed
    usb:usbserial:visor: fix accounting in error case
    
    data not pushed to the tty layer due to an error mustn't be counted
    
    Signed-off-by: Oliver Neukum <oliver@neukum.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  10. @gregkh

    USB: Fix throttling in generic usbserial driver

    Joris van Rantwijk authored gregkh committed
    The generic usbserial driver in Linux 2.6.31 halts its receiving
    channel in response to throttle requests from the line discipline.
    Unfortunately it drops the contents of the first URB received after
    throttling takes effect. This patch corrects that problem.
    
    Signed-off-by: Joris van Rantwijk <jorispubl@xs4all.nl>
    Acked-by: Johan Hovold <jhovold@gmail.com>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  11. @gregkh

    USB: cp210x: Add support for the DW700 UART

    Éric Piel authored gregkh committed
    In the Dell inspiron mini 10, the GPS is connected via a cp2102. This patch
    adds detection of this USB device. (I haven't managed to use the GPS under
    Linux yet, though)
    
    Signed-off-by: Éric Piel <eric.piel@tremplin-utc.net>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  12. @gregkh

    USB: ipaq: fix oops when device is plugged in

    Alan Stern authored gregkh committed
    This patch (as1293) fixes a problem with the ipaq serial driver.  It
    tries to bind to all the interfaces, even those that don't have enough
    endpoints.  The symptom is an invalid memory reference and oops when
    the device is plugged in.
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    CC: stable <stable@kernel.org>
    Tested-by: Matthias Geissert <geissert@mathematik.tu-darmstadt.de>
    Tested-by: Tilman Schmidt <tilman@imap.cc>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  13. @vapier @gregkh

    USB: isp1362: fix build warnings on 64-bit systems

    vapier authored gregkh committed
    A bunch of places assumed pointers were 32-bits in size (bit checking and
    debug output), but none of these affected runtime functionality.
    
    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  14. @tklauser @gregkh

    USB: gadget: imx_udc: Use resource size

    tklauser authored gregkh committed
    Use the resource_size function instead of manually calculating the
    resource size. This reduces the chance of introducing off-by-one errors.
    
    Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  15. @gregkh

    USB: storage: iRiver P7 UNUSUAL_DEV patch

    Sergey Pinaev authored gregkh committed
    Signed-off-by: Phil Dibowitz <phil@ipom.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  16. @vapier @gregkh

    USB: musb: make HAVE_CLK support optional

    vapier authored gregkh committed
    The Blackfin port doesn't support HAVE_CLK and the musb driver works fine
    with support stubbed out, so take the existing Blackfin clk stubs and move
    them to common musb code so we can drop the Kconfig dependency.
    
    Signed-off-by: Bryan Wu <cooloney@kernel.org>
    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  17. @gregkh

    USB: xhci: Fix dropping endpoints from the xHC schedule.

    Sarah Sharp authored gregkh committed
    When an endpoint is to be dropped from the hardware bandwidth schedule, we
    want to clear its add flag.
    
    Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  18. @gregkh

    USB: xhci: Don't wait for a disable slot cmd when HC dies.

    Sarah Sharp authored gregkh committed
    When the host controller dies or is removed while a device is plugged in,
    the USB core will attempt to deallocate the struct usb_device.  That will
    call into xhci_free_dev().  This function used to attempt to submit a
    disable slot command to the host controller and clean up the device
    structures when that command returned.  Change xhci_free_dev() to skip the
    command submission and just free the memory if the host controller died.
    
    Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  19. @gregkh

    USB: xhci: Handle canceled URBs when HC dies.

    Sarah Sharp authored gregkh committed
    When the host controller dies (e.g. it is removed from a PCI card slot),
    the xHCI driver cannot expect commands to complete.  The buggy code this
    patch fixes would mark an URB as canceled and then expect the URB to be
    completed when the stop endpoint command completed.  That would never
    happen if the host controller was dead, so the USB core would just hang in
    the disconnect code.
    
    If the host controller died, and the driver asks to cancel an URB, free
    any structures associated with that URB and immediately give it back.
    
    Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  20. @gregkh

    USB: xhci: Stop debugging polling loop when HC dies.

    Sarah Sharp authored gregkh committed
    If the host controller card is removed from the system, stop the timer
    function to debug the xHCI rings.
    
    Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  21. @imrehg @gregkh

    USB: usbtmc: fix timeout increase

    imrehg authored gregkh committed
    The current 10ms timeout is too short for some normal USBTMC device
    operation, increase it to a value which was tested with previously
    affected Tektronix oscilloscopes.
    
    Signed-off-by: Gergely Imreh <imrehg@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  22. @gregkh

    USB: option: Patch for Huawei Mobile Broadband E270+ Modem

    Ronnie Furuskog authored gregkh committed
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  23. @pet0m @gregkh

    USB: option: Toshiba G450 device id

    pet0m authored gregkh committed
    Signed-off-by: Peter Magdina <peter@magdina.sk>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  24. @jirislaby @gregkh

    USB: usblcd, fix memory leak

    jirislaby authored gregkh committed
    Stanse found a memory leak in lcd_probe. Instead of returning without
    releasing the memory, jump to the error label which frees it.
    
    http://stanse.fi.muni.cz/
    
    Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  25. @gregkh

    USB: serial: sierra driver version change to 1.3.8

    Elina Pasheva authored gregkh committed
    Updated sierra driver version from 1.3.7 to 1.3.8 now that the autosuspend
    capabilities were added to the driver.
    
    Signed-off-by: Elina Pasheva <epasheva@sierrawireless.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Something went wrong with that request. Please try again.