commit 4c098bcd55fad34dcf224bf8343db6a9ac58fc68
Merge: d006b2b... 284b066...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Feb 9 14:00:16 2009 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
      Btrfs: don't use spin_is_contended

commit d006b2b620ebf87a1d5592fbd7ae75d4a6da8423
Merge: 7d16766... 049a6ac...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Feb 9 13:59:51 2009 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
      USB: Storage: Update unusual_devs entry for Datafab KECF-USB
      USB: Correct Makefile to make isp1760 buildable
      USB: option: New mobile broadband modems to be supported
      USB: two more usb ids for ti_usb_3410_5052
      USB: ftdi_sio: unlock_kernel() on error in set_serial_info()
      USB: usb-storage: add Pentax to the bad-vendor list
      USB: ftdi_sio: add support for the NDI Polaris system
      USB: usb-serial: fix the aircable_init failure path
      USB: usb-storage: remove WARN from last-sector hacks
      Revert USB: option: add Pantech cards
      USB: cdc-acm.c: remove duplicate lines for MTK gps support
      USB: fsl_qe_udc: Fix stalled TX requests bug
      USB: fsl_qe_udc: Fix muram corruption by disabled endpoints
      USB: fsl_qe_udc: Fix disconnects reporting during bus reset
      USB: fsl_qe_udc: Fix QE USB controller initialization
      USB: fsl_qe_udc: Fix recursive locking bug in ch9getstatus()
      USB: fsl_qe_udc: Fix oops on QE UDC probe failure

commit 7d1676629e9262f441540ecb0cde57e5cafc632f
Merge: 6707fbb... 6136ac8...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Feb 9 13:58:40 2009 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
      Staging: panel: fix lcd panel driver build failure
      Staging: android: fix up units in timed_gpio
      Staging: android: ram_console: Disable ECC when early init is enabled and validate buffer size
      Staging: at76_usb: Add support for OQO Model 01+
      Staging: at76_usb: fix bugs introduced by "Staging: at76_usb: cleanup dma on stack issues"
      Revert Staging: at76_usb: update drivers/staging/at76_usb w/ mac80211 port

commit 6707fbb56c8fd3121e334291d170934bcaca2e7f
Merge: 896abeb... 732553e...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Feb 9 13:58:22 2009 -0800

    Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
    
    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
      [CPUFREQ] powernow-k8: Get transition latency from ACPI _PSS table
      [CPUFREQ] Make ignore_nice_load setting of ondemand work as expected.

commit 284b066af41579f62649048fdec5c5e7091703e6
Author: Chris Mason <chris.mason@oracle.com>
Date:   Mon Feb 9 16:22:03 2009 -0500

    Btrfs: don't use spin_is_contended
    
    Btrfs was using spin_is_contended to see if it should drop locks before
    doing extent allocations during btrfs_search_slot.  The idea was to avoid
    expensive searches in the tree unless the lock was actually contended.
    
    But, spin_is_contended is specific to the ticket spinlocks on x86, so this
    is causing compile errors everywhere else.
    
    In practice, the contention could easily appear some time after we started
    doing the extent allocation, and it makes more sense to always drop the lock
    instead.
    
    Signed-off-by: Chris Mason <chris.mason@oracle.com>

commit 6136ac86b719716694884a84cd9d403207cc52b9
Author: Sachin P. Sant <sachinp@in.ibm.com>
Date:   Tue Feb 3 21:10:58 2009 +0530

    Staging: panel: fix lcd panel driver build failure
    
    * Fix build break for lcd panel driver.
    
    Signed-off-by : Sachin Sant <sachinp@in.ibm.com>
    Cc: Willy Tarreau <w@1wt.eu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit d88dfb8dc4bfb66066e7c68727c219faaa541206
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date:   Wed Feb 4 15:05:05 2009 -0800

    Staging: android: fix up units in timed_gpio
    
    The last build fix I did messed up the units of the sysfs file.
    
    This puts them back to be milliseconds, like they originally were.
    
    
    Thanks to Juha Motorsportcom for pointing this out.
    
    Reported-by: Juha Motorsportcom <juha_motorsportcom@luukku.com>
    Cc: Mike Lockwood <lockwood@android.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 5701c0519b7a357a602fda5c96f26197ecfc4c85
