commit c0f4d6d4b14a75a341d972ff73fb9740e1ceb634
Merge: 1126388... 1eda814...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Sep 24 16:39:50 2008 -0700

    Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86: prevent stale state of c1e_mask across CPU offline/online, fix

commit 1126388609dee3f2aca2a64de7b0709d0fede785
Merge: 08ec3c2... 5291925...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Sep 24 16:38:52 2008 -0700

    Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
    
    * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
      [MIPS] Fixe the definition of PTRS_PER_PGD
      [MIPS] au1000: Fix gpio direction

commit 08ec3c2d45bac41c782acb4e3331ac5881b2c68a
Author: David Howells <dhowells@redhat.com>
Date:   Wed Sep 24 17:48:31 2008 +0100

    MN10300: Make sched_clock() report time since boot
    
    Make sched_clock() report time since boot rather than time since last
    timer interrupt.
    
    Make sched_clock() expand and scale the 32-bit TSC value running at
    IOCLK speed (~33MHz) to a 64-bit nanosecond counter, using cnt32_to_63()
    acquired from the ARM arch and without using slow DIVU instructions
    every call.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit b4f151ff899362fec952c45d166252c9912c041f
Author: David Howells <dhowells@redhat.com>
Date:   Wed Sep 24 17:48:26 2008 +0100

    MN10300: Move asm-arm/cnt32_to_63.h to include/linux/
    
    Move asm-arm/cnt32_to_63.h to include/linux/ so that MN10300 can make
    use of it too.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 7a528159b93bc52c14aedff55d53e741227fc846
Merge: fb478da... 16ec470...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Sep 24 15:33:50 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
      9p: fix put_data error handling
      9p: use an IS_ERR test rather than a NULL test
      9p: introduce missing kfree
      9p-trans_fd: fix and clean up module init/exit paths
      9p-trans_fd: don't do fs segment mangling in p9_fd_poll()
      9p-trans_fd: clean up p9_conn_create()
      9p-trans_fd: fix trans_fd::p9_conn_destroy()
      9p: implement proper trans module refcounting and unregistration

commit 16ec4700127d479143c77fd9128dfa17ab572963
Author: Eric Van Hensbergen <ericvh@ericvh-desktop.austin.ibm.com>
Date:   Wed Sep 24 16:22:22 2008 -0500

    9p: fix put_data error handling
    
    Abhishek Kulkarni pointed out an inconsistency in the way
    errors are returned from p9_put_data.  On deeper exploration it
    seems the error handling for this path was completely wrong.
    This patch adds checks for allocation problems and propagates
    errors correctly.
    
    Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>

commit 62aa528e0299ffef8e138d9d92d13e631d06c5ff
Author: Julien Brunel <brunel@diku.dk>
Date:   Wed Sep 24 16:22:22 2008 -0500

    9p: use an IS_ERR test rather than a NULL test
    
    In case of error, the function p9_client_walk returns an ERR pointer, but
    never returns a NULL pointer.  So a NULL test that comes after an IS_ERR
    test should be deleted.
    
    The semantic match that finds this problem is as follows:
    (http://www.emn.fr/x-info/coccinelle/)
    
    // <smpl>
    @match_bad_null_test@
    expression x, E;
    statement S1,S2;
    @@
    x = p9_client_walk(...)
    ... when != x = E
    *  if (x != NULL)
    S1 else S2
    // </smpl>
    
    Signed-off-by: Julien Brunel <brunel@diku.dk>
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

commit 620678244bc7b83287e2e283ed4fe6b959e94b7d
Author: Julia Lawall <julia@diku.dk>
Date:   Wed Sep 24 16:22:22 2008 -0500

    9p: introduce missing kfree
    
    Error handling code following a kmalloc should free the allocated data.
    
    The semantic match that finds the problem is as follows:
    (http://www.emn.fr/x-info/coccinelle/)
    
    // <smpl>
    @r exists@
    local idexpression x;
    statement S;
    expression E;
    identifier f,l;
    position p1,p2;
    expression *ptr != NULL;
    @@
    
    (
    if ((x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...)) == NULL) S
    |
    x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...);
    ...
    if (x == NULL) S
    )
    <... when != x
         when != if (...) { <+...x...+> }
    x->f = E
    ...>
    (
     return \(0\|<+...x...+>\|ptr\);
    |
     return@p2 ...;
    )
    
    @script:python@
    p1 << r.p1;
    p2 << r.p2;
    @@
    
    print "* file: %s kmalloc %s return %s" % (p1[0].file,p1[0].line,p2[0].line)
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

commit 206ca50de77033c6cc17d0e14fbb12d119a67b01
Author: Tejun Heo <tj@kernel.org>
Date:   Wed Sep 24 16:22:23 2008 -0500

    9p-trans_fd: fix and clean up module init/exit paths
    
    trans_fd leaked p9_mux_wq on module unload.  Fix it.  While at it,
    collapse p9_mux_global_init() into p9_trans_fd_init().  It's easier to
    follow this way and the global poll_tasks array is about to removed
    anyway.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>

commit ec3c68f232f6d98b4596c05c1c7551b44c617c5f
Author: Tejun Heo <tj@kernel.org>
Date:   Wed Sep 24 16:22:23 2008 -0500

    9p-trans_fd: don't do fs segment mangling in p9_fd_poll()
    
    p9_fd_poll() is never called with user pointers and f_op->poll()
    doesn't expect its arguments to be from userland.  There's no need to
    set kernel ds before calling f_op->poll() from p9_fd_poll().  Remove
    it.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>

commit 571ffeafffbfdd0b8f2f9d3b991028797ec87e42
Author: Tejun Heo <tj@kernel.org>
Date:   Wed Sep 24 16:22:23 2008 -0500

    9p-trans_fd: clean up p9_conn_create()
    
    * Use kzalloc() to allocate p9_conn and remove 0/NULL initializations.
    
    * Clean up error return paths.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>

commit 7dc5d24be06a5ed874af035d52a083a7b61ef1bd
Author: Tejun Heo <tj@kernel.org>
Date:   Wed Sep 24 16:22:23 2008 -0500

    9p-trans_fd: fix trans_fd::p9_conn_destroy()
    
    p9_conn_destroy() first kills all current requests by calling
    p9_conn_cancel(), then waits for the request list to be cleared by
    waiting on p9_conn->equeue.  After that, polling is stopped and the
    trans is destroyed.  This sequence has a few problems.
    
    * Read and write works were never cancelled and the p9_conn can be
      destroyed while the works are running as r/w works remove requests
      from the list and dereference the p9_conn from them.
    
    * The list emptiness wait using p9_conn->equeue wouldn't trigger
      because p9_conn_cancel() always clears all the lists and the only
      way the wait can be triggered is to have another task to issue a
      request between the slim window between p9_conn_cancel() and the
      wait, which isn't safe under the current implementation with or
      without the wait.
    
    This patch fixes the problem by first stopping poll, which can
    schedule r/w works, first and cancle r/w works which guarantees that
    r/w works are not and will not run from that point and then calling
    p9_conn_cancel() and do the rest of destruction.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>

commit 72029fe85d8d060b3f966f2dbc36b3c75b5a6532
Author: Tejun Heo <tj@kernel.org>
Date:   Wed Sep 24 16:22:23 2008 -0500

    9p: implement proper trans module refcounting and unregistration
    
    9p trans modules aren't refcounted nor were they unregistered
    properly.  Fix it.
    
    * Add 9p_trans_module->owner and reference the module on each trans
      instance creation and put it on destruction.
    
    * Protect v9fs_trans_list with a spinlock.  This isn't strictly
      necessary as the list is manipulated only during module loading /
      unloading but it's a good idea to make the API safe.
    
    * Unregister trans modules when the corresponding module is being
      unloaded.
    
    * While at it, kill unnecessary EXPORT_SYMBOL on p9_trans_fd_init().
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>

