Permalink
Switch branches/tags
Commits on Apr 23, 2010
  1. Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/k…

    torvalds committed Apr 23, 2010
    …ernel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      libata: ensure NCQ error result taskfile is fully initialized before returning it via qc->result_tf.
      libata: fix docs, RE port and device of libata.force ID separated by point
      pata_pcmcia/ide-cs: add IDs for transcend and kingston cards
      libata: fix locking around blk_abort_request()
  2. libata: ensure NCQ error result taskfile is fully initialized

    Jeff Garzik committed with Jeff Garzik Apr 23, 2010
    before returning it via qc->result_tf.
    
    Cc: stable@kernel.org
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  3. libata: fix docs, RE port and device of libata.force ID separated by …

    Roman Fietze committed with Jeff Garzik Apr 21, 2010
    …point
    
    According to libata-core correctly around line 6572:
    
    	/* parse id */
    	p = strchr(id, '.');
    	...
    
    the optional device is separated from the port in the libata.force ID
    by a point or dot instead of by a colon.
    
    Fix documentation to reflect this.
    
    Signed-off-by: Roman Fietze <roman.fietze@telemotive.de>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  4. pata_pcmcia/ide-cs: add IDs for transcend and kingston cards

    Kristoffer Ericson committed with Jeff Garzik Apr 19, 2010
    This patch adds idstrings for Kingston 1GB/4GB and Transcend 4GB/8GB.
    
    Signed-off-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  5. libata: fix locking around blk_abort_request()

    htejun committed with Jeff Garzik Apr 14, 2010
    blk_abort_request() expectes queue lock to be held by the caller.
    Grab it before calling the function.
    
    Lack of this synchronization led to infinite loop on corrupt
    q->timeout_list.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Cc: Jens Axboe <axboe@kernel.dk>
    Cc: stable@kernel.org
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  6. Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

    torvalds committed Apr 23, 2010
    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
      usb: Increase timeout value for device reset
      USB: put claimed interfaces in the "suspended" state
      USB: EHCI: defer reclamation of siTDs
      USB: fix remote wakeup settings during system sleep
      USB: pl2303: add AdLink ND-6530 USB IDs
      USB: Add id for HP ev2210 a.k.a Sierra MC5725 miniPCI-e Cell Modem.
      USB: OHCI: DA8xx/OMAP-L1x: fix up macro rename
      USB: qcaux: add LG Rumor and Sanyo Katana LX device IDs
      usb: wusb: don't overflow the Keep Alive IE buffer
      USB: ehci: omap: fix kernel panic with rmmod
      USB: fixed bug in usbsevseg using USB autosuspend incorrectly
      USB: ti_usb_3410_5052: adding multitech dialup fax/modem devices
  7. Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-cor…

    torvalds committed Apr 23, 2010
    …e-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
      sysfs: use sysfs_attr_init in ASUS atk0110 driver
      Documentation/HOWTO: update git home URL
      Documentation: -stable rules: upstream commit ID requirement reworded
  8. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Apr 23, 2010
    …/git/anholt/drm-intel
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
      drm/i915: use PIPE_CONTROL instruction on Ironlake and Sandy Bridge
      drm/i915: cleanup FBC buffers at unload time
      drm/i915: fix tiling limits for i915 class hw v2
      drm/i915: set DIDL using the ACPI video output device _ADR method return.
      drm/i915: Fix 82854 PCI ID, and treat it like other 85X
      drm/i915: Attempt to fix watermark setup on 85x (v2)
  9. Merge branch 'for-linus' of git://neil.brown.name/md

    torvalds committed Apr 23, 2010
    * 'for-linus' of git://neil.brown.name/md:
      md/raid5: fix previous patch.