Author: Arve Hjønnevåg <arve@android.com>
Date:   Fri Jan 30 20:21:09 2009 -0800

    Staging: android: ram_console: Disable ECC when early init is enabled and validate buffer size
    
    Signed-off-by: Arve Hjønnevåg <arve@android.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 07f269862a2981f1512de5393e2d0ce5b2ee8305
Author: Jamie Lentin <jm@lentin.co.uk>
Date:   Wed Feb 4 13:38:44 2009 +0000

    Staging: at76_usb: Add support for OQO Model 01+
    
    Add USB device ID for OQO 01+'s internal wireless LAN
    
    An OQO employee mentions the chip's true identity here:-
       ftp://ftp.oqo.com/unsupported/linux/OQOLinux.html
    
    Signed-off-by: Jamie Lentin <jm@lentin.co.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit ea8f9fe634da9042c01ca2f4e459a7b187056021
Author: Jason Andryuk <jandryuk@gmail.com>
Date:   Fri Jan 30 09:05:03 2009 -0500

    Staging: at76_usb: fix bugs introduced by "Staging: at76_usb: cleanup dma on stack issues"
    
    Tracking down the firmware loading problem led to this commit.
    
    $ git bisect bad
    0d1d1424330cc1934f2b2742f0cfa2c31e6a250b is first bad commit
    commit 0d1d1424330cc1934f2b2742f0cfa2c31e6a250b
    Author: Oliver Neukum <oliver@neukum.org>
    Date:   Thu Dec 18 13:16:40 2008 +0100
    
        Staging: at76_usb: cleanup dma on stack issues
    
        - no DMA on stack
        - cleanup unclear endianness issue
    
        Signed-off-by: Oliver Neukum <oneukum@suse.de>
        Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    
    :040000 040000 c4fee9ea0fef25926229d810d19dc2f89cca9401
    8b165a35d16280d2413b2700a6080ef290ca1009 M	drivers
    
    The "no DMA on stack" conversion was incomplete with respect to
    updating the arguments passed to usb_control_msg.  The value 40 is
    hardcoded as it was prior to conversion.
    
    The driver can now load firmware, but is not fully functional.
    
    Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
    Cc: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 89cb7e7fd6c0917bb9236ea48bf538d4668ed009
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date:   Tue Feb 3 16:28:48 2009 -0800

    Revert Staging: at76_usb: update drivers/staging/at76_usb w/ mac80211 port
    
    Reverts 02227c28391b5059a7710d6039c52912b0ee2c1d
    (Had to be done by hand due to other patches that had come after this.)
    
    Turns out that we don't want the mac80211 port of this driver just yet, as
    there is a different driver working on adding this support.
    
    So keep things old and different for now.
    
    This is being reverted at the request of the linux-wireless developers.
    
    Cc: Kalle Valo <kalle.valo@iki.fi>
    Cc: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 049a6acb503ca7acc11d563db79a2d54f054e0d0
Author: Nick Holloway <Nick.Holloway@pyrites.org.uk>
Date:   Sun Jan 25 16:58:43 2009 +0000

    USB: Storage: Update unusual_devs entry for Datafab KECF-USB
    
    This device suffers from the off-by-one error when reporting the capacity,
    so add US_FL_FIX_CAPACITY to the existing entry.
    
    Signed-off-by: Nick Holloway <Nick.Holloway@pyrites.org.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 26e1287594864169577327fef233befc9739be3b
Author: Ivan Kuten <ivan.kuten@promwad.com>
Date:   Fri Feb 6 17:42:34 2009 +0800

    USB: Correct Makefile to make isp1760 buildable
    
    Signed-off-by: Ivan Kuten <ivan.kuten@promwad.com>
    Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit c200b9c9e8ec93cdd262cfa1699ad92e883d4876
Author: Dirk De Schepper <ddeschepper@nvtl.com>
Date:   Fri Feb 6 20:48:34 2009 +0000

    USB: option: New mobile broadband modems to be supported
    
    - New Novatel and Dell mobile broadband modem products added
     - Dell pid variables used in stead of numerical PIDs for known
       products
    
    Signed-off-by: Dirk De Schepper <ddeschepper@nvtl.com>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Matthias Urlichs <matthias@urlichs.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 97dcf0416e390fc5c997d4ea60e6f975c7b7a1c3