commit 1eda81495a49a4ee91d8863b0a441a624375efea
Author: Marc Dionne <marc.c.dionne@gmail.com>
Date:   Tue Sep 23 22:40:02 2008 -0400

    x86: prevent stale state of c1e_mask across CPU offline/online, fix
    
    Fix build error introduced by commit 4faac97d44ac27 ("x86: prevent stale
    state of c1e_mask across CPU offline/online").
    
    process_32.c needs to include idle.h to get the prototype for
    c1e_remove_cpu()
    
    Signed-off-by: Marc Dionne <marc.c.dionne@gmail.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 5291925a9a65ea334f6e887d0f01dd119b8e2b2e
Author: Jack Tan <jack.tan@windriver.com>
Date:   Tue Sep 23 22:52:34 2008 +0800

    [MIPS] Fixe the definition of PTRS_PER_PGD
    
    When we use > 4KB's page size the original definition is not consistent
    with PGDIR_SIZE. For exeample, if we use 16KB page size the PGDIR_SHIFT is
    (14-2) + 14 = 26, PGDIR_SIZE is 2^26，so the PTRS_PER_PGD should be:
    
    	2^32/2^26 = 2^6
    
    but the original definition of PTRS_PER_PGD is 4096 (PGDIR_ORDER = 0).
    
    So, this definition needs to be consistent with the PGDIR_SIZE.
    
    And the new definition is consistent with the PGD init in pagetable_init().
    
    Signed-off-by: Dajie Tan <jiankemeng@gmail.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 44ce17192a01218b242e032237e1d2e52ef50429
Author: Bruno Randolf <br1@einfach.org>
Date:   Tue Sep 23 19:48:36 2008 +0200

    [MIPS] au1000: Fix gpio direction
    
    When setting the direction of one GPIO pin we have to keep the state of the
    other pins, hence use binary OR. Also gpio_direction_output() wants to set an
    initial value, so add that too.
    
    This fixes a problem with the USB power switch on mtx-1 boards.
    
    Signed-off-by: Bruno Randolf <br1@einfach.org>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit fb478da5ba69ecf40729ae8ab37ca406b1e5be48
Merge: 8553f32... 5257d97...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Sep 23 14:58:51 2008 -0700

    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: (23 commits)
      USB: revert recovery from transient errors
      usb: unusual devs patch for Nokia 5310 Music Xpress
      usb: ftdi_sio: add support for Domintell devices
      USB: drivers/usb/musb/: disable it on SuperH
      USB Serial: Sierra: Add MC8785 VID/PID
      USB: serial: add ZTE CDMA Tech id to option driver
      USB: ftdi_sio: Add 0x5050/0x0900 USB IDs (Papouch Quido USB 4/4)
      usb serial: ti_usb_3410_5052 obviously broken by firmware changes
      USB: fsl_usb2_udc: fix VDBG() format string
      USB: unusual_devs addition for RockChip MP3 player
      USB: SERIAL CP2101 add device IDs
      usb-serial: Add Siemens EF81 to PL-2303 hack triggers
      USB: fix EHCI periodic transfers
      usb: musb: fix include path
      USB: Fixing Nokia 3310c in storage mode
      usb gadget: fix omap_udc DMA regression
      USB: update of Documentation/usb/anchors.txt
      USB: fix hcd interrupt disabling
      USB: Correct Sierra Wireless USB EVDO Modem Device ID
      USB: Fix the Nokia 6300 storage-mode.
      ...

commit 8553f321e0fd29821135ac4797b5f37bf80ae2e9
Merge: be3be89... f8e256c...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Sep 23 14:57:36 2008 -0700

    Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      timers: fix build error in !oneshot case
      x86: c1e_idle: don't mark TSC unstable if CPU has invariant TSC
      x86: prevent C-states hang on AMD C1E enabled machines
      clockevents: prevent mode mismatch on cpu online
      clockevents: check broadcast device not tick device
      clockevents: prevent stale tick_next_period for onlining CPUs
      x86: prevent stale state of c1e_mask across CPU offline/online
      clockevents: prevent cpu online to interfere with nohz

commit be3be8905854d2fcf6030f1da9ebc221e9e2c5f1
Merge: 9c38c7e... fa74820...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Sep 23 14:57:22 2008 -0700

    Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      sched: fix init_hrtick() section mismatch warning

commit 9c38c7e573ec44e4a10f735c048b40eb00ccc29c
Merge: e002bcc... 05e12e1...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Sep 23 14:56:45 2008 -0700

    Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86: fix 27-rc crash on vsmp due to paravirt during module load
      x86, oprofile: BUG scheduling while atomic
      AMD IOMMU: protect completion wait loop with iommu lock
      AMD IOMMU: set iommu sunc flag after command queuing

commit 5257d97a219e17abf8188f136e1189da3b3af33c
Author: Alan Stern <stern@rowland.harvard.edu>
Date:   Mon Sep 22 14:43:08 2008 -0400

    USB: revert recovery from transient errors
    
    This patch (as1135) essentially reverts the major parts of two earlier
    patches to usbcore, because they ended up causing a regression.
    
    Trying to recover from transient communication errors can lead to
    other problems, because operations that failed during the error period
    are not always retried.  The simplest example is the initial
    Set-Config request sent after device enumeration; if it gets lost then
    it will not be retried and the device will remain unconfigured.
    
    This patch restores the old behavior in which any port disconnect or
    port disable causes the entire device structure to be removed, fixing a
    reported regression.
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Tested-by: Frans Pop <elendil@planet.nl>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit af747c460b663a4b7795dc3f6897b5506fde6888
Author: David Almaroad <dalmaroad@gmail.com>
Date:   Mon Sep 22 15:00:11 2008 -0700

    usb: unusual devs patch for Nokia 5310 Music Xpress
    
    The Nokia 5310 Music Xpress phone reports one too many sectors in
    usb-storage mode.  This patch resolves that.
    
    Signed-off-by: David Almaroad <dalmaroad@gmail.com>
    Cc: Matthew Dharm <mdharm-usb@one-eyed-alien.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 96285cb885b445b03b22849f2536af23c7454a11
Author: Gaetan Carlier <gcpatch@gmail.com>
Date:   Mon Sep 22 15:00:09 2008 -0700

    usb: ftdi_sio: add support for Domintell devices
    
    Support for Domintell devices (FTDI FT232BM based) : DGQG and DUSB01
    module.  PIDs were missing.
    
    Signed-off-by: Gaetan Carlier <gcpatch@gmail.com>
    Cc: Greg Kroah-Hartman <gregkh@suse.de>
    Cc: Ian Abbott <abbotti@mev.co.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 09fa14aa9273ca5cf5459b2057eb79e83e81e6be
Author: Andrew Morton <akpm@linux-foundation.org>
Date:   Mon Sep 22 15:00:08 2008 -0700

    USB: drivers/usb/musb/: disable it on SuperH
    
    In file included from drivers/usb/musb/musb_core.h:59,
                     from drivers/usb/musb/musb_core.c:108:
    drivers/usb/musb/musb_io.h:42: error: conflicting types for '__raw_readsl'
    /usr/src/devel/arch/sh/include/asm/io.h:112: error: previous declaration of '__raw_readsl' was here
    drivers/usb/musb/musb_io.h:42: error: conflicting types for '__raw_readsl'
    /usr/src/devel/arch/sh/include/asm/io.h:112: error: previous declaration of '__raw_readsl' was here
    drivers/usb/musb/musb_io.h:44: error: conflicting types for 'readsw'
    /usr/src/devel/arch/sh/include/asm/io.h:164: error: previous definition of 'readsw' was here
    drivers/usb/musb/musb_io.h:46: error: conflicting types for 'readsb'
    /usr/src/devel/arch/sh/include/asm/io.h:163: error: previous definition of 'readsb' was here
    drivers/usb/musb/musb_io.h:49: error: conflicting types for '__raw_writesl'
    /usr/src/devel/arch/sh/include/asm/io.h:111: error: previous declaration of '__raw_writesl' was here
    drivers/usb/musb/musb_io.h:49: error: conflicting types for '__raw_writesl'
    /usr/src/devel/arch/sh/include/asm/io.h:111: error: previous declaration of '__raw_writesl' was here
    drivers/usb/musb/musb_io.h:51: error: conflicting types for 'writesw'
    /usr/src/devel/arch/sh/include/asm/io.h:164: error: previous definition of 'writesw' was here
    drivers/usb/musb/musb_io.h:53: error: conflicting types for 'writesb'
    /usr/src/devel/arch/sh/include/asm/io.h:163: error: previous definition of 'writesb' was here
    
    Cc: Karsten Keil <kkeil@suse.de>
    Cc: Paul Mundt <lethal@linux-sh.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit b77a5c7040643e658622148bb7d7dad63e8d0158
Author: Kevin Lloyd <klloyd@sierrawireless.com>
Date:   Wed Sep 17 09:03:38 2008 -0700

    USB Serial: Sierra: Add MC8785 VID/PID
    
    Add another MC8785 VID/PID
    
    Signed-off-by: Kevin Lloyd <klloyd@sierrawireless.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 884579d03a3e1e9ac8b7f32a1c36387cac3eb80b
Author: Otavio Salvador <otavio@ossystems.com.br>
Date:   Wed Sep 17 14:40:46 2008 -0300

    USB: serial: add ZTE CDMA Tech id to option driver
    
    Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit a18f80b4e2fdbc7b88d412c3deb533b9f1f30c30
Author: Jaroslav Kysela <perex@perex.cz>
Date:   Tue Sep 16 15:46:50 2008 +0200

    USB: ftdi_sio: Add 0x5050/0x0900 USB IDs (Papouch Quido USB 4/4)
    
    USB: ftdi_sio: Add 0x5050/0x0900 USB IDs (Papouch Quido USB 4/4)
    
    Signed-off-by: Jaroslav Kysela <perex@perex.cz>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 2bcbe4c199ec012169f938d2c6b543f50c4925ed
Author: Chris Adams <cmadams@hiwaay.net>
Date:   Wed Sep 10 14:11:38 2008 -0700

    usb serial: ti_usb_3410_5052 obviously broken by firmware changes
    
    While making some other changes to ti_usb_3410_5052, I noticed that the
    changes made to move the firmware loading to a separate function are
    broken (in ti_download_firmware(), status is set to -ENOMEM and never
    changed).  This means the driver will never initialize the device
    properly.  It looks like status was supposed to get the result of
    ti_do_download().
    
    Signed-off-by: Chris Adams <cmadams@hiwaay.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 6ef65a7fb609a7aca72730dfb9890f30fcd723bf
Author: Peter Korsgaard <jacmet@sunsite.dk>
Date:   Mon Sep 8 10:08:59 2008 +0200

    USB: fsl_usb2_udc: fix VDBG() format string
    
    Fixes:
    drivers/usb/gadget/fsl_usb2_udc.c: In function 'dr_controller_setup':
    drivers/usb/gadget/fsl_usb2_udc.c:229: warning: format '%p' expects type
    'void *', but argument 3 has type 'int'
    
    Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit fe1926a0f549741ed0ca778aa1c7d3e208895dee
Author: Alan Stern <stern@rowland.harvard.edu>
Date:   Thu Sep 4 09:56:35 2008 -0400

    USB: unusual_devs addition for RockChip MP3 player
    
    This patch (as1136) adds an unusual_devs entry for a version of the
    RockChip MP3 player which can't handle the MODE SENSE command used for
    write-protect detection.
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit ba0f332c413796925ce322d311d75269689a9e5d
Author: Craig Shelley <craig@microtron.org.uk>
Date:   Thu Sep 4 21:28:21 2008 +0100

    USB: SERIAL CP2101 add device IDs
    
    Signed-off-by: Craig Shelley <craig@microtron.org.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit ce816cf9c917435cd2e3b68acc7cfe2c1f4a814f
Author: Andreas Bombe <aeb@debian.org>
Date:   Sun Sep 14 01:58:55 2008 +0200

    usb-serial: Add Siemens EF81 to PL-2303 hack triggers
    
    This hardware needs the pl2303 hack in order to work properly :(
    
    Signed-off-by: Andreas Bombe <aeb@debian.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 01c17142659c02d8cd4c67acdd8358180c5c4fb6
Author: David Brownell <dbrownell@users.sourceforge.net>
Date:   Tue Aug 26 23:35:04 2008 -0700

    USB: fix EHCI periodic transfers
    
    As noted by Stefan Neis <Stefan.Neis@kobil.com>, we had a recent
    regression with EHCI periodic transfers, in some (seemingly not
    all that common) cases.
    
    The root cause was that the schedule activation was only loosely
    coupled to the addition or removal of transfers, so two different
    execution contexts could both think they had to deactivate (or
    conversely activate) the schedule.  So this fix tightens that
    coupling, managing it more like a refcount.
    
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 0590d5875e3a5dc6586fb16354037f115628896d
Author: Felipe Balbi <felipe.balbi@nokia.com>
Date:   Sat Aug 30 19:42:02 2008 +0300

    usb: musb: fix include path
    
    headers were moved, fixing.
    
    Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 49cd2480baeb377f91e66ba682f81cac2a1feaa1
Author: Filip Joelsson <filip@blueturtle.nu>
Date:   Sun Aug 31 08:22:16 2008 +0200

    USB: Fixing Nokia 3310c in storage mode
    
    I had trouble connecting my cell phone as a storage device - so I added
    it to the unusual_devs.h list. I had trouble with the bcdDeviceMin and
    Max values - so after some experimenting I made it pretty inclusive.
    
    From: Filip Joelsson <filip@blueturtle.nu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit c3e3208e4b0cf4ed69cbcaa5e059e5cf64437c9a
Author: David Brownell <dbrownell@users.sourceforge.net>
Date:   Sun Aug 31 18:04:27 2008 -0700

    usb gadget: fix omap_udc DMA regression
    
    This resolves another regression caused by the "use omap_read/write
    instead of __REG" patch:  the hardware address used for DMA to/from
    the UDC became wrong.  Bug noted by Russell King.
    
    Reported-by: Russell King <rmk@arm.linux.org.uk>
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Acked-by: Russell King <rmk@arm.linux.org.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 697e04db5678fadf96d437806b676403ebee806d
Author: Oliver Neukum <oliver@neukum.org>
Date:   Tue Sep 2 10:52:08 2008 +0200

    USB: update of Documentation/usb/anchors.txt
    
    The extended anchor API is documented
    
    Signed-off-by: Oliver Neukum <oneukum@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 83a798207361cc26385187b2e71efa2b5d75de7f
Author: Geoff Levand <geoffrey.levand@am.sony.com>
Date:   Fri Aug 22 14:13:00 2008 -0700

    USB: fix hcd interrupt disabling
    
    Commit de85422b94ddb23c021126815ea49414047c13dc, 'USB: fix interrupt
    disabling for HCDs with shared interrupt handlers' changed usb_add_hcd()
    to strip IRQF_DISABLED from irqflags prior to calling request_irq()
    with the justification that such a removal was necessary for shared
    interrupts to work properly.  Unfortunately, the change in that commit
    unconditionally removes the IRQF_DISABLED flag, causing problems on
    platforms that don't use a shared interrupt but require IRQF_DISABLED.
    This change adds a check for IRQF_SHARED prior to removing the
    IRQF_DISABLED flag.
    
    Fixes the PS3 system startup hang reported with recent Fedora and
    OpenSUSE kernels.
    
    Note that this problem is hidden when CONFIG_LOCKDEP=y (ps3_defconfig),
    as local_irq_enable_in_hardirq() is defined as a null statement for
    that config.
    
    CC: stable <stable@kernel.org>
    Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
    Cc: Alan Stern <stern@rowland.harvard.edu>
    Cc: Stefan Becker <Stefan.Becker@nokia.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit f8834f1febb8f56cdcfeb35485e0cc7a8d547818
Author: Tony Murray <murraytony@gmail.com>
Date:   Fri Aug 22 17:30:44 2008 -0500

    USB: Correct Sierra Wireless USB EVDO Modem Device ID
    
    I was trying to figure out why my device wasn't supported by the
    drivers/usb/serial/sierra.c driver, while looking throught the device
    IDs I spotted what I believe to be a typo in the device IDs.  Please
    apply the following patch
    
    If you look down further, there is another HP wireless broadband card,
    which has a vendor ID of 03f0, like my device.  Below is my "lsusb -v
    -d 03f0:1b1d".
    
    Bus 001 Device 005: ID 03f0:1b1d Hewlett-Packard
    Device Descriptor:
      bLength                18
      bDescriptorType         1
      bcdUSB               1.10
      bDeviceClass            0 (Defined at Interface level)
      bDeviceSubClass         0
      bDeviceProtocol         0
      bMaxPacketSize0        64
      idVendor           0x03f0 Hewlett-Packard
      idProduct          0x1b1d
      bcdDevice            0.01
      iManufacturer           1 HP
      iProduct                2 HP ev2200 1xEV-DO Broadband Wireless Module
      iSerial                 0
      bNumConfigurations      1
      Configuration Descriptor:
        bLength                 9
        bDescriptorType         2
        wTotalLength           67
        bNumInterfaces          1
        bConfigurationValue     1
        iConfiguration          0
        bmAttributes         0xe0
          Self Powered
          Remote Wakeup
        MaxPower                0mA
        Interface Descriptor:
          bLength                 9
          bDescriptorType         4
          bInterfaceNumber        0
          bAlternateSetting       0
          bNumEndpoints           7
          bInterfaceClass       255 Vendor Specific Class
          bInterfaceSubClass    255 Vendor Specific Subclass
          bInterfaceProtocol    255 Vendor Specific Protocol
          iInterface              3 Data Interface
          Endpoint Descriptor:
            bLength                 7
            bDescriptorType         5
            bEndpointAddress     0x81  EP 1 IN
            bmAttributes            3
              Transfer Type            Interrupt
              Synch Type               None
              Usage Type               Data
            wMaxPacketSize     0x0010  1x 16 bytes
            bInterval             128
          Endpoint Descriptor:
            bLength                 7
            bDescriptorType         5
            bEndpointAddress     0x82  EP 2 IN
            bmAttributes            2
              Transfer Type            Bulk
              Synch Type               None
              Usage Type               Data
            wMaxPacketSize     0x0040  1x 64 bytes
            bInterval               0
          Endpoint Descriptor:
            bLength                 7
            bDescriptorType         5
            bEndpointAddress     0x02  EP 2 OUT
            bmAttributes            2
              Transfer Type            Bulk
              Synch Type               None
              Usage Type               Data
            wMaxPacketSize     0x0040  1x 64 bytes
            bInterval               0
          Endpoint Descriptor:
            bLength                 7
            bDescriptorType         5
            bEndpointAddress     0x84  EP 4 IN
            bmAttributes            2
              Transfer Type            Bulk
              Synch Type               None
              Usage Type               Data
            wMaxPacketSize     0x0040  1x 64 bytes
            bInterval               0
          Endpoint Descriptor:
            bLength                 7
            bDescriptorType         5
            bEndpointAddress     0x04  EP 4 OUT
            bmAttributes            2
              Transfer Type            Bulk
              Synch Type               None
              Usage Type               Data
            wMaxPacketSize     0x0040  1x 64 bytes
            bInterval               0
          Endpoint Descriptor:
            bLength                 7
            bDescriptorType         5
            bEndpointAddress     0x85  EP 5 IN
            bmAttributes            2
              Transfer Type            Bulk
              Synch Type               None
              Usage Type               Data
            wMaxPacketSize     0x0040  1x 64 bytes
            bInterval               0
          Endpoint Descriptor:
            bLength                 7
            bDescriptorType         5
            bEndpointAddress     0x05  EP 5 OUT
            bmAttributes            2
              Transfer Type            Bulk
              Synch Type               None
              Usage Type               Data
            wMaxPacketSize     0x0040  1x 64 bytes
            bInterval               0
    Device Status:     0x0000
      (Bus Powered)
    
    From: Tony Murray <murraytony@gmail.com>
    Cc: Kevin Lloyd <klloyd@sierrawireless.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 0a4d7f45ac173862796eb81942afc843d6244798
Author: Richard Nauber <RichardNauber@web.de>
Date:   Tue Aug 26 23:34:11 2008 +0200

    USB: Fix the Nokia 6300 storage-mode.
    
    This patch fixes that behavior:
    
    ...
    Aug 26 22:39:23 rnauber sd 2:0:0:0: [sda] Sense Key : 0x0 [current]
    Aug 26 22:39:23 rnauber sd 2:0:0:0: [sda] ASC=0x0 ASCQ=0x0
    Aug 26 22:39:23 rnauber sd 2:0:0:0: [sda] Sense Key : 0x0 [current]
    Aug 26 22:39:23 rnauber sd 2:0:0:0: [sda] ASC=0x0 ASCQ=0x0
    Aug 26 22:39:23 rnauber sd 2:0:0:0: [sda] Sense Key : 0x0 [current]
    Aug 26 22:39:23 rnauber sd 2:0:0:0: [sda] ASC=0x0 ASCQ=0x0
    Aug 26 22:39:23 rnauber sd 2:0:0:0: [sda] Sense Key : 0x0 [current]
    ...
    
    
    cat  /proc/bus/usb/devices
    ...
    T:  Bus=04 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#=  3 Spd=12  MxCh= 0
    D:  Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs=  1
    P:  Vendor=0421 ProdID=04fa Rev= 6.01
    S:  Manufacturer=Nokia
    S:  Product=Nokia 6300
    S:  SerialNumber=35XXXXXXXX
    C:* #Ifs= 1 Cfg#= 1 Atr=c0 MxPwr=100mA
    I:* If#= 0 Alt= 0 #EPs= 2 Cls=08(stor.) Sub=06 Prot=50 Driver=usb-storage
    E:  Ad=81(I) Atr=02(Bulk) MxPS=  64 Ivl=0ms
    E:  Ad=01(O) Atr=02(Bulk) MxPS=  64 Ivl=0ms
    ...
    
    From: Richard Nauber <RichardNauber@web.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 0bcfeb3ec9467a8dfae3e906925ec28fe788afcf
Author: David Brownell <dbrownell@users.sourceforge.net>
Date:   Tue Aug 26 14:43:46 2008 -0700

    USB: ehci: fix some ehci hangs and crashes
    
    I noticed that the "Refactor "if (handshake()) state = HC_STATE_HALT"
    patch from earlier this year perpetuated a potential problem:  it can
    mark the controller as halted when it's still running (but not acting
    as, perhaps wrongly, expected).
    
    That caused some hangs and crashes, rather than more polite failure
    modes of a truly halted controller.  This patch forces a true halt,
    and emits a (previously missing) diagnostic.
    
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 73b2c2057579314c4fea1a37e35a501fbb8b9916
Author: Kevin Lloyd <klloyd@sierrawireless.com>
Date:   Mon Aug 25 19:20:40 2008 -0700

    USB Serial: Sierra: Device addition & version rev
    
    This patch adds devices to the sierra driver and rev's the driver version.
    
    Signed-off-by: Kevin Lloyd <klloyd@sierrawireless.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit c9bab96bbfdda59fa8a35ba536c22e66055669e5
Author: Kevin Lloyd <klloyd@sierrawireless.com>
Date:   Tue Aug 26 18:30:45 2008 -0700

    USB Storage: Sierra: Non-configurable TRU-Install
    
    This patch alters the Sierra Mass Storage patch so that it is non-configurable.
    
    Signed-off-by: Kevin Lloyd <klloyd@sierrawireless.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit e002bcc2f8e766a96472379e3b4a8a4e8938a93e
Merge: 75f5002... b08508c...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Sep 23 12:15:50 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
      PCI: fix compiler warnings in pci_get_subsys()
      PCI: Fix pcie_aspm=force

commit 75f500204c645787c27d6085d39291946c928e02
Merge: 42e7b09... d3758f8...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Sep 23 10:21:58 2008 -0700

    Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
      [IA64] kexec fails on systems with blocks of uncached memory
      [IA64] Ski simulator doesn't need check_sal_cache_flush

commit 42e7b09e688bf86c032ca36ddb65cc548bb6147f
Merge: 3bd1911... b0b8daf...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Sep 23 10:21:45 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: ASoC: maintainers - update email address for Liam Girdwood

commit 3bd1911b134ce4a669ea6cf531a36440753b0aaa
Merge: 1910e02... 7275fc8...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Sep 23 08:18:17 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
      [WATCHDOG] unlocked_ioctl changes
      [WATCHDOG] wdt285: fix sparse warnings
      [WATCHDOG] ibmasr: remove unnecessary spin_unlock()

commit 1910e021f2249402c3f103a5a1a15ebda211d1da
Merge: 74c7a09... 44b50e5...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Sep 23 08:14:14 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc64: Fix missing devices due to PCI bridge test in of_create_pci_dev().
      sparc64: Fix disappearing PCI devices on e3500.

commit 74c7a09aeeaa59984d8487a44b08f66add8b9813
Merge: f05596d... 4c07ab0...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Sep 23 08:14:04 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      ath9k: Fix IRQ nobody cared issue with ath9k
      wireless: zd1211rw: add device ID fix wifi dongle "trust nw-3100"
      ath9k: connectivity is lost after Group rekeying is done

commit f05596dbc922276ed675c713519220bae8042e32
Author: Anti Sullin <anti.sullin@artecdesign.ee>
Date:   Mon Sep 22 13:57:54 2008 -0700

    atmel_serial: update the powersave handler to match serial core
    
    This problem seems to be unnoticed so far:
    
    http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=b3b708fa2780cd2b5d8266a8f0c3a1cab364d4d2
    
    has changed the serial core behavior to not to suspend the port if the
    device is enabled as a wakeup source.  If the AT91 system goes to slow
    clock mode, the port should be suspended always and the clocks should be
    switched off.  The patch attached updates the atmel_serial driver to match
    the changes in serial core.
    
    Also, the interrupts are disabled when the clock is disabled.  If we
    disable the clock with interrupts enabled, an interrupt may get stuck.  If
    this is the DBGU interrupt, this blocks the OR logic at system controller
    and thus all other sysc interrupts.
    
    Signed-off-by: Anti Sullin <anti.sullin@artecdesign.ee>
    Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
    Cc: Michael Trimarchi <trimarchimichael@yahoo.it>
    Cc: Andrew Victor <linux@maxim.org.za>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit a10cebf56ca7e7c034d1b6646230c6553e478967
Author: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Date:   Mon Sep 22 13:57:52 2008 -0700

    memcg: check under limit at shrink_usage
    
    Current memory cgroup(both in mainline and -mm) doesn't account swap
    caches as memory(swap cache support is dropped temporarily now).
    
    So try_to_free_mem_cgroup_pages doesn't reflect the count of pages that
    have been moved to swap cache.
    
    But this makes mem_cgroup_shrink_usage fail easily if most of the pages
    are anon/shmem, and then shmem_getpage returns -ENOMEM and the process
    will be killed.
    
    This patch adds res_counter_check_under_limit to avoid these cases.
    
    BTW, even if swap cache support is enabled again, if a process is moved to
    another cgroup, which has been just made, between precharge and
    shrink_usage in shmem_getpage, shrink_usage may fail just because there is
    no pages to reclaim.
    
    So this change would make sense anyway.
    
    Signed-off-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
    Cc: Balbir Singh <balbir@in.ibm.com>
    Cc: Pavel Emelyanov <xemul@openvz.org>
    Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Cc: Hugh Dickins <hugh@veritas.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit b4d19cc84e8e6838f4aa0b26b3afcdc8c7f71505
Author: Andrew Morton <akpm@linux-foundation.org>
Date:   Mon Sep 22 13:57:51 2008 -0700

    Documentation/sysctl/kernel.txt: fix softlockup_thresh description
    
    - s/s/seconds/
    
    - s/10 seconds/60 seconds/
    
    - Mention the zero-disables-it feature.
    
    Cc: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit db203d53d474aa068984e409d807628f5841da1b
Author: Nick Piggin <npiggin@suse.de>
Date:   Mon Sep 22 13:57:50 2008 -0700

    mm: tiny-shmem fix lock ordering: mmap_sem vs i_mutex
    
    tiny-shmem calls do_truncate in shmem_file_setup.  do_truncate takes
    i_mutex, and shmem_file_setup is called with mmap_sem held.  However
    i_mutex nests outside mmap_sem.
    
    Copy the code in shmem.c to avoid this problem.
    
    [akpm@linux-foundation.org: coding-style fixes]
    Signed-off-by: Nick Piggin <npiggin@suse.de>
    Reported-and-tested-by: Ingo Molnar <mingo@elte.hu>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Matt Mackall <mpm@selenic.com>
    Cc: Hugh Dickins <hugh@veritas.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 2d4c8266774188cda7f7e612e6dfb8ad12c579d5
Author: Michael Kerrisk <mtk.manpages@googlemail.com>
Date:   Mon Sep 22 13:57:49 2008 -0700

    sys_paccept: disable paccept() until API design is resolved
    
    The reasons for disabling paccept() are as follows:
    
    * The API is more complex than needed.  There is AFAICS no demonstrated
      use case that the sigset argument of this syscall serves that couldn't
      equally be served by the use of pselect/ppoll/epoll_pwait + traditional
      accept().  Roland seems to concur with this opinion
      (http://thread.gmane.org/gmane.linux.kernel/723953/focus=732255).  I
      have (more than once) asked Ulrich to explain otherwise
      (http://thread.gmane.org/gmane.linux.kernel/723952/focus=731018), but he
      does not respond, so one is left to assume that he doesn't know of such
      a case.
    
    * The use of a sigset argument is not consistent with other I/O APIs
      that can block on a single file descriptor (e.g., read(), recv(),
      connect()).
    
    * The behavior of paccept() when interrupted by a signal is IMO strange:
      the kernel restarts the system call if SA_RESTART was set for the
      handler.  I think that it should not do this -- that it should behave
      consistently with paccept()/ppoll()/epoll_pwait(), which never restart,
      regardless of SA_RESTART.  The reasoning here is that the very purpose
      of paccept() is to wait for a connection or a signal, and that
      restarting in the latter case is probably never useful.  (Note: Roland
      disagrees on this point, believing that rather paccept() should be
      consistent with accept() in its behavior wrt EINTR
      (http://thread.gmane.org/gmane.linux.kernel/723953/focus=732255).)
    
    I believe that instead, a simpler API, consistent with Ulrich's other
    recent additions, is preferable:
    
    accept4(int fd, struct sockaddr *sa, socklen_t *salen, ind flags);
    
    (This simpler API was originally proposed by Ulrich:
    http://thread.gmane.org/gmane.linux.network/92072)
    
    If this simpler API is added, then if we later decide that the sigset
    argument really is required, then a suitable bit in 'flags' could be added
    to indicate the presence of the sigset argument.
    
    At this point, I am hoping we either will get a counter-argument from
    Ulrich about why we really do need paccept()'s sigset argument, or that he
    will resubmit the original accept4() patch.
    
    Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
    Cc: David Miller <davem@davemloft.net>
    Cc: Davide Libenzi <davidel@xmailserver.org>
    Cc: Alan Cox <alan@redhat.com>
    Cc: Ulrich Drepper <drepper@redhat.com>
    Cc: Jakub Jelinek <jakub@redhat.com>
    Cc: Roland McGrath <roland@redhat.com>
    Cc: Oleg Nesterov <oleg@tv-sign.ru>
    Cc: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 6675ce13ed783f88ea5d82f0d855462b76ff0dad
Author: Marin Mitov <mitov@issp.bas.bg>
Date:   Mon Sep 22 13:57:46 2008 -0700

    Documentation/DMA-mapping.txt: update for pci_dma_mapping_error() changes
    
    Make the example code consistent with changed API.
    
    Signed-off-by: Marin Mitov <mitov@ispp.bas.bg>
    Acked-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit f9092f358bc2ec5367621478811f046f82873376
Author: Jonathan Steel <jon.steel@esentire.com>
Date:   Mon Sep 22 13:57:45 2008 -0700

    kexec: fix segmentation fault in kimage_add_entry
    
    A segmentation fault can occur in kimage_add_entry in kexec.c when loading
    a kernel image into memory.  The fault occurs because a page is requested
    by calling kimage_alloc_page with gfp_mask GFP_KERNEL and the function may
    actually return a page with gfp_mask GFP_HIGHUSER.  The high mem page is
    returned because it was swapped with the kernel page due to the kernel
    page being a page that will shortly be copied to.
    
    This patch ensures that kimage_alloc_page returns a page that was created
    with the correct gfp flags.
    
    I have verified the change and fixed the whitespace damage of the original
    patch.  Jonathan did a great job of tracking this down after he hit the
    problem.  -- Eric
    
    Signed-off-by: Jonathan Steel <jon.steel@esentire.com>
    Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
    Acked-by: Simon Horman <horms@verge.net.au>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 39f00c087d31f668eb6eaf97508af22a32c5b1d9
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date:   Mon Sep 22 13:57:44 2008 -0700

    kernel-doc: allow structs whose members are all private
    
    Struct members may be marked as private by using
    	/* private: */
    before them, as noted in Documentation/kernel-doc-nano-HOWTO.txt
    
    Fix kernel-doc to handle structs whose members are all private;
    otherwise invalid XML is generated:
    
    xmlto: input does not validate (status 3)
    linux-2.6.27-rc6-git4/Documentation/DocBook/debugobjects.xml:146: element variablelist: validity error : Element variablelist content does not follow the DTD, expecting ((title , titleabbrev?)? , varlistentry+), got ()
    Document linux-2.6.27-rc6-git4/Documentation/DocBook/debugobjects.xml does not validate
    make[1]: *** [Documentation/DocBook/debugobjects.html] Error 3
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Reported-by: Roland McGrath <roland@redhat.com>
    Cc: Roland McGrath <roland@redhat.com>
    Cc: Christoph Hellwig <hch@infradead.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit c32a162fd420fe8dfb049db941b2438061047fcc
Author: Kirill A. Shutemov <kirill@shutemov.name>
Date:   Mon Sep 22 13:57:43 2008 -0700

    smb.h: do not include linux/time.h in userspace
    
    linux/time.h conflicts with time.h from glibc
    
    It breaks building smbmount from samba.  It's regression introduced by
    commit 76308da (" smb.h: uses struct timespec but didn't include
    linux/time.h").
    
    Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name>
    Cc: <stable@kernel.org>             [2.6.26.x]
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 683f40d7e7eee06811db43cb4c45349eab0d539e
Author: Akinobu Mita <akinobu.mita@gmail.com>
Date:   Mon Sep 22 13:57:41 2008 -0700

    ibmasr: remove unnecessary spin_unlock()
    
    __asr_toggle() is always called with asr_lock held.
    But there is unnecessary spin_unlock() call in __asr_toggle().
    
    Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
    Cc: Wim Van Sebroeck <wim@iguana.be>
    Acked-by: Andrey Panin <pazke@donpac.ru>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit b0b8daf7849cc98217ca018fbe82c61cd2b735bc
Author: Liam Girdwood <lrg@kernel.org>
Date:   Thu Sep 18 14:36:37 2008 +0100

    ALSA: ASoC: maintainers - update email address for Liam Girdwood
    
    This patch updates the maintainers email address for Liam Girdwood and
    adds a URL for the ASoC website.
    
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit f8e256c687eb53850685747757c8d75e58756e15
Author: Ingo Molnar <mingo@elte.hu>
Date:   Tue Sep 23 13:00:57 2008 +0200

    timers: fix build error in !oneshot case
    
     kernel/time/tick-common.c: In function ‘tick_setup_periodic’:
     kernel/time/tick-common.c:113: error: implicit declaration of function ‘tick_broadcast_oneshot_active’
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 09bfeea13cea843fb03eaa96b5d891fa0abdcc90
Author: Andreas Herrmann <andreas.herrmann3@amd.com>
Date:   Thu Sep 18 21:12:10 2008 +0200

    x86: c1e_idle: don't mark TSC unstable if CPU has invariant TSC
    
    Impact: Functional TSC is marked unstable on AMD family 0x10 and 0x11 CPUs.
    
    This would be wrong because for those CPUs "invariant TSC" means:
    
       "The TSC counts at the same rate in all P-states, all C states, S0,
       or S1"
    
    (See "Processor BIOS and Kernel Developer's Guides" for those CPUs.)
    
    [ tglx: Changed C1E to AMD C1E in the printks to avoid confusion
    	with Intel C1E ]
    
    Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

commit a8d6829044901a67732904be5f1eacdf8539604f
Author: Thomas Gleixner <tglx@linutronix.de>
Date:   Mon Sep 22 19:02:25 2008 +0200

    x86: prevent C-states hang on AMD C1E enabled machines
    
    Impact: System hang when AMD C1E machines switch into C2/C3
    
    AMD C1E enabled systems do not work with normal ACPI C-states
    even if the BIOS is advertising them. Limit the C-states to
    C1 for the ACPI processor idle code.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

commit 27ce4cb4a0c7cf59b9a9952266883862f2e4c99f
Author: Thomas Gleixner <tglx@linutronix.de>
Date:   Mon Sep 22 19:04:02 2008 +0200

    clockevents: prevent mode mismatch on cpu online
    
    Impact: timer hang on CPU online observed on AMD C1E systems
    
    When a CPU is brought online then the broadcast machinery can
    be in the one shot state already. Check this and setup the timer
    device of the new CPU in one shot mode so the broadcast code
    can pick up the next_event value correctly.
    
    Another AMD C1E oddity, as we switch to broadcast immediately and
    not after the full bring up via the ACPI cpu idle code.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

commit 302745699c1b675b5d2a1af87271de10e4d96b6a
Author: Thomas Gleixner <tglx@linutronix.de>
Date:   Mon Sep 22 19:02:25 2008 +0200

    clockevents: check broadcast device not tick device
    
    Impact: Possible hang on CPU online observed on AMD C1E machines.
    
    The broadcast setup code looks at the mode of the tick device to
    determine whether it needs to be shut down or setup. This is wrong
    when the broadcast mode is set to one shot already. This can happen
    when a CPU is brought online as it goes through the periodic setup
    first.
    
    The problem went unnoticed as sane systems do not call into that code
    before the switch to one shot for the clock event device happens.
    The AMD C1E idle routine switches over immediately and thereby shuts
    down the just setup device before the first interrupt happens.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

commit 49d670fb8dd62d3ed4e3ed2513538ea65b051aed
Author: Thomas Gleixner <tglx@linutronix.de>
Date:   Mon Sep 22 18:56:01 2008 +0200

    clockevents: prevent stale tick_next_period for onlining CPUs
    
    Impact: possible hang on CPU onlining in timer one shot mode.
    
    The tick_next_period variable is only used during boot on nohz/highres
    enabled systems, but for CPU onlining it needs to be maintained when
    the per cpu clock events device operates in one shot mode.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

commit 4faac97d44ac27bdbb010a9c3597401a8f89341f
Author: Thomas Gleixner <tglx@linutronix.de>
Date:   Mon Sep 22 18:54:29 2008 +0200

    x86: prevent stale state of c1e_mask across CPU offline/online
    
    Impact: hang which happens across CPU offline/online on AMD C1E systems.
    
    When a CPU goes offline then the corresponding bit in the broadcast
    mask is cleared. For AMD C1E enabled CPUs we do not reenable the
    broadcast when the CPU comes online again as we do not clear the
    corresponding bit in the c1e_mask, which keeps track which CPUs
    have been switched to broadcast already. So on those !$@#& machines
    we never switch back to broadcasting after a CPU offline/online cycle.
    
    Clear the bit when the CPU plays dead.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

commit 6441402b1f173fa38e561d3cee7c01c32e5281ad
Author: Thomas Gleixner <tglx@linutronix.de>
Date:   Mon Sep 22 18:46:37 2008 +0200

    clockevents: prevent cpu online to interfere with nohz
    
    Impact: rare hang which can be triggered on CPU online.
    
    tick_do_timer_cpu keeps track of the CPU which updates jiffies
    via do_timer. The value -1 is used to signal, that currently no
    CPU is doing this. There are two cases, where the variable can
    have this state:
    
     boot:
        necessary for systems where the boot cpu id can be != 0
    
     nohz long idle sleep:
        When the CPU which did the jiffies update last goes into
        a long idle sleep it drops the update jiffies duty so
        another CPU which is not idle can pick it up and keep
        jiffies going.
    
    Using the same value for both situations is wrong, as the CPU online
    code can see the -1 state when the timer of the newly onlined CPU is
    setup. The setup for a newly onlined CPU goes through periodic mode
    and can pick up the do_timer duty without being aware of the nohz /
    highres mode of the already running system.
    
    Use two separate states and make them constants to avoid magic
    numbers confusion.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

commit fa748203175de7c08f2df80e5a0eeca40329b5e2
Author: Rakib Mullick <rakib.mullick@gmail.com>
Date:   Mon Sep 22 14:55:45 2008 -0700

    sched: fix init_hrtick() section mismatch warning
    
    LD      kernel/built-in.o
    WARNING: kernel/built-in.o(.text+0x326): Section mismatch in reference
    from the function init_hrtick() to the variable
    .cpuinit.data:hotplug_hrtick_nb.8
    The function init_hrtick() references
    the variable __cpuinitdata hotplug_hrtick_nb.8.
    This is often because init_hrtick lacks a __cpuinitdata
    annotation or the annotation of hotplug_hrtick_nb.8 is wrong.
    
    Signed-off-by: Md.Rakib H. Mullick <rakib.mullick@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 05e12e1c4c09cd35ac9f4e6af1e42b0036375d72
Author: Ravikiran G Thirumalai <kiran@scalex86.org>
Date:   Mon Sep 22 22:58:47 2008 -0700

    x86: fix 27-rc crash on vsmp due to paravirt during module load
    
    27-rc fails to boot up if configured to use modules.
    
    Turns out vsmp_patch was marked __init, and vsmp_patch being the
    pvops 'patch' routine for vsmp, a call to vsmp_patch just turns out
    to execute a code page with series of 0xcc (POISON_FREE_INITMEM -- int3).
    
    vsmp_patch has been marked with __init ever since pvops, however,
    apply_paravirt can be called during module load causing calls to
    freed memory location.
    
    Since apply_paravirt can only be called during init/module load, make
    vsmp_patch with "__init_or_module"
    
    Signed-off-by: Ravikiran Thirumalai <kiran@scalex86.org>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 7275fc8c36dbad3a871f82b1f9f1f524688176ea
Author: Wim Van Sebroeck <wim@iguana.be>
Date:   Thu Sep 18 12:26:15 2008 +0000

    [WATCHDOG] unlocked_ioctl changes
    
    Fix some drivers so that they use the unlocked_ioctl call.
    
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

commit edf86c9b98b5162bed64a70f9424bd2dd58a717e
Author: Ben Dooks <ben-linux@fluff.org>
Date:   Tue Sep 16 11:31:01 2008 +0100

    [WATCHDOG] wdt285: fix sparse warnings
    
    The wdt285.c watchdog driver is producing a number of
    sparse errors due to missing __user attributes to calls
    to put_user and copy_to_user, as well as in the prototype
    of watchdog_write.
    
    wdt285.c:144:21: warning: incorrect type in argument 1 (different address spaces)
    wdt285.c:144:21:    expected void [noderef] <asn:1>*to
    wdt285.c:144:21:    got void *<noident>
    wdt285.c:150:9: warning: incorrect type in initializer (different address spaces)
    wdt285.c:150:9:    expected int const [noderef] <asn:1>*register __p
    wdt285.c:150:9:    got int *<noident>
    wdt285.c:159:9: warning: incorrect type in initializer (different address spaces)
    wdt285.c:159:9:    expected int const [noderef] <asn:1>*register __p
    wdt285.c:159:9:    got int *<noident>
    wdt285.c:174:9: warning: incorrect type in initializer (different address spaces)
    wdt285.c:174:9:    expected int const [noderef] <asn:1>*register __p
    wdt285.c:174:9:    got int *<noident>
    wdt285.c:183:12: warning: incorrect type in initializer (incompatible argument 2 (different address spaces))
    wdt285.c:183:12:    expected int ( *write )( ... )
    wdt285.c:183:12:    got int ( static [toplevel] *<noident> )( ... )
    
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

commit 7f605ac00416d763c2d9681e378a75e7adbb06e8
Author: Akinobu Mita <akinobu.mita@gmail.com>
Date:   Sat Sep 13 18:47:19 2008 +0900

    [WATCHDOG] ibmasr: remove unnecessary spin_unlock()
    
    __asr_toggle() is always called with asr_lock held.
    But there is unnecessary spin_unlock() call in __asr_toggle().
    
    Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
    Acked-by: Andrey Panin <pazke@donpac.ru>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

commit 44b50e5a1af13c605d6c3b17a60e42eb0ee48d5f
Author: David S. Miller <davem@davemloft.net>
Date:   Mon Sep 22 15:42:24 2008 -0700

    sparc64: Fix missing devices due to PCI bridge test in of_create_pci_dev().
    
    Just like in the arch/sparc64/kernel/of_device.c code fix commit
    071d7f4c3b411beae08d27656e958070c43b78b4 ("sparc64: Fix SMP bootup
    with CONFIG_STACK_DEBUG or ftrace.") we have to check the OF device
    node name for "pci" instead of relying upon the 'device_type' property
    being there on all PCI bridges.
    
    Tested by Meelis Roos, and confirmed to make the PCI QFE devices
    reappear on the E3500 system.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 4c07ab0fe4b4eaa0fc31f640ca65da7c173f5043
Merge: cec5eb7... 6115e85...
Author: David S. Miller <davem@davemloft.net>
Date:   Mon Sep 22 15:29:05 2008 -0700

    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

commit 6115e8557a75b5f24b56ed46c60dffef7e7fa992
Author: Senthil Balasubramanian <senthilkumar@atheros.com>
Date:   Mon Sep 22 14:22:39 2008 +0530

    ath9k: Fix IRQ nobody cared issue with ath9k
    
    IRQs should be disabled before calling free_irq. Also flush pending
    IRQs. Pasted the kernel log message for reference.
    
    kernel: irq 17: nobody cared (try booting with the "irqpoll" option)
    kernel:  [<c0252d2c>] __report_bad_irq+0x2e/0x6f
    kernel:  [<c0252f22>] note_interrupt+0x1b5/0x207
    kernel:  [<c025258b>] ? handle_IRQ_event+0x21/0x48
    kernel:  [<c02534cb>] handle_fasteoi_irq+0x8e/0xad
    kernel:  [<c0205650>] do_IRQ+0x6c/0x84
    kernel:  [<c020425f>] common_interrupt+0x23/0x28
    kernel:  [<c034f6f6>] ? acpi_idle_enter_simple+0x198/0x205
    kernel:  [<c044686c>] ? menu_select+0x5c/0x78
    kernel:  [<c0445a95>] cpuidle_idle_call+0x59/0x89
    kernel:  [<c02029d7>] cpu_idle+0xae/0xcf
    kernel:  [<c0543102>] rest_init+0x4e/0x50
    kernel:  =======================
    kernel: handlers:
    kernel: [<f88fdd26>] (ath_isr+0x0/0x13a [ath9k])
    kernel: Disabling IRQ #17
    
    Signed-off-by: Senthil Balasubramanian <senthilkumar@atheros.com>
    Tested-by: Steven Noonan <steven@uplinklabs.net>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit d3758f87f39c5b072dde74c55bfb988262a3a45c
Author: Jay Lan <jlan@sgi.com>
Date:   Mon Sep 22 14:21:19 2008 -0700

    [IA64] kexec fails on systems with blocks of uncached memory
    
    Currently a memory segment in memory map with attribute of EFI_MEMORY_UC
    is denoted as "System RAM" in /proc/iomem, while memory of attribute
    (EFI_MEMORY_WB|EFI_MEMORY_UC) is also labeled the same.
    
    The kexec utility then includes uncached memory as part of vmcore. The
    kdump kernel MCA'ed when it tries to save the vmcore to a disk. A normal
    "cached" access may cause MCAs.
    
    This patch would label memory with attribute of EFI_MEMORY_UC only as
    "Uncached RAM" so that kexec would know not to include it in the vmcore.
    I will submit a separate kexec-tools patch to the kexec list.
    
    Signed-off-by: Jay Lan <jlan@sgi.com>
    Acked-by: Simon Horman <horms@verge.net.au>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

commit 06f95ea8988513b172080c419e4be8826c55a318
Author: Alex Chiang <achiang@hp.com>
Date:   Tue Sep 16 18:25:33 2008 -0600

    [IA64] Ski simulator doesn't need check_sal_cache_flush
    
    Peter Chubb reported that commit 3463a93def55c309f3c0d0a8aaf216be3be42d64
    (Update check_sal_cache_flush to use platform_send_ipi()) broke
    Ski because it does not implement IPIs.
    
    Tony Luck suggested we just #ifndef out the call (since the simulator
    does not have the SAL bug that this code is attempting to detect and
    workaround)
    
    Signed-off-by: Alex Chiang <achiang@hp.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>

commit 5d89945e6ec44494285cb8de85d4f43d4647b740
Author: born.into.silence@gmail.com <born.into.silence@gmail.com>
Date:   Fri Sep 19 16:47:06 2008 -0700

    wireless: zd1211rw: add device ID fix wifi dongle "trust nw-3100"
    
    akpm: taken from http://bugzilla.kernel.org/show_bug.cgi?id=11587
    
    I bought the wifi dongle trust nw-3100 wich is in fact a zd1211rw.  Its
    hardware id was missing in the sources, adding it made it work flawlessly.
    
    Cc: Daniel Drake <dsd@gentoo.org>
    Cc: Ulrich Kunitz <kune@deine-taler.de>
    Cc: Johannes Berg <johannes@sipsolutions.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit d0be7cc7688d0cc2e4daf952c43b5ce86e5c8a1d
Author: Senthil Balasubramanian <senthilkumar@atheros.com>
Date:   Wed Sep 17 12:39:49 2008 +0530

    ath9k: connectivity is lost after Group rekeying is done
    
    Connectivtiy is lost after Group rekeying is done. The keytype
    maintained by ath9k is reset when group key is updated. Though
    sc_keytype can be reset only for broadcast key the proper fix
    would be to use mac80211 provided key type from txinfo during
    xmit and get rid of sc_keytype from ath9k ath_softc.
    
    Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
    Signed-off-by: Senthil Balasubramanian <senthilkumar@atheros.com>
    Tested-by: Steven Noonan <steven@uplinklabs.net>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit a304edb4893042fb75ce7bab079924f626634f45
Merge: cec5eb7... b1132b3...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Sep 22 09:09:18 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: ASoC: Fix at32-pcm build breakage with PM enabled

commit cec5eb7be3a104fffd27ca967ee8e15a123050e2
Author: Alan Cox <alan@redhat.com>
Date:   Mon Sep 22 15:58:14 2008 +0100

    pcmcia: Fix broken abuse of dev->driver_data
    
    PCMCIA abuses dev->private_data in the probe methods. Unfortunately it
    continues to abuse it after calling drv->probe() which leads to crashes and
    other nasties (such as bogus probes of multifunction devices) giving errors like
    
    pcmcia: registering new device pcmcia0.1
    kernel: 0.1: GetNextTuple: No more items
    
    Extract the passed data before calling the driver probe function that way
    we don't blow up when the driver reuses dev->private_data as its right.
    
    As its close to the final release just move the hack so it works out,
    hopefully someone will be sufficiently embarrassed to produce a nice rework
    for 2.6.28.
    
    Signed-off-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit ae9111912500db9fcc244ec16c3d7e471c551f52
Merge: 18f22fb... 1577e4b...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Sep 22 07:46:06 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
      Input: jornada720_ts - fix build error ( LONG() usage )
      Input: bcm5974 - switch back to normal mode when closing

commit 18f22fbb8ba5570a5ea3d531bc4ec65cf211f11b
Merge: 72d3105... ad55dca...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Sep 22 07:45:06 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      netdev: simple_tx_hash shouldn't hash inside fragments

commit b1132b3d874dcef296a63b46680a41b02de66bb4
Author: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Date:   Fri Sep 19 18:50:45 2008 +0200

    ALSA: ASoC: Fix at32-pcm build breakage with PM enabled
    
    s/PDC_PTCR/ATMEL_PDC_PTCR/
    
    Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit b61e06f258e50b25c38a73bea782bdb6876f0f70
Author: Andrea Righi <righi.andrea@gmail.com>
Date:   Sat Sep 20 18:02:27 2008 +0200

    x86, oprofile: BUG scheduling while atomic
    
    nmi_shutdown() calls unregister_die_notifier() from an atomic context
    after setting preempt_disable() via get_cpu_var():
    
    [ 1049.404154] BUG: scheduling while atomic: oprofiled/7796/0x00000002
    [ 1049.404171] INFO: lockdep is turned off.
    [ 1049.404176] Modules linked in: oprofile af_packet rfcomm l2cap kvm_intel kvm i915 drm acpi_cpufreq cpufreq_userspace cpufreq_conservative cpufreq_ondemand cpufreq_powersave freq_table container sbs sbshc dm_mod arc4 ecb cryptomgr aead snd_hda_intel crypto_blkcipher snd_pcm_oss crypto_algapi snd_pcm iwlagn iwlcore snd_timer iTCO_wdt led_class btusb iTCO_vendor_support snd psmouse bluetooth mac80211 soundcore cfg80211 snd_page_alloc intel_agp video output button battery ac dcdbas evdev ext3 jbd mbcache sg sd_mod piix ata_piix libata scsi_mod dock tg3 libphy ehci_hcd uhci_hcd usbcore thermal processor fan fuse
    [ 1049.404362] Pid: 7796, comm: oprofiled Not tainted 2.6.27-rc5-mm1 #30
    [ 1049.404368] Call Trace:
    [ 1049.404384]  [<ffffffff804769fd>] thread_return+0x4a0/0x7d3
    [ 1049.404396]  [<ffffffff8026ad92>] generic_exec_single+0x52/0xe0
    [ 1049.404405]  [<ffffffff8026ae1a>] generic_exec_single+0xda/0xe0
    [ 1049.404414]  [<ffffffff8026aee3>] smp_call_function_single+0x73/0x150
    [ 1049.404423]  [<ffffffff804770c5>] schedule_timeout+0x95/0xd0
    [ 1049.404430]  [<ffffffff80476083>] wait_for_common+0x43/0x180
    [ 1049.404438]  [<ffffffff80476154>] wait_for_common+0x114/0x180
    [ 1049.404448]  [<ffffffff80236980>] default_wake_function+0x0/0x10
    [ 1049.404457]  [<ffffffff8024f810>] synchronize_rcu+0x30/0x40
    [ 1049.404463]  [<ffffffff8024f890>] wakeme_after_rcu+0x0/0x10
    [ 1049.404472]  [<ffffffff80479ca0>] _spin_unlock_irqrestore+0x40/0x80
    [ 1049.404482]  [<ffffffff80256def>] atomic_notifier_chain_unregister+0x3f/0x60
    [ 1049.404501]  [<ffffffffa03d8801>] nmi_shutdown+0x51/0x90 [oprofile]
    [ 1049.404517]  [<ffffffffa03d6134>] oprofile_shutdown+0x34/0x70 [oprofile]
    [ 1049.404532]  [<ffffffffa03d721e>] event_buffer_release+0xe/0x40 [oprofile]
    [ 1049.404543]  [<ffffffff802bdcdd>] __fput+0xcd/0x240
    [ 1049.404551]  [<ffffffff802baa74>] filp_close+0x54/0x90
    [ 1049.404560]  [<ffffffff8023e1d1>] put_files_struct+0xb1/0xd0
    [ 1049.404568]  [<ffffffff8023f82f>] do_exit+0x18f/0x930
    [ 1049.404576]  [<ffffffff8020be03>] restore_args+0x0/0x30
    [ 1049.404584]  [<ffffffff80240006>] do_group_exit+0x36/0xa0
    [ 1049.404592]  [<ffffffff8020b7cb>] system_call_fastpath+0x16/0x1b
    
    This can be easily triggered with 'opcontrol --shutdown'.
    
    Simply move get_cpu_var() above unregister_die_notifier().
    
    Signed-off-by: Andrea Righi <righi.andrea@gmail.com>
    Acked-by: Robert Richter <robert.richter@amd.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit ad55dcaff0e34269f86975ce2ea0da22e9eb74a1
Author: Alexander Duyck <alexander.h.duyck@intel.com>
Date:   Sat Sep 20 22:05:50 2008 -0700

    netdev: simple_tx_hash shouldn't hash inside fragments
    
    Currently simple_tx_hash is hashing inside of udp fragments.  As a result
    packets are getting getting sent to all queues when they shouldn't be.
    This causes a serious performance regression which can be seen by sending
    UDP frames larger than mtu on multiqueue devices.  This change will make
    it so that fragments are hashed only as IP datagrams w/o any protocol
    information.
    
    Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 7ee766d8fba9dfd93bf3eca7a8d84a25404a68dc
Author: David S. Miller <davem@davemloft.net>
Date:   Sat Sep 20 22:00:40 2008 -0700

    sparc64: Fix disappearing PCI devices on e3500.
    
    Based upon a bug report by Meelis Roos.
    
    The OF device layer builds properties by matching bus types and
    applying 'range' properties as appropriate, up to the root.
    
    The match for "PCI" busses is looking at the 'device_type' property,
    and this does work %99 of the time.
    
    But on an E3500 system with a PCI QFE card, the DEC 21153 bridge
    sitting above the QFE network interface devices has a 'name' of "pci",
    but it completely lacks a 'device_type' property.  So we don't match
    it as a PCI bus, and subsequently we end up with no resource values at
    all for the devices sitting under that DEC bridge.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 7e4f88da7bf1887563f70bd5edbbd0479e31dc12
Author: Joerg Roedel <joerg.roedel@amd.com>
Date:   Wed Sep 17 14:19:15 2008 +0200

    AMD IOMMU: protect completion wait loop with iommu lock
    
    The unlocked polling of the ComWaitInt bit in the IOMMU completion wait
    path is racy. Protect it with the iommu lock.
    
    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit ee2fa7435b6dddf1ca119f298ad0100cf50c0397
Author: Joerg Roedel <joerg.roedel@amd.com>
Date:   Wed Sep 17 13:47:25 2008 +0200

    AMD IOMMU: set iommu sunc flag after command queuing
    
    The iommu->need_sync flag must be set after the command is queued to
    avoid race conditions.
    
    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit b08508c40adf3fd1330aabc4f37d3254179776c4
Author: Greg KH <gregkh@suse.de>
Date:   Tue Aug 26 08:20:34 2008 -0700

    PCI: fix compiler warnings in pci_get_subsys()
    
    pci_get_subsys() changed in 2.6.26 so that the from pointer is modified
    when the call is being invoked, so fix up the 'const' marking of it that
    the compiler is complaining about.
    
    Reported-by: Rufus & Azrael <rufus-azrael@numericable.fr>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit 1577e4b70a04cce39f296cc714da5ad5d272105a
Author: Kristoffer Ericson <kristoffer.ericson@gmail.com>
Date:   Tue Sep 16 14:19:25 2008 -0400

    Input: jornada720_ts - fix build error ( LONG() usage )
    
    This patch removes the usage of LONG() which is deprecated; we also
    replace BIT() with BIT_MASK().
    
    signed-off-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit cd72ad3f57c400baa2ddb78b4fc2781cf68ffb6f
Author: Henrik Rydberg <rydberg@euromail.se>
Date:   Sun Sep 14 11:52:44 2008 -0400

    Input: bcm5974 - switch back to normal mode when closing
    
    Staying in multi-touch mode after closing the device sometimes makes
    the keyboard drop keys or repeat keys irratically. The conjecture is
    that some internal buffer starts to overflow, resulting in undefined
    behavior. Switching back to normal mode when closing the device makes
    the problem go away.
    
    Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit e1f4f59d1ab9ebac44830d6ae450fb358ac559d3
Author: Sitsofe Wheeler <sitsofe@yahoo.com>
Date:   Tue Sep 16 14:27:13 2008 +0100

    PCI: Fix pcie_aspm=force
    
    pcie_aspm=force did not work because aspm_force was being double negated
    leading to the sanity check failing. Moving a bracket should fix this.
    
    Acked-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Sitsofe Wheeler <sitsofe@yahoo.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>