Skip to content
Commits on Feb 18, 2010
  1. @torvalds

    Orphan DECnet

    Christine Caulfield committed with torvalds Feb 18, 2010
    Due to lack of time, space, motivation, hardware and probably expertise,
    I have reluctantly decided to orphan the DECnet code in the kernel.
    
    Judging by the deafening silence on the linux-decnet mailing list I
    suspect it's either not being used anyway, or the few people that are
    using it are happy with their older kernels.
    
    Signed-off-by: Christine Caulfield <christine.caulfield@googlemail.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  2. @torvalds

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

    torvalds committed Feb 18, 2010
    …/git/dtor/input
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
      Input: add KEY_RFKILL
      Input: i8042 - fix KBC jam during hibernate
  3. @torvalds

    Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…

    torvalds committed Feb 18, 2010
    …it/lenb/linux-acpi-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
      ACPI: fix "acpi=ht" boot option
      ACPI, i915: blacklist Clevo M5x0N bad_lid state
      ACPI: fix High cpu temperature with 2.6.32
      ACPI: dock: properly initialize local struct dock_station in dock_add()
      ACPI: remove Asus P2B-DS from acpi=ht blacklist
      thinkpad-acpi: wrong thermal attribute_group removed in thermal_exit()
      ACPI: acpi_bus_{scan,bus,add}: return -ENODEV if no device was found
      ACPI: Add NULL pointer check in acpi_bus_start
      ACPI: processor: only evaluate _PDC once per processor
      ACPI: processor: add kernel command line support for early _PDC eval
  4. @torvalds

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

    torvalds committed Feb 18, 2010
    …/git/airlied/drm-2.6
    
    * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/radeon/kms: fix bo's fence association
      drm/radeon/kms: fix indirect buffer management V2
      drm/edid: Fix interlaced detailed timings to be frame size, not field.
      drm/vmwgfx: Use fb handover mechanism instead of stealth mode.
      drm/radeon/kms: use udelay for short delays
      drm/nouveau: Force TV encoder DPMS reinit after resume.
      drm/nouveau: use mutex for vbios lock
  5. @torvalds

    Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git…

    torvalds committed Feb 18, 2010
    …/benh/powerpc
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
      powerpc/85xx: Fix SMP when "cpu-release-addr" is in lowmem
      powerpc/85xx: Fix oops during MSI driver probe on MPC85xxMDS boards
  6. @dtor

    Input: add KEY_RFKILL

    Matthew Garrett committed with dtor Feb 17, 2010
    Most laptops have keys that are intended to toggle all device state, not
    just wifi. These are currently generally mapped to KEY_WLAN. As a result,
    rfkill will only kill or enable wifi in response to the key press. This
    confuses users and can make it difficult for them to enable bluetooth
    and wwan devices.
    
    This patch adds a new keycode, KEY_RFKILL. It indicates that the system
    should toggle the state of all rfkillable devices.
    
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
    Acked-by: Marcel Holtmann <marcel@holtmann.org>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  7. @dtor

    Input: i8042 - fix KBC jam during hibernate

    Alan Jenkins committed with dtor Feb 17, 2010
    633aae2 "Input: i8042 - switch to using dev_pm_ops" removed handling
    for PMSG_THAW, since we do not need to do anything during freeze and
    thus it was thougt that thaw is not needed as well. However, there is
    a period when interrupts are kept off, and if key happens to be pressed
    during that time KBC becomes jammed. To avoid the jam we simply need
    to poll KBC once during thaw.
    
    Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  8. @lenb

    Merge branches 'bugzilla-14886', 'bugzilla-15000', 'bugzilla-15040', …

    lenb committed Feb 18, 2010
    …'bugzilla-15108', 'pdc', 'hotplug-null-ref' and 'thinkpad' into release
  9. @lenb

    ACPI: fix "acpi=ht" boot option

    lenb committed Feb 16, 2010
    We broke "acpi=ht" in 2.6.32 by disabling MADT parsing
    for acpi=disabled.  e5b8fc6
    This also broke systems which invoked acpi=ht via DMI blacklist.
    
    acpi=ht is a really ugly hack,
    but restore it for those that still use it.
    
    http://bugzilla.kernel.org/show_bug.cgi?id=14886
    
    Signed-off-by: Len Brown <len.brown@intel.com>
  10. Merge branch 'for-airlied' of git://git.freedesktop.org/git/nouveau/l…

    Dave Airlie committed Feb 18, 2010
    …inux-2.6 into drm-linus
    
    * 'for-airlied' of git://git.freedesktop.org/git/nouveau/linux-2.6:
      drm/nouveau: Force TV encoder DPMS reinit after resume.
      drm/nouveau: use mutex for vbios lock
  11. drm/radeon/kms: fix bo's fence association

    Jerome Glisse committed with Dave Airlie Feb 15, 2010
    Previous code did associate fence to bo before the fence was emited
    and it also didn't lock protected access to ttm sync_obj member.
    Both of this flaw leads to possible race between different code
    path. This patch fix this by associating fence only once the fence
    is emitted and properly lock protect access to sync_obj member of
    ttm.
    
    Fix:
    https://bugs.freedesktop.org/show_bug.cgi?id=26438
    and likely similar others bugs
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  12. drm/radeon/kms: fix indirect buffer management V2

    Jerome Glisse committed with Dave Airlie Feb 15, 2010
    There is 3 different distinct states for an indirect buffer (IB) :
      1- free with no fence
      2- free with a fence
      3- non free (fence doesn't matter)
    Previous code mixed case 2 & 3 in a single one leading to possible
    catastrophique failure. This patch rework the handling and properly
    separate each case. So when you get ib we set the ib as non free and
    fence status doesn't matter. Fence become active (ie has a meaning
    for the ib code) once the ib is scheduled or free. This patch also
    get rid of the alloc bitmap as it was overkill, we know go through
    IB pool list like in a ring buffer as the oldest IB is the first
    one the will be free.
    
    Fix :
    https://bugs.freedesktop.org/show_bug.cgi?id=26438
    and likely other bugs.
    
    V2 remove the scheduled list, it's useless now, fix free ib scanning
    
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  13. @nwnk

    drm/edid: Fix interlaced detailed timings to be frame size, not field.

    nwnk committed with Dave Airlie Feb 15, 2010
    cf. https://bugzilla.redhat.com/show_bug.cgi?id=533561
    
    Signed-off-by: Adam Jackson <ajax@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  14. @thomashvmw

    drm/vmwgfx: Use fb handover mechanism instead of stealth mode.

    thomashvmw committed with Dave Airlie Feb 15, 2010
    When the vmwgfx module is loaded on top of vesafb, it would operate in
    stealth mode in parallel with vesafb, evicting VRAM on dropmaster.
    
    Change that to use the vesafb handover mechanism, like other drmfb drivers.
    
    Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  15. drm/radeon/kms: use udelay for short delays

    Dave Airlie committed Jan 31, 2010
    For usec delays use udelay instead of scheduling, this should
    allow reclocking to happen faster. This also was the cause
    of reported 33s delays at bootup on certain systems.
    
    fixes: freedesktop.org bug 25506
    
    Cc: stable@kernel.org
    Signed-off-by: Dave Airlie <airlied@redhat.com>