Commits on Apr 22, 2010
  1. sysfs: use sysfs_attr_init in ASUS atk0110 driver

    Jiri Kosina committed with gregkh Apr 15, 2010
    Annotate dynamic sysfs attribute in atk_create_files(). This gets
    rid of the following lockdep warning:
    
     BUG: key ffff8800379ca670 not in .data!
     ------------[ cut here ]------------
     WARNING: at kernel/lockdep.c:2696 lockdep_init_map+0xd2/0x108()
     Hardware name: P5K PRO
     Modules linked in: asus_atk0110(+) pata_acpi firewire_ohci ata_generic
     dm_multipath firewire_core crc_itu_t pata_marvell floppy
     Pid: 599, comm: modprobe Not tainted 2.6.34-rc4 #27
     Call Trace:
      [<ffffffff8104cdb0>] warn_slowpath_common+0x7c/0x94
      [<ffffffff8104cddc>] warn_slowpath_null+0x14/0x16
      [<ffffffff81077c4d>] lockdep_init_map+0xd2/0x108
      [<ffffffff81165873>] sysfs_add_file_mode+0x66/0xa2
      [<ffffffff811658c0>] sysfs_add_file+0x11/0x13
      [<ffffffff8116594b>] sysfs_create_file+0x2a/0x2c
      [<ffffffff812c1f9c>] device_create_file+0x19/0x1b
      [<ffffffffa005b4fd>] atk_add+0x58b/0x72e [asus_atk0110]
      [<ffffffff812572a1>] acpi_device_probe+0x50/0x122
      [<ffffffff812c46af>] driver_probe_device+0xa2/0x127
      [<ffffffff812c4783>] __driver_attach+0x4f/0x6b
      [<ffffffff812c4734>] ? __driver_attach+0x0/0x6b
      [<ffffffff812c3c94>] bus_for_each_dev+0x59/0x8e
      [<ffffffff812c4519>] driver_attach+0x1e/0x20
      [<ffffffff812c4152>] bus_add_driver+0xb9/0x207
      [<ffffffff812c4a5f>] driver_register+0x9d/0x10e
      [<ffffffffa005f000>] ? atk0110_init+0x0/0x31 [asus_atk0110]
      [<ffffffff81257c7c>] acpi_bus_register_driver+0x43/0x45
      [<ffffffffa005f015>] atk0110_init+0x15/0x31 [asus_atk0110]
      [<ffffffffa005f000>] ? atk0110_init+0x0/0x31 [asus_atk0110]
      [<ffffffff81002069>] do_one_initcall+0x5e/0x15e
      [<ffffffff81085075>] sys_init_module+0xd8/0x239
      [<ffffffff81009cf2>] system_call_fastpath+0x16/0x1b
     ---[ end trace 4d0c84007055efb9 ]---
     BUG: key ffff8800379ca638 not in .data!
     BUG: key ffff8800379ca6a8 not in .data!
     BUG: key ffff8800379ca6e0 not in .data!
     BUG: key ffff880036f73670 not in .data!
     BUG: key ffff880036f73638 not in .data!
     BUG: key ffff880036f736a8 not in .data!
     BUG: key ffff880036f736e0 not in .data!
     BUG: key ffff880036f76c70 not in .data!
     BUG: key ffff880036f76c38 not in .data!
     BUG: key ffff880036f76ca8 not in .data!
     BUG: key ffff880036f76ce0 not in .data!
     BUG: key ffff8800368e7670 not in .data!
     BUG: key ffff8800368e7638 not in .data!
     BUG: key ffff8800368e76a8 not in .data!
     BUG: key ffff8800368e76e0 not in .data!
     BUG: key ffff880036ef7670 not in .data!
     BUG: key ffff880036ef7638 not in .data!
     BUG: key ffff880036ef76a8 not in .data!
     BUG: key ffff880036ef76e0 not in .data!
     BUG: key ffff8800373ccc70 not in .data!
     BUG: key ffff8800373ccc38 not in .data!
     BUG: key ffff8800373ccca8 not in .data!
     BUG: key ffff8800373ccce0 not in .data!
     BUG: key ffff880037a60870 not in .data!
     BUG: key ffff880037a60838 not in .data!
     BUG: key ffff880037a608a8 not in .data!
     BUG: key ffff880037a608e0 not in .data!
     BUG: key ffff880037355070 not in .data!
     BUG: key ffff880037355038 not in .data!
     BUG: key ffff8800373550a8 not in .data!
     BUG: key ffff8800373550e0 not in .data!
     BUG: key ffff8800378c2670 not in .data!
     BUG: key ffff8800378c2638 not in .data!
     BUG: key ffff8800378c26a8 not in .data!
     BUG: key ffff8800378c26e0 not in .data!
     BUG: key ffff880036ef7e70 not in .data!
     BUG: key ffff880036ef7e38 not in .data!
     BUG: key ffff880036ef7ea8 not in .data!
     BUG: key ffff880036ef7ee0 not in .data!
    
    Cc: Eric W. Biederman <ebiederm@xmission.com>
    Reported-by: Dhaval Giani <dhaval.giani@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    Tested-by: Dhaval Giani <dhaval.giani@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  2. Documentation/HOWTO: update git home URL

    Randy Dunlap committed with gregkh Apr 6, 2010
    Update git home page info.
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  3. Documentation: -stable rules: upstream commit ID requirement reworded

    Stefan Richter committed with gregkh Apr 1, 2010
    It is a hard requirement to include the upstream commit ID in the
    changelog of a -stable submission, not just a courtesy to the stable
    team.  This concerns only mail submission though, which is no longer
    the only way into stable.  (Also, fix a double "the".)
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
    Acked-by: Randy Dunlap <rdunlap@xenotime.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  4. usb: Increase timeout value for device reset

    Dinh Nguyen committed with gregkh Apr 13, 2010
    It seems that for USB IP on Freescale MX5x processors, it needs >750
    usec for the reset to complete. This change should not hurt any other
    EHCI hardware.
    
    Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  5. USB: put claimed interfaces in the "suspended" state

    AlanStern committed with gregkh Apr 9, 2010
    This patch (as1370) fixes a bug in the USB runtime power management
    code.  When a driver claims an interface, it doesn't expect to need to
    call usb_autopm_get_interface() or usb_autopm_put_interface() for
    runtime PM to work.  Runtime PM can be controlled by the driver's
    primary interface; the additional interfaces it claims shouldn't
    interfere.  As things stand, the claimed interfaces will prevent the
    device from autosuspending.
    
    To fix this problem, the patch sets interfaces to the suspended state
    when they are claimed.
    
    Also, although in theory this shouldn't matter, the patch changes the
    suspend code so that interfaces are suspended in reverse order from
    detection and resuming.  This is how the PM core works, and we ought
    to use the same approach.
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Debugged-and-tested-by: Dominik Brodowski <linux@dominikbrodowski.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  6. USB: EHCI: defer reclamation of siTDs

    AlanStern committed with gregkh Apr 8, 2010
    This patch (as1369) fixes a problem in ehci-hcd.  Some controllers
    occasionally run into trouble when the driver reclaims siTDs too
    quickly.  This can happen while streaming audio; it causes the
    controller to crash.
    
    The patch changes siTD reclamation to work the same way as iTD
    reclamation: Completed siTDs are stored on a list and not reused until
    at least one frame has passed.
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Tested-by: Nate Case <ncase@xes-inc.com>
    CC: <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  7. USB: fix remote wakeup settings during system sleep

    AlanStern committed with gregkh Apr 2, 2010
    This patch (as1363) changes the way USB remote wakeup is handled
    during system sleeps.  It won't be enabled unless an interface driver
    specifically needs it.  Also, it won't be enabled during the FREEZE or
    QUIESCE phases of hibernation, when the system doesn't respond to
    wakeup events anyway.  Finally, if the device is already
    runtime-suspended with remote wakeup enabled, but wakeup is supposed
    to be disabled for the system sleep, the device gets woken up so that
    it can be suspended again with the proper wakeup setting.
    
    This will fix problems people have reported with certain USB webcams
    that generate wakeup requests when they shouldn't, and as a result
    cause system suspends to fail.  See
    
    	https://bugs.launchpad.net/ubuntu/+source/linux/+bug/515109
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Tested-by: Erik Andrén <erik.andren@gmail.com>
    CC: <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  8. USB: pl2303: add AdLink ND-6530 USB IDs

    Manuel Jander committed with gregkh Mar 29, 2010
    I read a rumor that the AdLink ND6530 USB RS232, RS422 and RS485
    isolated adapter is actually a PL2303 based usb serial adapter. I
    tried it out, and as far as I can tell it works.
    
    Signed-off-by: Manuel Jander <manuel.jander@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  9. USB: Add id for HP ev2210 a.k.a Sierra MC5725 miniPCI-e Cell Modem.

    kassah committed with gregkh Mar 26, 2010
    Signed-off-by: William Lightning <kassah@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  10. USB: OHCI: DA8xx/OMAP-L1x: fix up macro rename

    Sergei Shtylyov committed with gregkh Mar 26, 2010
    It appears that the DA8xx/OMAP-L1x glue layer went into the kernel uncompilable:
    commit 1960e69 (davinci: da8xx/omapl1: add
    support for the second sysconfig module) has renamed DA8XX_SYSCFG_* macros to
    DA8XX_SYSCFG0_* and it's been committed before the glue layer...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  11. USB: qcaux: add LG Rumor and Sanyo Katana LX device IDs

    dcbw committed with gregkh Mar 23, 2010
    These phones also have the familiar ttyACM0/ttyUSB0 schizophrenia when
    placed into "Dial-up Networking" mode after connecting a USB cable.
    
    Signed-off-by: Dan Williams <dcbw@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  12. usb: wusb: don't overflow the Keep Alive IE buffer

    David Vrabel committed with gregkh Mar 22, 2010
    The Keep Alive IE only has space for WUIE_ELT_MAX (== 4) device addresses.
    
    Signed-off-by: David Vrabel <david.vrabel@csr.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  13. USB: ehci: omap: fix kernel panic with rmmod

    Ajay Kumar Gupta committed with gregkh Mar 18, 2010
    Sets the regulator values to NULL if they are not defined. This
    is required to fix the kernel panic in exit path when EHCI module
    is removed on the platforms where EHCI regulator are not set.
    
    Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  14. USB: fixed bug in usbsevseg using USB autosuspend incorrectly

    harrisonmetz committed with gregkh Mar 9, 2010
    This patch fixes a bug with the usbsevseg driver which assumed that USB
    autosuspend will always be used.
    
    Signed-off-by: Harrison Metzger <harrisonmetz@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  15. USB: ti_usb_3410_5052: adding multitech dialup fax/modem devices

    Alex Manoussakis committed with gregkh Apr 22, 2010
    The following patch adds support for Multitech Systems' MT9234MU and
    MT9234ZBA usb dialup fax modems. It is based on a patch and firmware
    provided to me by Multitech Systems' support, after I reported to them
    that my MT9234MU modem was not working with recent linux kernels.
    
    Signed-off-by: Alex Manoussakis <alex@juniper.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  16. drm/i915: use PIPE_CONTROL instruction on Ironlake and Sandy Bridge

    jbarnes993 committed with anholt Apr 21, 2010
    Since 965, the hardware has supported the PIPE_CONTROL command, which
    provides fine grained GPU cache flushing control.  On recent chipsets,
    this instruction is required for reliable interrupt and sequence number
    reporting in the driver.
    
    So add support for this instruction, including workarounds, on Ironlake
    and Sandy Bridge hardware.
    
    https://bugs.freedesktop.org/show_bug.cgi?id=27108
    
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Tested-by: Chris Wilson <chris@chris-wilson.co.uk>
    Signed-off-by: Eric Anholt <eric@anholt.net>
  17. md/raid5: fix previous patch.

    neilbrown committed Apr 22, 2010
    Previous patch changes stripe and chunk_number to sector_t but
    mistakenly did not update all of the divisions to use sector_dev().
    
    This patch changes all the those divisions (actually the '%' operator)
    to sector_div.
    
    Signed-off-by: NeilBrown <neilb@suse.de>
    Cc: stable@kernel.org
    Tested-by: Stefan Lippers-Hollmann <s.l-h@gmx.de>
  18. drm/i915: cleanup FBC buffers at unload time

    jbarnes993 committed with anholt Apr 21, 2010
    This keeps the memory manager from complaining when we take it down.
    
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Eric Anholt <eric@anholt.net>
  19. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Apr 22, 2010
    …/git/ieee1394/linux1394-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
      firewire: ohci: wait for local CSR lock access to finish
      firewire: ohci: prevent aliasing of locally handled register addresses
      firewire: core: fw_iso_resource_manage: return -EBUSY when out of resources
      firewire: core: fix retries calculation in iso manage_channel()
      firewire: cdev: fix cut+paste mistake in disclaimer
  20. dri-devel mailing list moved - update MAINTAINERS

    valdisk committed with torvalds Apr 22, 2010
    I posted to dri-devel@lists.sourceforge.net, and got a bounce back:
    
       The dri-devel list has moved to freedesktop.org (see
       http://lists.freedesktop.org/mailman/listinfo/dri-devel). If you were
       subscribed to the list here, the subscription should have been
       transferred to the new location.
    
       Please only post to the new list.
    
    Fix MAINTAINERS to correspond.
    
    Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  21. Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git…

    torvalds committed Apr 22, 2010
    …/tj/misc
    
    * 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc:
      uml: Fix build breakage after slab.h changes
  22. scsi: fix operator precedence warning

    Randy Dunlap committed with torvalds Apr 22, 2010
    Fix operator precedence warning (from sparse), which results in the
    data value always being 0:
    
    drivers/scsi/qla4xxx/ql4_mbx.c:470:66: warning: right shift by bigger than source value
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Acked-by: Ravi Anand <ravi.anand@qlogic.com>
    Cc: David C Somayajulu <david.somayajulu@qlogic.com>
    Cc: Karen Higgins <karen.higgins@qlogic.com>
    Cc: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  23. Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

    torvalds committed Apr 22, 2010
    * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
      [S390] zcore: Fix reipl device detection
      [S390] vdso: use ntp adjusted clock multiplier
      [S390] cio: use exception-save stsch
      [S390] add hook to reenable mss after hibernation
      [S390] cio: allow enable_facility from outside init functions
      [S390] dasd: fix endless loop in erp
  24. [S390] zcore: Fix reipl device detection

    michael-holzheu committed with Martin Schwidefsky Apr 22, 2010
    The reipl device information is passed from the kernel to zfcpdump
    using a pointer in the lowcore (0xe00) that points to the reipl
    information Currently if that pointer is not zero, we copy the reipl
    information. If the pointer is not initialized and points outside
    the accessible memory, it can happen that the memory copy fails.
    In that case we currently stop the initialization of zcore which leads
    to a failing kernel dump. The correct behavior is to disable the reipl
    after dump and continue with zcore intialization.
    
    Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  25. [S390] vdso: use ntp adjusted clock multiplier

    hbrueckner committed with Martin Schwidefsky Apr 22, 2010
    Commit "timekeeping: Fix clock_gettime vsyscall time warp" (0696b71)
    introduced the new parameter "mult" to update_vsyscall(). This parameter
    contains the internal NTP adjusted clock multiplier.
    
    The s390x vdso did not use this adjusted multiplier.  Instead, it used
    the constant clock multiplier for gettimeofday() and clock_gettime()
    variants.  This may result in observable time warps as explained in
    commit 0696b71.
    
    Make the NTP adjusted clock multiplier available to the s390x vdso
    implementation and use it for time calculations.
    
    Cc: <stable@kernel.org>
    Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  26. [S390] cio: use exception-save stsch

    sebott committed with Martin Schwidefsky Apr 22, 2010
    Using stsch on schids with ssid != 0 can lead to an operand
    exception. Use stsch_err to handle potential exceptions
    if we fail to reenable mss after hibernation.
    
    Cc: <stable@kernel.org>
    Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>