Author: Oliver Neukum <oliver@neukum.org>
Date:   Wed Feb 4 16:38:33 2009 +0100

    USB: two more usb ids for ti_usb_3410_5052
    
    This patch adds device IDs and balances the counts to make the
    hot ID additioning mechanism work.
    
    Signed-off-by: Oliver Neukum <oneukum@suse.de>
    Cc: stable <stable@kernel.org>
    Cc: Chris Adams <cmadams@hiwaay.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 64905b48098761e779bb848e69365c018894ea81
Author: Dan Carpenter <error27@gmail.com>
Date:   Tue Feb 3 11:11:38 2009 +0300

    USB: ftdi_sio: unlock_kernel() on error in set_serial_info()
    
    There was one error path where unlock_kernel() wasn't called.
    
    This was found with a code checker (http://repo.or.cz/w/smatch.git/)
    Compile tested only, sorry.
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 506e9469833c66ed6bb9acd902e208f7301b6adb
Author: Alan Stern <stern@rowland.harvard.edu>
Date:   Wed Feb 4 15:48:03 2009 -0500

    USB: usb-storage: add Pentax to the bad-vendor list
    
    This patch (as1202) adds Pentax to usb-storage's list of bad vendors
    whose devices always need the CAPACITY_HEURISTICS flag.  This is in
    addition to the existing entries: Nokia, Nikon, and Motorola.
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Tested-by: Virgo Pärna <virgo.parna@mail.ee>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit e38c287447e5a3ff905a59dd81269c14cd12ffa1
Author: Stephane Clerambault <stephane.clerambault@free.fr>
Date:   Mon Feb 2 13:39:12 2009 -0800

    USB: ftdi_sio: add support for the NDI Polaris system
    
    Add support for the NDI Polaris system *http://www.ndigital.com/).
    
    Cc: Ian Abbott <abbotti@mev.co.uk>
    Cc: Oliver Neukum <oneukum@suse.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 78c8fb3717cdff35ad118e17ac7495d0cf21a61f
Author: Dave Young <hidave.darkstar@gmail.com>
Date:   Sun Feb 1 18:54:54 2009 +0800

    USB: usb-serial: fix the aircable_init failure path
    
    The failure path of aircable_init is wrong, fix the order of (goto) labels.
    
    Signed-off-by: Dave Young <hidave.darkstar@gmail.com>
    Acked-by: Naranjo Manuel Francisco <naranjo.manuel@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 0d020aae0a154cffce680a7775c74788fa0bea92
Author: Alan Stern <stern@rowland.harvard.edu>
Date:   Mon Feb 2 09:51:01 2009 -0500

    USB: usb-storage: remove WARN from last-sector hacks
    
    This patch (as1201) removes the WARN() from the last-sector hacks in
    usb-storage, thereby making the code match the version now in
    .27-stable and .28-stable.  The WARN() isn't needed, since there is no
    longer any intention of assuming that all storage devices have an even
    number of sectors, and it annoys users for no good reason.
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 6b40c0057a7935bcf63a38a924094c7e61d4731f
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date:   Tue Feb 3 16:02:21 2009 -0800

    Revert USB: option: add Pantech cards
    
    Revert 8b6346ec899713a90890c9e832f7eff91ea73504 as these devices really
    work just fine with the cdc-acm driver, as they follow the spec
    properly.
    
    Thanks to Chuck Ebbert for pointing out the problem here.
    
    Cc: Chuck Ebbert <cebbert@redhat.com>
    Cc: Dan Williams <dcbw@redhat.com>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 2057ac86da09955c9f8671e36d4f6bd1e7a5d7d2
Author: James Treacy <treacy@debian.org>
Date:   Thu Jan 29 20:17:17 2009 -0500

    USB: cdc-acm.c: remove duplicate lines for MTK gps support
    
    The same patch to add support for MTK gps loggers was submitted by two
    different people and applied twice. Remove the redundant lines.
    
    Signed-off-by: James Treacy <treacy@debian.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit af3ddbd76304f9f602c970f9b09a0c9d8cf8336c
Author: Anton Vorontsov <avorontsov@ru.mvista.com>
Date:   Thu Dec 25 17:15:14 2008 +0300

    USB: fsl_qe_udc: Fix stalled TX requests bug
    
    While disabling an endpoint the driver nuking any pending requests,
    thus completing them with -ESHUTDOWN status. But the driver doesn't
    clear the tx_req, which means that a next TX request (after
    ep_enable), might get stalled, since the driver won't queue the new
    reqests.
    
    This patch fixes a bug I'm observing with ethernet gadget while
    playing with ifconfig usb0 up/down (the up/down sequence disables
    and enables `in' and `out' endpoints).
    
    Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
    Acked-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 82341b3690fce8f70998e3cfb79fbffff0eb7e6b
Author: Anton Vorontsov <avorontsov@ru.mvista.com>
Date:   Thu Dec 25 17:15:11 2008 +0300

    USB: fsl_qe_udc: Fix muram corruption by disabled endpoints
    
    Before freeing an endpoint's muram memory, we should stop all activity
    of the endpoint, otherwise the QE UDC controller might do nasty things
    with the muram memory that isn't belong to that endpoint anymore.
    
    The qe_ep_reset() effectively flushes the hardware fifos, finishes all
    late transaction and thus prevents the corruption.
    
    Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
    Acked-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit ef84e4055f3561495c4c0e0dfb0b9f4a6e20479d
Author: Anton Vorontsov <avorontsov@ru.mvista.com>
Date:   Thu Dec 25 17:15:09 2008 +0300

    USB: fsl_qe_udc: Fix disconnects reporting during bus reset
    
    Freescale QE UDC controllers can't report the "port change" states,
    so the only way to handle disconnects is to process bus reset
    interrupts. The bus reset can take some time, that is, few irqs.
    Gadgets may print the disconnection events, and this causes few
    repetitive messages in the kernel log.
    
    This patch fixes the issue by using the usb_state machine, if the
    usb controller has been already reset, just quit the reset irq
    early.
    
    Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
    Acked-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 2247818a329687f30d1e5c3a62efc33d07c47522
Author: Anton Vorontsov <avorontsov@ru.mvista.com>
Date:   Thu Dec 25 17:15:07 2008 +0300

    USB: fsl_qe_udc: Fix QE USB controller initialization
    
    qe_udc_reg_init() leaves the USB controller enabled before muram memory
    initialized. Sometimes the uninitialized muram memory confuses the
    controller, and it start sending the busy interrupts.
    
    Fix this by disabling the controller, it will be enabled later by
    the gadget driver, at bind time.
    
    Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit a30551db66afa1b53a4fa7ceadddb7122bdcf491
Author: Anton Vorontsov <avorontsov@ru.mvista.com>
Date:   Thu Dec 25 17:15:05 2008 +0300

    USB: fsl_qe_udc: Fix recursive locking bug in ch9getstatus()
    
    The call chain is this:
    
    qe_udc_irq() <- grabs the udc->lock spinlock
    rx_irq()
    qe_ep0_rx()
    ep0_setup_handle()
    setup_received_handle()
    ch9getstatus()
    qe_ep_queue() <- tries to grab the udc->lock again
    
    It seems unsafe to temporarily drop the lock in the ch9getstatus(),
    so to fix that bug the lock-less __qe_ep_queue() function
    implemented and used by the ch9getstatus().
    
    Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
    Acked-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 94f341db3dd080851f918da37e84659ef760da26
Author: Anton Vorontsov <avorontsov@ru.mvista.com>
Date:   Thu Dec 25 17:15:02 2008 +0300

    USB: fsl_qe_udc: Fix oops on QE UDC probe failure
    
    In case of probing errors the driver kfrees the udc_controller, but it
    doesn't set the pointer to NULL.
    
    When usb_gadget_register_driver is called, it checks for udc_controller
    != NULL, the check passes and the driver accesses nonexistent memory.
    Fix this by setting udc_controller to NULL in case of errors.
    
    While at it, also implement irq_of_parse_and_map()'s failure and cleanup
    cases.
    
    Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
    Acked-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 896abeb743579fc8be0d16d15d6768a158a3a109
Merge: f06da26... 9d9b87c...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Feb 9 10:30:19 2009 -0800

    Merge branch 'for-2.6.29' of git://linux-nfs.org/~bfields/linux
    
    * 'for-2.6.29' of git://linux-nfs.org/~bfields/linux:
      lockd: fix regression in lockd's handling of blocked locks

commit 9d9b87c1218be78ddecbc85ec3bb91c79c1d56ab
Author: J. Bruce Fields <bfields@citi.umich.edu>
Date:   Wed Feb 4 17:35:38 2009 -0500

    lockd: fix regression in lockd's handling of blocked locks
    
    If a client requests a blocking lock, is denied, then requests it again,
    then here in nlmsvc_lock() we will call vfs_lock_file() without FL_SLEEP
    set, because we've already queued a block and don't need the locks code
    to do it again.
    
    But that means vfs_lock_file() will return -EAGAIN instead of
    FILE_LOCK_DENIED.  So we still need to translate that -EAGAIN return
    into a nlm_lck_blocked error in this case, and put ourselves back on
    lockd's block list.
    
    The bug was introduced by bde74e4bc64415b1 "locks: add special return
    value for asynchronous locks".
    
    Thanks to Frank van Maarseveen for the report; his original test
    case was essentially
    
    	for i in `seq 30`; do flock /nfsmount/foo sleep 10 & done
    
    Tested-by: Frank van Maarseveen <frankvm@frankvm.com>
    Reported-by: Frank van Maarseveen <frankvm@frankvm.com>
    Cc: Miklos Szeredi <mszeredi@suse.cz>
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

commit f06da264cfb0f9444d41ca247213e419f90aa72a
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Feb 9 08:57:29 2009 -0800

    i915: Fix more size_t format string warnings
    
    The DRI people seem to have a hard time getting these right (see also
    commit aeb565dfc3ac4c8b47c5049085b4c7bfb2c7d5d7).
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit ff7473300d429118aa97368ba5a16bc63aecfc75
Merge: d7c41b6... d2f5935...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Feb 9 08:52:28 2009 -0800

    Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
    
    * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/i915: select framebuffer support automatically
      drm/i915: add get_vblank_counter function for GM45
      drm/i915: capture last_vblank count at IRQ uninstall time too
      drm/i915: Unlock mutex on i915_gem_fault() error path
      drm/i915: Quiet the message on get/setparam ioctl with an unknown value.
      drm/i915: skip LVDS initialization on Apple Mac Mini
      drm/i915: sync SDVO code with stable userland modesetting driver
      drm/i915: Unref the object after failing to set tiling mode.
      drm/i915: add fence register management to execbuf
      drm/i915: Return error from i915_gem_object_get_fence_reg() when failing.
      drm/i915: Set up an MTRR covering the GTT at driver load.
      drm/i915: Skip SDVO/HDMI init when the chipset tells us it's not present.
      drm/i915: Suppress GEM teardown on X Server exit in KMS mode.
      drm/radeon: fix ioremap conflict with AGP mappings
      i915: fix unneeded locking in i915 LVDS get modes code.

commit d7c41b616518457e3bfece12e3f59f15d7450eeb
Merge: a8e807f... 4f3e797...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Feb 9 08:52:02 2009 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
      crypto: scatterwalk - Avoid flush_dcache_page on slab pages
      crypto: shash - Fix tfm destruction
      crypto: api - Fix zeroing on free
      crypto: shash - Fix module refcount
      crypto: api - Fix algorithm test race that broke aead initialisation

commit a8e807f7607ab633de7be4e2f4c350923cc2cb63
Author: David Howells <dhowells@redhat.com>
Date:   Mon Feb 9 16:47:36 2009 +0000

    FRV: in_interrupt() requires #inclusion of linux/hardirq.h not asm/hardirq.h now
    
    in_interrupt() requires #inclusion of linux/hardirq.h not asm/hardirq.h now.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit a5ef7ca0e2636bad0ccd07b996d775348ae2b65e
Author: Kyle McMartin <kyle@redhat.com>
Date:   Sun Feb 8 17:39:58 2009 -0500

    x86: spinlocks: define dummy __raw_spin_is_contended
    
    Architectures other than mips and x86 are not using ticket spinlocks.
    Therefore, the contention on the lock is meaningless, since there is
    nobody known to be waiting on it (arguably /fairly/ unfair locks).
    
    Dummy it out to return 0 on other architectures.
    
    Signed-off-by: Kyle McMartin <kyle@redhat.com>
    Acked-by: Ralf Baechle <ralf@linux-mips.org>
    Acked-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 4f3e797ad07d52d34983354a77b365dfcd48c1b4
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date:   Mon Feb 9 14:22:14 2009 +1100

    crypto: scatterwalk - Avoid flush_dcache_page on slab pages
    
    It's illegal to call flush_dcache_page on slab pages on a number
    of architectures.  So this patch avoids doing so if PageSlab is
    true.
    
    In future we can move the flush_dcache_page call to those page
    cache users that actually need it.
    
    Reported-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

commit d5b562330ec766292a3ac54ae5e0673610bd5b3d
Author: Hugh Dickins <hugh@veritas.com>
Date:   Sun Feb 8 20:56:58 2009 +0000

    mm: fix error case in mlock downgrade reversion
    
    Commit 27421e211a39784694b597dbf35848b88363c248, Manually revert
    "mlock: downgrade mmap sem while populating mlocked regions", has
    introduced its own regression: __mlock_vma_pages_range() may report
    an error (for example, -EFAULT from trying to lock down pages from
    beyond EOF), but mlock_vma_pages_range() must hide that from its
    callers as before.
    
    Reported-by: Sami Farin <safari-kernel@safari.iki.fi>
    Signed-off-by: Hugh Dickins <hugh@veritas.com>
    Cc: stable@kernel.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit d2f59357700487a8b944f4f7777d1e97cf5ea2ed
Author: Ingo Molnar <mingo@elte.hu>
Date:   Thu Feb 5 16:03:34 2009 +0100

    drm/i915: select framebuffer support automatically
    
    Migration helper.
    
    The i915 driver recently added a 'depends on FB' rule to its
    Kconfig entry - which silently turns off DRM_I915 if someone
    has a working config but no CONFIG_FB selected, and upgrades
    to the latest upstream kernel.
    
    Norbert Preining reported this problem:
    
       Bug-Entry   : http://bugzilla.kernel.org/show_bug.cgi?id=12599
       Subject     : dri /dev node disappeared with 2.6.29-rc1
    
    So change it to "select FB", which auto-selects framebuffer
    support. This way the driver keeps working, regardless of
    whether FB was enabled before or not.
    
    Kconfig select's of interactive options can be problematic to
    dependencies and can cause build breakages - but in this case
    it's safe because it's a leaf entry with no dependencies of its
    own.
    
    ( There is some minor circular dependency fallout as FB_I810
      and FB_INTEL also used 'depends on FB' constructs - update
      those to "select FB" too. )
    
    Reported-by: Norbert Preining <preining@logic.at>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit 9880b7a527ffbb52f65c2de0a8d4eea86e24775e
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Fri Feb 6 10:22:41 2009 -0800

    drm/i915: add get_vblank_counter function for GM45
    
    As discussed in the long thread about vblank related timeouts, it turns out
    GM45 has different frame count registers than previous chips.  This patch
    adds support for them, which prevents us from waiting on really stale
    sequence values in drm_wait_vblank (which rather than returning immediately
    ends up timing out or getting interrupted).
    
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit 14d200c5e5bd19219d930bbb9a5a22758c8f5bec
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Fri Feb 6 13:04:49 2009 -0800

    drm/i915: capture last_vblank count at IRQ uninstall time too
    
    In dc1336ff4fe08ae7cfe8301bfd7f0b2cfd31d20a (set vblank enable flag correctly
    across IRQ uninstall), we made sure drivers that uninstall their interrupt
    handler set the vblank enabled flag correctly, so that when interrupts are
    re-enabled, vblank interrupts & counts work as expected.  However I missed the
    last_vblank field:  it needs to be updated as well, otherwise, at the next
    drm_update_vblank_count we'll end up comparing a current count to a stale
    one (the last one captured by the disable function), which may trigger the
    wraparound handling, leading to a jumpy counter and hangs in drm_wait_vblank.
    
    The jumpy counter can prevent the DRM_WAIT_ON from returning success if the
    difference between the current count and the requested count is greater than
    2^23, leading to timeouts or hangs, if the ioctl is restarted in a loop (as
    is the case in libdrm < 2.4.4).
    
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Acked-by: Michel Dänzer <michel@daenzer.net>
    Tested-by: Timo Aaltonen <tjaalton@cc.hut.fi>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 7d8d58b23fd01e60ed44d8d8c10b2df86e638faa
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Wed Feb 4 14:15:10 2009 +0000

    drm/i915: Unlock mutex on i915_gem_fault() error path
    
    If we failed to allocate a new fence register we would return
    VM_FAULT_SIGBUS without relinquishing the lock.
    
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit 122ee2a63bc49d21f402f6b6d2208306cdcc98c1
Author: Eric Anholt <eric@anholt.net>
Date:   Tue Feb 3 12:10:21 2009 -0800

    drm/i915: Quiet the message on get/setparam ioctl with an unknown value.
    
    Getting an unknown get/setparam used to be more significant back when they
    didn't change much.  However, now that we're in the git world we're using
    them instead of a monotonic version number to signal feature availability,
    so clients ask about unknown params on older kernels more often.
    
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit 565dcd4635f4f8c0ac4dee38a5625bc325799b1e
Author: Paul Collins <paul@burly.ondioline.org>
Date:   Wed Feb 4 23:05:41 2009 +1300

    drm/i915: skip LVDS initialization on Apple Mac Mini
    
    The Apple Mac Mini falsely reports LVDS.  Use DMI to check whether we
    are running on a Mac Mini, and skip LVDS initialization if that proves
    to be the case.
    
    Signed-off-by: Paul Collins <paul@ondioline.org>
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit e2f0ba97d60e59fe5c6237851933a9c38a8f9a24
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Mon Feb 2 15:11:52 2009 -0800

    drm/i915: sync SDVO code with stable userland modesetting driver
    
    Pull in an update from the 2D driver (hopefully the last one, future work
    should be done here and pulled back into xf86-video-intel as needed).
    
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit 72daad40dc0be179e0dc85c17d5dc1e850b5e8e4
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Fri Jan 30 21:10:22 2009 +0000

    drm/i915: Unref the object after failing to set tiling mode.
    
    Cleanup the object reference on the error paths.
    
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit 0f973f27888e4664b253ab2cf69c67c2eb80ab1b
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Mon Jan 26 17:10:45 2009 -0800

    drm/i915: add fence register management to execbuf
    
    Adds code to set up fence registers at execbuf time on pre-965 chips as
    necessary.  Also fixes up a few bugs in the pre-965 tile register support
    (get_order != ffs).  The number of fences available to the kernel defaults
    to the hw limit minus 3 (for legacy X front/back/depth), but a new parameter
    allows userspace to override that as needed.
    
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit d9ddcb96e05cfbadf3dbf66859bcaf5eae25af0b
Author: Eric Anholt <eric@anholt.net>
Date:   Tue Jan 27 10:33:49 2009 -0800

    drm/i915: Return error from i915_gem_object_get_fence_reg() when failing.
    
    Previously, the caller would continue along without knowing that the
    function failed, resulting in potential mis-rendering.  Right now vm_fault
    just returns SIGBUS in that case, and we may need to disable signal handling
    to avoid that happening.
    
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit ab657db12d7020629f26f30d287558a8d0e32b41
Author: Eric Anholt <eric@anholt.net>
Date:   Fri Jan 23 12:57:47 2009 -0800

    drm/i915: Set up an MTRR covering the GTT at driver load.
    
    We'd love to just be using PAT, but even on chips with PAT it gets disabled
    sometimes due to an errata.  It would probably be better to have pat_enabled
    exported and only bother with this when !pat_enabled.
    
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit 725e30ad6601d7fe443d9215d6331758a9d7e0c8
Author: Eric Anholt <eric@anholt.net>
Date:   Thu Jan 22 13:01:02 2009 -0800

    drm/i915: Skip SDVO/HDMI init when the chipset tells us it's not present.
    
    This saves startup time from probing SDVO, and saves setting up HDMI outputs
    on G4X devices that don't have them.
    
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit e806b4957412bf472d826bd8cc571da041248799
Author: Eric Anholt <eric@anholt.net>
Date:   Thu Jan 22 09:56:58 2009 -0800

    drm/i915: Suppress GEM teardown on X Server exit in KMS mode.
    
    Fixes hangs when starting X for the second time.
    
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit 9b8d5a124f133fe9a75397d20b874844a2e3d7e9
Author: Dave Airlie <airlied@linux.ie>
Date:   Sat Feb 7 11:15:41 2009 +1000

    drm/radeon: fix ioremap conflict with AGP mappings
    
    this solves a regression from
    http://bugzilla.kernel.org/show_bug.cgi?id=12441
    
    Reported-by: Daniel Vetter <daniel@ffwll.ch>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 732553e567c2700ba5b9bccc6ec885c75779a94b
Author: Mark Langsdorf <mark.langsdorf@amd.com>
Date:   Tue Feb 3 17:46:43 2009 +0100

    [CPUFREQ] powernow-k8: Get transition latency from ACPI _PSS table
    
    At this time, the PowerNow! driver for K8 uses an experimentally
    derived formula to calculate transition latency.  The value it
    provides is orders of magnitude too large on modern systems.
    This patch replaces the formula with ACPI _PSS latency values
    for more accuracy and better performance.
    
    I've tested it on two 2nd generation Opteron systems, a 3rd
    generation Operton system, and a Turion X2 without seeing any
    stability problems.
    
    Signed-off-by: Mark Langsdorf <mark.langsdorf@amd.com>
    Signed-off-by: Thomas Renninger <trenn@suse.de>
    Signed-off-by: Dave Jones <davej@redhat.com>

commit 1ca3abdb6a4b87246b00292f048acd344325fd12
Author: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Date:   Fri Jan 23 09:25:02 2009 -0500

    [CPUFREQ] Make ignore_nice_load setting of ondemand work as expected.
    
    ondemand micro-accounting of idle time changes broke ignore_nice_load
    sysfs setting due to a thinko in the code.
    
    The bug entry:
    http://bugzilla.kernel.org/show_bug.cgi?id=12310
    
    Reported-by: Jim Bray <jimsantelmo@gmail.com>
    
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Dave Jones <davej@redhat.com>

commit 412e87ae5d852bc3d836f475c19d954b3324363d
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date:   Thu Feb 5 16:51:25 2009 +1100

    crypto: shash - Fix tfm destruction
    
    We were freeing an offset into the slab object instead of the
    start.  This patch fixes it by calling crypto_destroy_tfm which
    allows the correct address to be given.
    
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

commit 7b2cd92adc5430b0c1adeb120971852b4ea1ab08
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date:   Thu Feb 5 16:48:24 2009 +1100

    crypto: api - Fix zeroing on free
    
    Geert Uytterhoeven pointed out that we're not zeroing all the
    memory when freeing a transform.  This patch fixes it by calling
    ksize to ensure that we zero everything in sight.
    
    Reported-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

commit 4abfd73e34e7915e62b6f75bd3e9f4014f830910
Author: Adrian-Ken Rueegsegger <rueegsegger@swiss-it.ch>
Date:   Thu Feb 5 16:19:31 2009 +1100

    crypto: shash - Fix module refcount
    
    Module reference counting for shash is incorrect: when
    a new shash transformation is created the refcount is not
    increased as it should.
    
    Signed-off-by: Adrian-Ken Rueegsegger <rueegsegger@swiss-it.ch>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

commit ac048e1734699dd98f4bdf4daf2b9592d4a4d38e
Author: Dave Airlie <airlied@redhat.com>
Date:   Tue Feb 3 19:05:12 2009 +1000

    i915: fix unneeded locking in i915 LVDS get modes code.
    
    This code is always called under the lock from the higher layers,
    so need to go locking it here.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit b8e15992b420d09dae831125a623c474c8637cee
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date:   Wed Jan 28 14:09:59 2009 +1100

    crypto: api - Fix algorithm test race that broke aead initialisation
    
    When we complete a test we'll notify everyone waiting on it, drop
    the mutex, and then remove the test larval (after reacquiring the
    mutex).  If one of the notified parties tries to register another
    algorithm with the same driver name prior to the removal of the
    test larval, they will fail with EEXIST as only one algorithm of
    a given name can be tested at any time.
    
    This broke the initialisation of aead and givcipher algorithms as
    they will register two algorithms with the same driver name, in
    sequence.
    
    This patch fixes the problem by marking the larval as dead before
    we drop the mutex, and also ignoring all dead or dying algorithms
    on the registration path.
    
    Tested-by: Andreas Steffen <andreas.steffen@strongswan.org>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>