Commits on Feb 17, 2010
  1. @torvalds

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

    torvalds committed Feb 16, 2010
    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
      serial: 8250: add serial transmitter fully empty test
  2. @torvalds

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

    torvalds committed Feb 16, 2010
    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
      USB: gadget: fix EEM gadget CRC usage
      USB: otg Kconfig: let USB_OTG_UTILS select USB_ULPI option
      USB: g_multi: fix CONFIG_USB_G_MULTI_RNDIS usage
      kfifo: Don't use integer as NULL pointer
      USB: FHCI: Fix build after kfifo rework
      kfifo: Make kfifo_initialized work after kfifo_free
      USB: serial: add usbid for dell wwan card to sierra.c
      USB: SIS USB2VGA DRIVER: support KAIREN's USB VGA adaptor USB20SVGA-MB-PLUS
      USB: ehci: phy low power mode bug fixing
      USB: s3c-hsotg: Export usb_gadget_register_driver()
      USB: r8a66597-udc: Prototype IS_ERR() and PTR_ERR()
      USB: ftdi_sio: add device IDs (several ELV, one Mindstorms NXT)
      USB: storage: Remove unneeded SC/PR from unusual_devs.h
      USB: ftdi_sio: new device id for papouch AD4USB
      USB: usbfs: properly clean up the as structure on error paths
      USB: usbfs: only copy the actual data received
  3. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-cor…

    torvalds committed Feb 16, 2010
    …e-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
      class: Free the class private data in class_release
      sysfs: sysfs_sd_setattr set iattrs unconditionally
  4. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    torvalds committed Feb 16, 2010
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (22 commits)
      be2net: set proper value to version field in req hdr
      xfrm: Fix xfrm_state_clone leak
      ipcomp: Avoid duplicate calls to ipcomp_destroy
      ethtool: allow non-admin user to read GRO settings.
      ixgbe: fix WOL register setup for 82599
      ixgbe: Fix - Do not allow Rx FC on 82598 at 1G due to errata
      sfc: Fix SFE4002 initialisation
      mac80211: fix handling of null-rate control in rate_control_get_rate
      inet: Remove bogus IGMPv3 report handling
      iwlwifi: fix AMSDU Rx after paged Rx patch
      tcp: fix ICMP-RTO war
      via-velocity: Fix races on shared interrupts
      via-velocity: Take spinlock on set coalesce
      via-velocity: Remove unused IRQ status parameter from rx_srv and tx_srv
      rtl8187: Add new device ID
      iwmc3200wifi: Test of wrong pointer after kzalloc in iwm_mlme_update_bss_table()
      ath9k: Fix sequence numbers for PAE frames
      mac80211: fix deferred hardware scan requests
      iwlwifi: Fix to set correct ht configuration
      mac80211: Fix probe request filtering in IBSS mode
      ...
