Commits on Nov 23, 2010
  1. Merge branch 'configs-2.6.36' into pf-2.6.36

    Oleksandr Natalenko committed Nov 23, 2010
  2. configs-2.6.36: update config for Dell Inspiron 1525

    Oleksandr Natalenko committed Nov 23, 2010
  3. Merge branch 'version-2.6.36' into pf-2.6.36

    Oleksandr Natalenko committed Nov 23, 2010
  4. version-2.6.36: bump to v2.6.36-pf2

    Oleksandr Natalenko committed Nov 23, 2010
  5. Merge remote branch 'tuxonice-2.6.36/combined' into pf-2.6.36

    Oleksandr Natalenko committed Nov 23, 2010
  6. fix merge conflict

    Oleksandr Natalenko committed Nov 23, 2010
Commits on Nov 22, 2010
  1. Merge branch 'stable' into combined

    Nigel Cunningham committed Nov 22, 2010
  2. Linux

    gregkh committed Nov 22, 2010
  3. sgi-xp: incoming XPC channel messages can come in after the channel's…

    … partition structures have been torn down
    commit 0935897 upstream.
    Under some workloads, some channel messages have been observed being
    delayed on the sending side past the point where the receiving side has
    been able to tear down its partition structures.
    This condition is already detected in xpc_handle_activate_IRQ_uv(), but
    that information is not given to xpc_handle_activate_mq_msg_uv().  As a
    result, xpc_handle_activate_mq_msg_uv() assumes the structures still exist
    and references them, causing a NULL-pointer deref.
    Signed-off-by: Robin Holt <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
    Signed-off-by: Greg Kroah-Hartman <>
    Robin Holt committed with gregkh Oct 26, 2010
  4. ARM: cns3xxx: Fixup the missing second parameter to addruart macro to…

    … allow them to build.
    It can't be merged into Linus' tree because this file has already been
    changed in incompatible ways.
    Fixup the missing second parameter to addruart macro to allow them to build,
    according to to commit 0e17226.
    Enabling DEBUG in head.S would cause:
    rch/arm/boot/compressed/head.S: Assembler messages:
    arch/arm/boot/compressed/head.S:1037: Error: too many positional arguments
    arch/arm/boot/compressed/head.S:1055: Error: too many positional arguments
    Signed-off-by: Mac Lin <>
    Acked-by: Russell King <>
    Signed-off-by: Greg Kroah-Hartman <>
    mkl0301 committed with gregkh Nov 14, 2010
  5. kgdb,arm: fix register dump

    commit 834b296 upstream.
    DBG_MAX_REG_NUM incorrectly had the number of indices in the GDB regs
    array rather than the number of registers, leading to an oops when the
    "rd" command is used in KDB.
    Signed-off-by: Rabin Vincent <>
    Signed-off-by: Jason Wessel <>
    Signed-off-by: Greg Kroah-Hartman <>
    rabinv committed with gregkh Oct 26, 2010
  6. secmark: do not return early if there was no error

    commit 15714f7 upstream.
    Commit 4a5a5c7 attempted to pass decent error messages back to userspace for
    netfilter errors.  In xt_SECMARK.c however the patch screwed up and returned
    on 0 (aka no error) early and didn't finish setting up secmark.  This results
    in a kernel BUG if you use SECMARK.
    Signed-off-by: Eric Paris <>
    Acked-by: Paul Moore <>
    Signed-off-by: James Morris <>
    Signed-off-by: Greg Kroah-Hartman <>
    eparis committed with gregkh Oct 12, 2010
  7. Fixed Regression in NFS Direct I/O path

    commit 568a810 upstream.
    A typo, introduced by commit f11ac8d, in the nfs_direct_write()
    routine causes writes with O_DIRECT set to fail with a ENOMEM error.
    Found-by: Jeff Layton <>
    Signed-off-by: Steve Dickson <>
    Signed-off-by: Trond Myklebust <>
    Signed-off-by: Greg Kroah-Hartman <>
    stevedd committed with gregkh Oct 28, 2010
  8. Fix regressions in scsi_internal_device_block

    commit 986fe6c upstream.
    Deleting a SCSI device on a blocked fc_remote_port (before
    fast_io_fail_tmo fires) results in a hanging thread:
      0 schedule+1108 [0x5cac48]
      1 schedule_timeout+528 [0x5cb7fc]
      2 wait_for_common+266 [0x5ca6be]
      3 blk_execute_rq+160 [0x354054]
      4 scsi_execute+324 [0x3b7ef4]
      5 scsi_execute_req+162 [0x3b80ca]
      6 sd_sync_cache+138 [0x3cf662]
      7 sd_shutdown+138 [0x3cf91a]
      8 sd_remove+112 [0x3cfe4c]
      9 __device_release_driver+124 [0x3a08b8]
    10 device_release_driver+60 [0x3a0a5c]
    11 bus_remove_device+266 [0x39fa76]
    12 device_del+340 [0x39d818]
    13 __scsi_remove_device+204 [0x3bcc48]
    14 scsi_remove_device+66 [0x3bcc8e]
    15 sysfs_schedule_callback_work+50 [0x260d66]
    16 worker_thread+622 [0x162326]
    17 kthread+160 [0x1680b0]
    18 kernel_thread_starter+6 [0x10aaea]
    During the delete, the SCSI device is in moved to SDEV_CANCEL.  When
    the FC transport class later calls scsi_target_unblock, this has no
    effect, since scsi_internal_device_unblock ignores SCSI devics in this
    It looks like all these are regressions caused by:
    [SCSI] limit state transitions in scsi_internal_device_unblock
    Fix by rejecting offline and cancel in the state transition.
    Signed-off-by: Christof Schmitt <>
    [jejb: Original patch by Christof Schmitt, modified by Mike Christie]
    Signed-off-by: James Bottomley <>
    Signed-off-by: Greg Kroah-Hartman <>
    Mike Christie committed with gregkh Oct 6, 2010
  9. Fix race when removing SCSI devices

    commit 546ae79 upstream.
    Removing SCSI devices through
    echo 1 > /sys/bus/scsi/devices/ ... /delete
    while the FC transport class removes the SCSI target can lead to an
    Unable to handle kernel pointer dereference at virtual kernel address 00000000b6815000
    Modules linked in: sunrpc qeth_l3 binfmt_misc dm_multipath scsi_dh dm_mod ipv6 qeth ccwgroup [last unloaded: scsi_wait_scan]
    CPU: 1 Not tainted #1
    Process fc_wq_0 (pid: 861, task: 00000000b7331240, ksp: 00000000b735bac0)
    Krnl PSW : 0704200180000000 00000000003ff6e4 (__scsi_remove_device+0x24/0xd0)
               R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:0 AS:0 CC:2 PM:0 EA:3
    Krnl GPRS: 0000000000000001 0000000000000000 00000000b6815000 00000000bc24a8c0
               00000000003ff7c8 000000000056dbb8 0000000000000002 0000000000835d80
               ffffffff00000000 0000000000001000 00000000b6815000 00000000bc24a7f0
               00000000b68151a0 00000000b6815000 00000000b735bc20 00000000b735bbf8
    Krnl Code: 00000000003ff6d6: a7840001            brc 8,3ff6d8
               00000000003ff6da: a7fbffd8            aghi %r15,-40
               00000000003ff6de: e3e0f0980024        stg %r14,152(%r15)
              >00000000003ff6e4: e31021200004        lg %r1,288(%r2)
               00000000003ff6ea: a71f0000            cghi    %r1,0
               00000000003ff6ee: a7a40011            brc 10,3ff710
               00000000003ff6f2: a7390003            lghi    %r3,3
               00000000003ff6f6: c0e5ffffc8b1        brasl %r14,3f8858
    Call Trace:
    ([<0000000000001000>] 0x1000)
     [<00000000003ff7d2>] scsi_remove_device+0x42/0x54
     [<00000000003ff8ba>] __scsi_remove_target+0xca/0xfc
     [<00000000003ff99a>] __remove_child+0x3a/0x48
     [<00000000003e3246>] device_for_each_child+0x72/0xbc
     [<00000000003ff93a>] scsi_remove_target+0x4e/0x74
     [<0000000000406586>] fc_rport_final_delete+0xb2/0x23c
     [<000000000015d080>] worker_thread+0x200/0x344
     [<000000000016330c>] kthread+0xa0/0xa8
     [<0000000000106c1a>] kernel_thread_starter+0x6/0xc
     [<0000000000106c14>] kernel_thread_starter+0x0/0xc
    INFO: lockdep is turned off.
    Last Breaking-Event-Address:
     [<00000000003ff7cc>] scsi_remove_device+0x3c/0x54
    The function __scsi_remove_target iterates through the SCSI devices on
    the host, but it drops the host_lock before calling
    scsi_remove_device. When the SCSI device is deleted from another
    thread, the pointer to the SCSI device in scsi_remove_device can
    become invalid. Fix this by getting a reference to the SCSI device
    before dropping the host_lock to keep the SCSI device alive for the
    call to scsi_remove_device.
    Signed-off-by: Christof Schmitt <>
    Signed-off-by: James Bottomley <>
    Signed-off-by: Greg Kroah-Hartman <>
    Christof Schmitt committed with gregkh Oct 6, 2010
  10. gdth: integer overflow in ioctl

    commit f63ae56 upstream.
    gdth_ioctl_alloc() takes the size variable as an int.
    copy_from_user() takes the size variable as an unsigned long.
    gen.data_len and gen.sense_len are unsigned longs.
    On x86_64 longs are 64 bit and ints are 32 bit.
    We could pass in a very large number and the allocation would truncate
    the size to 32 bits and allocate a small buffer.  Then when we do the
    copy_from_user(), it would result in a memory corruption.
    Signed-off-by: Dan Carpenter <>
    Signed-off-by: James Bottomley <>
    Signed-off-by: Greg Kroah-Hartman <>
    error27 committed with gregkh Oct 8, 2010
  11. pmcraid: remove duplicate struct member

    commit df30e50 upstream.
    sense_buffer is both a direct member of struct pmcraid_cmd as well as
    an indirect one via an anonymous union and struct.  Fix this clash by
    eliminating the direct member in favour of the anonymous struct/union
    one.  The name duplication apparently isn't noticed by gcc versions
    earlier than 4.4
    Reported-by: Andi Kleen <>
    Signed-off-by: Anil Ravindranath <>
    Signed-off-by: James Bottomley <>
    Signed-off-by: Greg Kroah-Hartman <>
    Anil Ravindranath committed with gregkh Oct 25, 2010
  12. qla4xxx: fix build on PPC

    commit a6751cc upstream.
    We use read/write[bslq] but do not include linux/io.h. This causes
    build failures on PPC. Include that file.
    Signed-off-by: Jiri Slaby <>
    Acked-by: Vikas Chaudhary <>
    Signed-off-by: James Bottomley <>
    Signed-off-by: Greg Kroah-Hartman <>
    Jiri Slaby committed with gregkh Sep 14, 2010
  13. libsas: fix NCQ mixing with non-NCQ

    commit f0ad30d upstream.
    Some cards (like mvsas) have issue troubles if non-NCQ commands are
    mixed with NCQ ones.  Fix this by using the libata default NCQ check
    routine which waits until all NCQ commands are complete before issuing
    a non-NCQ one.  The impact to cards (like aic94xx) which don't need
    this logic should be minimal
    Signed-off-by: James Bottomley <>
    Signed-off-by: Greg Kroah-Hartman <>
    davidmilburn committed with gregkh Sep 3, 2010
  14. sd name space exhaustion causes system hang

    commit 1a03ae0 upstream.
    Following a site power outage which re-enabled all the ports on my FC
    switches, my system subsequently booted with far too many luns!  I had
    let it run hoping it would make multi-user.  It didn't.  :(  It hung solid
    after exhausting the last sd device, sdzzz, and attempting to create sdaaaa
    and beyond.  I was unable to get a dump.
    Discovered using a based system.
    correct this by detecting when the last index is utilized and failing
    the sd probe of the device.  Patch applies to scsi-misc-2.6.
    Signed-off-by: Michael Reed <>
    Signed-off-by: James Bottomley <>
    Signed-off-by: Greg Kroah-Hartman <>
    Michael Reed committed with gregkh Sep 20, 2010
  15. asus-laptop: fix gps rfkill

    commit 23f45c3 upstream.
    The GPS rfkill crappy code. The ops_data argument wasn't
    set, and was totally misused. The fix have been tested
    on an Asus R2H.
    Signed-off-by: Corentin Chary <>
    Signed-off-by: Matthew Garrett <>
    Signed-off-by: Greg Kroah-Hartman <>
    iksaif committed with gregkh Aug 24, 2010
  16. USB: accept some invalid ep0-maxpacket values

    commit 56626a7 upstream.
    A few devices (such as the RCA VR5220 voice recorder) are so
    non-compliant with the USB spec that they have invalid maxpacket sizes
    for endpoint 0.  Nevertheless, as long as we can safely use them, we
    may as well do so.
    This patch (as1432) softens our acceptance criterion by allowing
    high-speed devices to have ep0-maxpacket sizes other than 64.  A
    warning is printed in the system log when this happens, and the
    existing error message is clarified.
    Signed-off-by: Alan Stern <>
    Reported-by: James <>
    Signed-off-by: Greg Kroah-Hartman <>
    Alan Stern committed with gregkh Oct 14, 2010
  17. usb: r8a66597-hcd: Change mistake of the outsw function

    commit ac9dfe9 upstream.
    Some functions changed by 1c98347.
    However, There was a change mistake of the function (outsw).
    Signed-off-by: Nobuhiro Iwamatsu <>
    CC: Paul Mundt <>
    Acked-by: Yoshihiro Shimoda <>
    Signed-off-by: Greg Kroah-Hartman <>
    Nobuhiro Iwamatsu committed with gregkh Oct 14, 2010
  18. USB: opticon: Fix long-standing bugs in opticon driver

    commit 97cd8dc upstream.
    The bulk-read callback had two bugs:
    a) The bulk-in packet's leading two zeros were returned (and the two last
       bytes truncated)
    b) The wrong URB was transmitted for the second (and later) read requests,
       causing further reads to return the entire packet (including leading
    Signed-off-by: Alon Ziv <>
    Signed-off-by: Greg Kroah-Hartman <>
    Alon Ziv committed with gregkh Oct 10, 2010
  19. USB: visor: fix initialisation of UX50/TH55 devices

    commit cfb8da8 upstream.
    Fix regression introduced by commit
    214916f (USB: visor: reimplement using
    generic framework) which broke initialisation of UX50/TH55 devices that
    used re-mapped bulk-out endpoint addresses.
    Reported-by: Robert Gadsdon <>
    Tested-by: Robert Gadsdon <>
    Signed-off-by: Johan Hovold <>
    Signed-off-by: Greg Kroah-Hartman <>
    jhovold committed with gregkh Oct 11, 2010
  20. USB: disable endpoints after unbinding interfaces, not before

    commit 80f0cf3 upstream.
    This patch (as1430) fixes a bug in usbcore.  When a device
    configuration change occurs or a device is removed, the endpoints for
    the old config should be completely disabled.  However it turns out
    they aren't; this is because usb_unbind_interface() calls
    usb_enable_interface() or usb_set_interface() to put interfaces back
    in altsetting 0, which re-enables the interfaces' endpoints.
    As a result, when a device goes through a config change or is
    unconfigured, the ep_in[] and ep_out[] arrays may be left holding old
    pointers to usb_host_endpoint structures.  If the device is
    deauthorized these structures get freed, and the stale pointers cause
    errors when the the device is eventually unplugged.
    The solution is to disable the endpoints after unbinding the
    interfaces instead of before.  This isn't as large a change as it
    sounds, since usb_unbind_interface() disables all the interface's
    endpoints anyway before calling the driver's disconnect routine,
    unless the driver claims to support "soft" unbind.
    This fixes Bugzilla #19192.  Thanks to "Tom" Lei Ming for diagnosing
    the underlying cause of the problem.
    Signed-off-by: Alan Stern <>
    Tested-by: Carsten Sommer <>
    Signed-off-by: Greg Kroah-Hartman <>
    Alan Stern committed with gregkh Sep 30, 2010
  21. USB: atmel_usba_udc: force vbus_pin at -EINVAL when gpio_request failled

    commit 969afff upstream.
    to ensure gpio_is_valid return false
    Signed-off-by: Nicolas Ferre <>
    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <>
    Signed-off-by: Greg Kroah-Hartman <>
    plagnioj committed with gregkh Sep 20, 2010
  22. USB: cp210x: Add WAGO 750-923 Service Cable device ID

    commit 93ad03d upstream.
    The WAGO 750-923 USB Service Cable is used for configuration and firmware
    updates of several industrial automation products from WAGO Kontakttechnik GmbH.
    Bus 004 Device 002: ID 1be3:07a6
    Device Descriptor:
      bLength                18
      bDescriptorType         1
      bcdUSB               1.10
      bDeviceClass            0 (Defined at Interface level)
      bDeviceSubClass         0
      bDeviceProtocol         0
      bMaxPacketSize0        64
      idVendor           0x1be3
      idProduct          0x07a6
      bcdDevice            1.00
      iManufacturer           1 Silicon Labs
      iProduct                2 WAGO USB Service Cable
      iSerial                 3 1277796751
      . . .
    Signed-off-by: Anders Larsen <>
    Signed-off-by: Greg Kroah-Hartman <>
    alars committed with gregkh Oct 6, 2010
  23. USB: cp210x: Add Renesas RX-Stick device ID

    commit 2f1136d upstream.
    RX610 development board by Renesas
    Bus 001 Device 024: ID 045b:0053 Hitachi, Ltd
    Device Descriptor:
      bLength                18
      bDescriptorType         1
      bcdUSB               1.10
      bDeviceClass            0 (Defined at Interface level)
      bDeviceSubClass         0
      bDeviceProtocol         0
      bMaxPacketSize0        64
      idVendor           0x045b Hitachi, Ltd
      idProduct          0x0053
      bcdDevice            1.00
      iManufacturer           1 Silicon Labs
      iProduct                2 RX-Stick
      iSerial                 3 0001
      . . .
    Signed-off-by: DJ Delorie <>
    Signed-off-by: Greg Kroah-Hartman <>
    djdelorie committed with gregkh Sep 17, 2010
  24. USB: option: Add more ZTE modem USB id's

    commit ecfa153 upstream.
    There are lots of ZTE USB id's currently not covered by usb/serial. Adds them,
    to allow those devices to work properly on Linux.
    While here, put the USB ID's for 0x2002/0x2003 at the sorted order.
    This patch is based on zte.c file found on MF645.
    PS.: The ZTE driver is commenting the USB ID for 0x0053. It also adds, commented,
    an USB ID for 0x0026.
    Not sure why, but I think that 0053 is used by their devices in storage mode only.
    So, I opted to keep the comment on this patch.
    Signed-off-by: Mauro Carvalho Chehab <>
    Signed-off-by: Greg Kroah-Hartman <>
    Mauro Carvalho Chehab committed with gregkh Sep 12, 2010
  25. USB: Change acm_iad_descriptor bFunctionProtocol to USB_CDC_ACM_PROTO…

    commit 5c8db07 upstream.
    The protocol code is set 00 in IAD and it's set to 01 in ACM control
    interface descriptor in f_acm.c file. Due to this, windows is unable to
    install the modem(ACM) driver based on class-subclass-protocol matching.
    This patch corrects the protocol code in ACM IAD to the same as in
    acm_control_interface_desc protocol code.
    Acked-by: Linus Walleij <>
    Signed-off-by: Praveena Nadahally <>
    Signed-off-by: Greg Kroah-Hartman <>
    Praveena Nadahally committed with gregkh Sep 10, 2010
  26. usb: musb: blackfin: call gpio_free() on error path in musb_platform_…

    commit 00be545 upstream.
    Blackfin's musb_platform_init() needs to call gpio_free() for error cleanup iff
    otg_get_transceiver() call returns NULL.
    Signed-off-by: Sergei Shtylyov <>
    Acked-by: Mike Frysinger <>
    Signed-off-by: Felipe Balbi <>
    Signed-off-by: Greg Kroah-Hartman <>
    Sergei Shtylyov committed with gregkh Sep 29, 2010
  27. usb: musb: blackfin: call usb_nop_xceiv_unregister() in musb_platform…

    commit 3daad24 upstream.
    Blackfin's musb_platform_exit() forgets to call usb_nop_xceiv_unregister().
    While fixing this, also remove the unneeded blank line there.
    Signed-off-by: Sergei Shtylyov <>
    Acked-by: Mike Frysinger <>
    Signed-off-by: Felipe Balbi <>
    Signed-off-by: Greg Kroah-Hartman <>
    Sergei Shtylyov committed with gregkh Sep 29, 2010
  28. USB: MUSB: fix kernel WARNING/oops when unloading module in OTG mode

    commit f405387 upstream.
    Since commit 461972d (musb_core: don't call
    musb_platform_exit() twice), unloading the driver module results in a WARNING
    "kobject: '(null)' (c73de788): is not initialized, yet kobject_put() is being
    called." (or even kernel oops) on e.g. DaVincis, though only in the OTG mode.
    There exists dubious and unbalanced put_device() call in musb_free() which
    takes place only in the OTG mode.  As this commit caused musb_platform_exit()
    to be called (and so unregister the NOP transceiver) before this put_device()
    call, this function references already freed memory.
    On the other hand, all the glue layers miss the otg_put_transceiver() call,
    complementary to the otg_get_transceiver() call that they do.  So, I think
    the solution is to get rid of the strange put_device() call, and instead
    call otg_put_transceiver() in the glue layers...
    Signed-off-by: Sergei Shtylyov <>
    Signed-off-by: Felipe Balbi <>
    Signed-off-by: Greg Kroah-Hartman <>
    Sergei Shtylyov committed with gregkh Sep 29, 2010
  29. USB: ftdi_sio: add device ids for ScienceScope

    commit 0f266ab upstream.
    This adds the requested device ids to the ftdi_sio driver.
    Reported-by: Ewan Bingham <>
    Cc: Kuba Ober <>
    Signed-off-by: Greg Kroah-Hartman <>
    gregkh committed Oct 19, 2010