Commits on Feb 16, 2010
  1. @liftoff-sr @gregkh

    serial: 8250: add serial transmitter fully empty test

    liftoff-sr committed with gregkh Dec 9, 2009
    When controlling an industrial radio modem it can be necessary to
    manipulate the handshake lines in order to control the radio modem's
    transmitter, from userspace.
    
    The transmitter should not be turned off before all characters have been
    transmitted.  serial8250_tx_empty() was reporting that all characters were
    transmitted before they actually were.
    
    ===
    
    Discovered in parallel with more testing and analysis by Kees Schoenmakers
    as follows:
    
    I ran into an NetMos 9835 serial pci board which behaves a little
    different than the standard.  This type of expansion board is very common.
    
    "Standard" 8250 compatible devices clear the 'UART_LST_TEMT" bit together
    with the "UART_LSR_THRE" bit when writing data to the device.
    
    The NetMos device does it slightly different
    
    I believe that the TEMT bit is coupled to the shift register.  The problem
    is that after writing data to the device and very quickly after that one
    does call serial8250_tx_empty, it returns the wrong information.
    
    My patch makes the test more robust (and solves the problem) and it does
    not affect the already correct devices.
    
    Alan:
    
      We may yet need to quirk this but now we know which chips we have a
      way to do that should we find this breaks some other 8250 clone with
      dodgy THRE.
    
    Signed-off-by: Dick Hollenbeck <dick@softplc.com>
    Signed-off-by: Alan Cox <alan@linux.intel.com>
    Cc: Kees Schoenmakers <k.schoenmakers@sigmae.nl>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  2. @pinchartl @gregkh

    class: Free the class private data in class_release

    pinchartl committed with gregkh Feb 10, 2010
    Fix a memory leak by freeing the memory allocated in __class_register
    for the class private data.
    
    Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    Acked-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  3. @ebiederm @gregkh

    sysfs: sysfs_sd_setattr set iattrs unconditionally

    ebiederm committed with gregkh Feb 3, 2010
    There is currently a bug in sysfs_sd_setattr inherited from
    sysfs_setattr in 2.6.32 where the first time we set the attributes
    on a sysfs file we allocate backing store but do not set the
    backing store attributes.  Resulting in overly restrictive
    permissions on sysfs files.
    
    The fix is to simply modify the code so that it always executes
    when we update the sysfs attributes, as we did in 2.6.31 and earlier.
    
    Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
    Tested-by: Jean Delvare <khali@linux-fr.org>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  4. @gregkh

    USB: gadget: fix EEM gadget CRC usage

    Brian Niebuhr committed with gregkh Jan 25, 2010
    eem_wrap() is sending a sentinel CRC, but it didn't indicate that to
    the host, it should zero bit 14 (bmCRC) in the EEM packet header,
    instead of setting it.
    
    Also remove a redundant crc calculation in eem_unwrap().
    
    
    Signed-off-by: Steve Longerbeam <stevel@netspectrum.com>
    Acked-by: Brian Niebuhr <bniebuhr@efjohnson.com>
    Acked-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  5. @gregkh

    USB: otg Kconfig: let USB_OTG_UTILS select USB_ULPI option

    Valentin Longchamp committed with gregkh Jan 20, 2010
    With CONFIG_USB_ULPI=y, CONFIG_USB<=m, CONFIG_PCI=n and
    CONFIG_USB_OTG_UTILS=n, which is the default used for mx31moboard,
    the build for all mx3 platforms fails because drivers/usb/otg/ulpi.c
    where otg_ulpi_create is defined is not compiled.
    
    Build error:
    arch/arm/mach-mx3/built-in.o: In function `mxc_board_init':
    kzmarm11.c:(.init.text+0x73c): undefined reference to `otg_ulpi_create'
    kzmarm11.c:(.init.text+0x1020): undefined reference to `otg_ulpi_create'
    
    This isn't a strong dependency as drivers/usb/otg/ulpi.c doesn't
    use functions defined in drivers/usb/otg/otg.o and is only needed
    to get ulpi.o linked into the kernel image.
    
    Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch>
    Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  6. @gregkh

    USB: g_multi: fix CONFIG_USB_G_MULTI_RNDIS usage

    Michal Nazarewicz committed with gregkh Jan 22, 2010
    g_multi used CONFIG_USB_ETH_RNDIS to check if RNDIS option was requested
    where it should check for CONFIG_USB_G_MULTI_RNDIS.  As a result, RNDIS
    was never present in g_multi regardless of configuration.
    
    This fixes changes made in commit 396cda9.
    
    Signed-off-by: Michal Nazarewicz <m.nazarewicz@samsung.com>
    Cc: Marek Szyprowski <m.szyprowski@samsung.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  7. @gregkh

    kfifo: Don't use integer as NULL pointer

    Anton Vorontsov committed with gregkh Jan 27, 2010
    This patch fixes following sparse warnings:
    
    include/linux/kfifo.h:127:25: warning: Using plain integer as NULL pointer
    kernel/kfifo.c:83:21: warning: Using plain integer as NULL pointer
    
    Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
    Acked-by: Stefani Seibold <stefani@seibold.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  8. @gregkh

    USB: FHCI: Fix build after kfifo rework

    Anton Vorontsov committed with gregkh Jan 27, 2010
    After kfifo rework FHCI fails to build:
    
      CC      drivers/usb/host/fhci-tds.o
    drivers/usb/host/fhci-tds.c: In function 'fhci_ep0_free':
    drivers/usb/host/fhci-tds.c:108: error: used struct type value where scalar is required
    drivers/usb/host/fhci-tds.c:118: error: used struct type value where scalar is required
    drivers/usb/host/fhci-tds.c:128: error: used struct type value where scalar is required
    
    This is because kfifos are no longer pointers in the ep struct.
    So, instead of checking the pointers, we should now check if kfifo
    is initialized.
    
    Reported-by: Josh Boyer <jwboyer@gmail.com>
    Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
    Acked-by: Stefani Seibold <stefani@seibold.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  9. @gregkh

    kfifo: Make kfifo_initialized work after kfifo_free

    Anton Vorontsov committed with gregkh Jan 27, 2010
    After kfifo rework it's no longer possible to reliably know if kfifo is
    usable, since after kfifo_free(), kfifo_initialized() would still return
    true. The correct behaviour is needed for at least FHCI USB driver.
    
    This patch fixes the issue by resetting the kfifo to zero values (the
    same approach is used in kfifo_alloc() if allocation failed).
    
    Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
    Acked-by: Stefani Seibold <stefani@seibold.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  10. @ZeroChaos- @gregkh

    USB: serial: add usbid for dell wwan card to sierra.c

    ZeroChaos- committed with gregkh Jan 20, 2010
    This patch adds support for Dell Computer Corp. Wireless 5720 VZW Mobile
    Broadband (EVDO Rev-A) Minicard GPS Port.  I stole the name from lsusb,
    but my card does not have a GPS on it (at least not that I can make
    function). I'm sure the patch is whitespace damaged but the one line
    addition should be fairly straightforward nonetheless.
    
    Tested-by: Rick Farina <sidhayn@gmail.com>
    Signed-off-by: Rick Farina <sidhayn@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  11. @akr @gregkh

    USB: SIS USB2VGA DRIVER: support KAIREN's USB VGA adaptor USB20SVGA-M…

    akr committed with gregkh Jan 21, 2010
    …B-PLUS
    
    This patch adds the USB product ID of KAIREN's USB VGA Adaptor,
    USB20SVGA-MB-PLUS, to sisusbvga work with it.
    
    Signed-off-by: Tanaka Akira <akr@fsij.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  12. @gregkh

    USB: ehci: phy low power mode bug fixing

    Alek Du committed with gregkh Jan 19, 2010
    1. There are two msleep calls inside two spin lock sections, need to unlock
       and lock again after msleep.
    2. Save a extra status reg setting.
    
    Signed-off-by: Alek Du <alek.du@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  13. @broonie @gregkh

    USB: s3c-hsotg: Export usb_gadget_register_driver()

    broonie committed with gregkh Jan 18, 2010
    USB gadget controller drivers normally export their driver registration
    function, allowing modular builds of the individual gadget drivers so
    do so for s3c-hsotg, fixing builds.
    
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  14. @broonie @gregkh

    USB: r8a66597-udc: Prototype IS_ERR() and PTR_ERR()

    broonie committed with gregkh Jan 18, 2010
    The build of r8a66597-udc was failing on ARM since IS_ERR() and
    PTR_ERR() weren't protyped.  Presumably err.h is being pulled in by
    another header on other platforms.
    
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Acked-by: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  15. @andim2 @gregkh

    USB: ftdi_sio: add device IDs (several ELV, one Mindstorms NXT)

    andim2 committed with gregkh Jan 17, 2010
    - add FTDI device IDs for several ELV devices and NXTCam of Lego Mindstorms NXT
    - add hopefully helpful new_id comment
    - remove less helpful "Due to many user requests for multiple ELV devices we enable
      them by default." comment (we simply add _all_ known devices - an
      enduser shouldn't have to fiddle with obscure module parameters...).
    - add myself to DRIVER_AUTHOR
    
    The missing NXTCam ID has been found at
    http://www.unixboard.de/vb3/showthread.php?t=44155
    , ELV devices taken from ELV Windows .inf file.
    
    Signed-off-by: Andreas Mohr <andi@lisas.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  16. @jaymzh @gregkh

    USB: storage: Remove unneeded SC/PR from unusual_devs.h

    jaymzh committed with gregkh Jan 16, 2010
    This patch removes the subclass and protocol entries from a Microtech
    entry in unusual_devs.h. This was reported by <ryck@pacbell.net>.
    
    Greg, please apply.
    
    Signed-off-by: Phil Dibowitz <phil@ipom.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Something went wrong with that request. Please try again.