commit cbff290491cd97bcd449b14f672d98992ddad5cb
Merge: 6483d15... 8962cad...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri May 23 08:15:12 2008 -0700

    Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
      [POWERPC] iSeries: Remove unused mail address
      [POWERPC] mpic: Fix use of uninitialized variable
      [POWERPC] Add kernstart_addr to list of allowed symbols in prom_init
      [POWERPC] Fix __set_fixmap() for STRICT_MM_TYPECHECKS
      [POWERPC] PS3: Fix memory hotplug

commit 6483d152acffb83442b90dad1517fde8a7b1e12d
Merge: cb61896... 6ab455e...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri May 23 08:13:39 2008 -0700

    Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
    
    * 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6:
      [XFS] Fix memory corruption with small buffer reads
      [XFS] Fix inode list allocation size in writeback.
      [XFS] Don't allow memory reclaim to wait on the filesystem in inode
      [XFS] Fix fsync() b0rkage.
      [XFS] Include linux/random.h in all builds, not just debug builds.

commit cb618965bc2073267b7f9345066f502515fcfdf5
Merge: 5e2daeb... 3401a61...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri May 23 08:13:19 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
      stop_machine: make stop_machine_run more virtualization friendly
      doc: add a chapter about trylock functions [Bug 9011]
      modules: proper cleanup of kobject without CONFIG_SYSFS
      module loading ELF handling: use SELFMAG instead of numeric constant

commit 5e2daeb3c982ea19ecad0c2e720a4052034be14b
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Thu May 22 15:45:08 2008 -0700

    fbdev: fix integer as NULL pointer warning
    
    drivers/video/aty/atyfb_base.c:3359:26: warning: Using plain integer as NULL pointer
    drivers/video/aty/radeon_base.c:2280:32: warning: Using plain integer as NULL pointer
    drivers/video/matrox/matroxfb_base.h:203:25: warning: Using plain integer as NULL pointer
    drivers/video/matrox/matroxfb_base.h:203:25: warning: Using plain integer as NULL pointer
    drivers/video/sis/sis_main.c:5790:44: warning: Using plain integer as NULL pointer
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 9bcf091083065c751a4d90317b766370d2497ae9
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Thu May 22 15:45:07 2008 -0700

    scsi: fix integer as NULL pointer warning
    
    drivers/scsi/aha152x.c:3585:60: warning: Using plain integer as NULL pointer
    drivers/scsi/aha152x.c:3845:56: warning: Using plain integer as NULL pointer
    drivers/scsi/qla1280.c:2814:37: warning: Using plain integer as NULL pointer
    drivers/scsi/atp870u.c:750:47: warning: Using plain integer as NULL pointer
    drivers/scsi/3w-9xxx.c:1281:36: warning: Using plain integer as NULL pointer
    drivers/scsi/3w-9xxx.c:1293:36: warning: Using plain integer as NULL pointer
    drivers/scsi/3w-9xxx.c:1301:35: warning: Using plain integer as NULL pointer
    drivers/scsi/hptiop.c:447:10: warning: Using plain integer as NULL pointer
    drivers/scsi/hptiop.c:457:10: warning: Using plain integer as NULL pointer
    drivers/scsi/hptiop.c:479:24: warning: Using plain integer as NULL pointer
    drivers/scsi/hptiop.c:483:22: warning: Using plain integer as NULL pointer
    drivers/scsi/hptiop.c:1213:23: warning: Using plain integer as NULL pointer
    drivers/scsi/hptiop.c:1214:23: warning: Using plain integer as NULL pointer
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 94b5e0ac694baba20efbe7d8ce6ff9cbe1776162
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Thu May 22 15:45:07 2008 -0700

    isdn: fix integer as NULL pointer warning
    
    drivers/isdn/hysdn/hycapi.c:465:42: warning: Using plain integer as NULL pointer
    drivers/isdn/hysdn/hycapi.c:467:44: warning: Using plain integer as NULL pointer
    drivers/isdn/hysdn/hycapi.c:469:42: warning: Using plain integer as NULL pointer
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit b62151de496d26a705942b945fab9cecdb3fb8da
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Thu May 22 15:45:06 2008 -0700

    acpi: fix integer as NULL pointer warning
    
    drivers/acpi/dispatcher/dsmethod.c:568:50: warning: Using plain integer as NULL pointer
    drivers/acpi/executer/exmutex.c:329:30: warning: Using plain integer as NULL pointer
    drivers/acpi/executer/exmutex.c:466:31: warning: Using plain integer as NULL pointer
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 7fafd91d85181e946207bed18c44addc47e36c63
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Thu May 22 15:45:06 2008 -0700

    x86: fix integer as NULL pointer warning
    
    arch/x86/boot/printf.c:59:10: warning: Using plain integer as NULL pointer
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 6ab455eeaff6893cd06da33843e840d888cdc04a
Author: Christoph Hellwig <hch@infradead.org>
Date:   Mon May 19 16:34:42 2008 +1000

    [XFS] Fix memory corruption with small buffer reads
    
    When we have multiple buffers in a single page for a blocksize == pagesize
    filesystem we might overwrite the page contents if two callers hit it
    shortly after each other. To prevent that we need to keep the page locked
    until I/O is completed and the page marked uptodate.
    
    Thanks to Eric Sandeen for triaging this bug and finding a reproducible
    testcase and Dave Chinner for additional advice.
    
    This should fix kernel.org bz #10421.
    
    Tested-by: Eric Sandeen <sandeen@sandeen.net>
    
    SGI-PV: 981813
    SGI-Modid: xfs-linux-melb:xfs-kern:31173a
    
    Signed-off-by: Christoph Hellwig <hch@infradead.org>
    Signed-off-by: David Chinner <dgc@sgi.com>
    Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>

commit 8962cadbe7cbc4ed0fff94f56ebab505a10afd2e
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date:   Fri May 23 11:41:46 2008 +1000

    [POWERPC] iSeries: Remove unused mail address
    
    I don't use my IBM email address normally and people can find me in
    CREDITS.
    
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 06a901c5621f85e07e00ac4816c7ca95620ee74a
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date:   Wed May 21 16:24:31 2008 +1000

    [POWERPC] mpic: Fix use of uninitialized variable
    
    Compiling ppc64_defconfig with gcc 4.3 gives thes warnings:
    
    arch/powerpc/sysdev/mpic.c: In function 'mpic_irq_get_priority':
    arch/powerpc/sysdev/mpic.c:1351: warning: 'is_ipi' may be used uninitialized in this function
    arch/powerpc/sysdev/mpic.c: In function 'mpic_irq_set_priority':
    arch/powerpc/sysdev/mpic.c:1328: warning: 'is_ipi' may be used uninitialized in this function
    
    It turns out that in the cases where is_ipi is uninitialized, another
    variable (mpic) will be NULL and it is dereferenced.  Protect against
    this by returning if mpic is NULL in mpic_irq_set_priority, and removing
    mpic_irq_get_priority completely as it has no in tree callers.
    
    This has the nice side effect of making the warning go away.
    
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit d1e8d50d5a4bc7e40b119bf513804188ce2933d0
Author: Michael Ellerman <michael@ellerman.id.au>
Date:   Tue May 20 22:48:03 2008 +1000

    [POWERPC] Add kernstart_addr to list of allowed symbols in prom_init
    
    Since commit "85xx: Add support for relocatable kernel (and
    booting at non-zero)" (37dd2badcfcec35f5e21a0926968d77a404f03c3),
    PHYSICAL_START is #defined as kernstart_addr if RELOCATABLE
    and FLATMEM is enabled.
    
    PHYSICAL_START is used in prom_init.c and so kernstart_addr
    needs to be added to the list of allowed symbols that
    prom_init.c can access.
    
    Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
    Acked-by: Kumar Gala <galak@kernel.crashing.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 46a7417963a84f67984af1af59d43261159dd96b
Author: David Gibson <david@gibson.dropbear.id.au>
Date:   Mon May 19 16:16:00 2008 +1000

    [POWERPC] Fix __set_fixmap() for STRICT_MM_TYPECHECKS
    
    __set_fixmap() in pgtable_32.c currently fails to compile if
    STRICT_MM_TYPECHECKS is defined.  This fixes it.
    
    Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit ecc240f90bce23651f9866a1523ba55faa89f009
Author: Geoff Levand <geoffrey.levand@am.sony.com>
Date:   Fri May 16 06:09:59 2008 +1000

    [POWERPC] PS3: Fix memory hotplug
    
    A change was made to walk_memory_resource() in commit
    4b119e21d0c66c22e8ca03df05d9de623d0eb50f that added a
    check of find_lmb().  Add the coresponding lmb_add()
    call to ps3_mm_add_memory() so that that check will
    succeed.
    
    This fixes the condition where the PS3 boots up with
    only the 128 MiB of boot memory, and doesn't see the
    other 128MiB that is available.
    
    Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit c8f5f12e46f079a954d4f7163ba59dadee08ca26
Author: David Chinner <dgc@sgi.com>
Date:   Tue May 20 11:30:15 2008 +1000

    [XFS] Fix inode list allocation size in writeback.
    
    We only need to allocate space for the number of inodes in the cluster
    when writing back inodes, not every byte in the inode cluster. This
    reduces the amount of memory needing to be allocated to 256 bytes instead
    of 64k.
    
    SGI-PV: 981949
    SGI-Modid: xfs-linux-melb:xfs-kern:31182a
    
    Signed-off-by: David Chinner <dgc@sgi.com>
    Signed-off-by: Christoph Hellwig <hch@infradead.org>
    Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>

commit 49383b0e98ad1f69ff4c816eb1961f703df12318
Author: David Chinner <dgc@sgi.com>
Date:   Mon May 19 16:29:34 2008 +1000

    [XFS] Don't allow memory reclaim to wait on the filesystem in inode
    writeback
    
    If we allow memory reclaim to wait on the pages under writeback in inode
    cluster writeback we could deadlock because we are currently holding the
    ILOCK on the initial writeback inode which is needed in data I/O
    completion to change the file size or do unwritten extent conversion
    before the pages are taken out of writeback state.
    
    SGI-PV: 981091
    SGI-Modid: xfs-linux-melb:xfs-kern:31015a
    
    Signed-off-by: David Chinner <dgc@sgi.com>
    Signed-off-by: Christoph Hellwig <hch@infradead.org>
    Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>

commit 978b7237123d007b9fa983af6e0e2fa8f97f9934
Author: David Chinner <dgc@sgi.com>
Date:   Mon May 19 16:29:46 2008 +1000

    [XFS] Fix fsync() b0rkage.
    
    xfs_fsync() fails to wait for data I/O completion before checking if the
    inode is dirty or clean to decide whether to log the inode or not. This
    misses inode size updates when the data flushed by the fsync() is
    extending the file.
    
    Hence, like fdatasync(), we need to wait for I/o completion first, then
    check the inode for cleanliness. Doing so makes the behaviour of
    xfs_fsync() identical for fsync and fdatasync and we *always* use
    synchronous semantics if the inode is dirty. Therefore also kill the
    differences and remove the unused flags from the xfs_fsync function and
    callers.
    
    SGI-PV: 981296
    SGI-Modid: xfs-linux-melb:xfs-kern:31033a
    
    Signed-off-by: David Chinner <dgc@sgi.com>
    Signed-off-by: Christoph Hellwig <hch@infradead.org>
    Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>

commit c1e554aeea12d2dab5183e011c27dee6142dc927
Merge: c203e45... 78b58e5...
Author: Lachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Date:   Fri May 23 13:48:37 2008 +1000

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

commit 3401a61e16a5b852d4e353c8850c857105a67a9c
Author: Christian Borntraeger <borntraeger@de.ibm.com>
Date:   Thu May 8 15:20:38 2008 +0200

    stop_machine: make stop_machine_run more virtualization friendly
    
    On kvm I have seen some rare hangs in stop_machine when I used more guest
    cpus than hosts cpus. e.g. 32 guest cpus on 1 host cpu triggered the
    hang quite often. I could also reproduce the problem on a 4 way z/VM host with
    a 64 way guest.
    
    It turned out that the guest was consuming all available cpus mostly for
    spinning on scheduler locks like rq->lock. This is expected as the threads are
    calling yield all the time.
    The problem is now, that the host scheduling decisings together with the guest
    scheduling decisions and spinlocks not being fair managed to create an
    interesting scenario similar to a live lock. (Sometimes the hang resolved
    itself after some minutes)
    
    Changing stop_machine to yield the cpu to the hypervisor when yielding inside
    the guest fixed the problem for me. While I am not completely happy with this
    patch, I think it causes no harm and it really improves the situation for me.
    
    I used cpu_relax for yielding to the hypervisor, does that work on all
    architectures?
    
    p.s.: If you want to reproduce the problem, cpu hotplug and kprobes use
    stop_machine_run and both triggered the problem after some retries.
    
    Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
    CC: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit 4d2e7d0d77e4e1e8a21cc990c607985fdba20e66
Author: Matti Linnanvuori <mattilinnanvuori@yahoo.com>
Date:   Tue May 13 18:31:47 2008 +0300

    doc: add a chapter about trylock functions [Bug 9011]
    
    Add a chapter about trylock functions.
    http://bugzilla.kernel.org/show_bug.cgi?id=9011
    
    Signed-off-by: Matti Linnanvuori <mattilinnanvuori@yahoo.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (removed down_trylock)

commit 34e4e2fef4c7a2f7699b3d25e48d871d3ac4c3e7
Author: Denis V. Lunev <den@openvz.org>
Date:   Tue May 20 13:59:48 2008 +0400

    modules: proper cleanup of kobject without CONFIG_SYSFS
    
    kobject: '<NULL>' (ffffffffa0104050): is not initialized, yet kobject_put() is being called.
    ------------[ cut here ]------------
    WARNING: at /home/den/src/linux-netns26/lib/kobject.c:583 kobject_put+0x53/0x55()
    Modules linked in: ipv6 nfsd lockd nfs_acl auth_rpcgss sunrpc exportfs ide_cd_mod cdrom button [last unloaded: pktgen]
    comm: rmmod Tainted: G        W 2.6.26-rc3 #585
    Call Trace:
      [<ffffffff802359ab>] warn_on_slowpath+0x58/0x7a
      [<ffffffff80236aca>] ? printk+0x67/0x69
      [<ffffffff80236aca>] ? printk+0x67/0x69
      [<ffffffff80324289>] kobject_put+0x53/0x55
      [<ffffffff8025e2ee>] free_module+0x87/0xfa
      [<ffffffff8025fee5>] sys_delete_module+0x178/0x1e1
      [<ffffffff804b1e70>] ? lockdep_sys_exit_thunk+0x35/0x67
      [<ffffffff804b1dff>] ? trace_hardirqs_on_thunk+0x35/0x3a
      [<ffffffff8020c0bb>] system_call_after_swapgs+0x7b/0x80
    ---[ end trace 8f5aafa7f6406cf8 ]---
    
    mod->mkobj.kobj is not initialized without CONFIG_SYSFS. Do not call
    kobject_put in this case.
    
    Signed-off-by: Denis V. Lunev <den@openvz.org>
    Cc: Rusty Russell <rusty@rustcorp.com.au>
    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit c4ea6fcf5a192dbba54666f308bdace1c278e0c1
Author: Cyrill Gorcunov <gorcunov@gmail.com>
Date:   Wed May 14 16:27:29 2008 -0700

    module loading ELF handling: use SELFMAG instead of numeric constant
    
    Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit 75d3bce2fc0a80f435fe12f2c9ed2632c8ac29e4
Merge: a0abb93... 0a891ad...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu May 22 08:08:25 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
      [CIFS] Fix reversed memset arguments
      Adds username in the upcall key for unattended mounts with keytab
      [CIFS] Remove redundant NULL check

commit 0a891adccc867c28b022128bc342a779e476c816
Author: Dave Jones <davej@redhat.com>
Date:   Thu May 22 14:20:21 2008 +0000

    [CIFS] Fix reversed memset arguments
    
    Signed-off-by: Dave Jones <davej@redhat.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit e4058245ac0c4d9a517cda688a35aef065cb7f4e
Author: Igor Mammedov <niallain@gmail.com>
Date:   Wed Apr 2 17:33:47 2008 +0400

    Adds username in the upcall key for unattended mounts with keytab
    
    Signed-off-by: Igor Mammedov <niallain@gmail.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit a0abb93bf9dc590b031a1123f3e6c6c225c1cdd1
Merge: 9956c11... 071f92d...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed May 21 22:14:39 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:
      net: The world is not perfect patch.
      tcp: Make prior_ssthresh a u32
      xfrm_user: Remove zero length key checks.
      net/ipv4/arp.c: Use common hex_asc helpers
      cassini: Only use chip checksum for ipv4 packets.
      tcp: TCP connection times out if ICMP frag needed is delayed
      netfilter: Move linux/types.h inclusions outside of #ifdef __KERNEL__
      af_key: Fix selector family initialization.
      libertas: Fix ethtool statistics
      mac80211: fix NULL pointer dereference in ieee80211_compatible_rates
      mac80211: don't claim iwspy support
      orinoco_cs: add ID for SpeedStream wireless adapters
      hostap_cs: add ID for Conceptronic CON11CPro
      rtl8187: resource leak in error case
      ath5k: Fix loop variable initializations

commit 9956c1120826bce3b42093099a0149b7f62d0b8a
Merge: 78b58e5... ada44a0...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed May 21 22:00:12 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: Prevent stack backtrace false positives on trap frames.
      sparc64: Fix stack tracing through trap frames.
      sparc64: Fix kernel thread stack termination.
      sunhv: Fix locking in non-paged I/O case.

commit ada44a0430fdd00b3f38aad0aa518e97cb760bd0
Author: David S. Miller <davem@davemloft.net>
Date:   Wed May 21 21:50:01 2008 -0700

    sparc64: Prevent stack backtrace false positives on trap frames.
    
    When we fully commit to returning back to kernel mode from
    a trap, zero out the regs->magic value to prevent false
    positives during stack backtraces.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 0d817bc0d6cdd92ff1ab2e98dd5878659a48659c
Author: Steve French <sfrench@us.ibm.com>
Date:   Thu May 22 02:02:03 2008 +0000

    [CIFS] Remove redundant NULL check
    
    Noticed by Coverity checker.
    
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 14d2c68baa659cfd15dc782dd229ea304330c4f6
Author: David S. Miller <davem@davemloft.net>
Date:   Wed May 21 18:15:53 2008 -0700

    sparc64: Fix stack tracing through trap frames.
    
    The offset to the pt_regs area was wrong, so we weren't
    looking at the right location for the magic cookie.
    
    A trap frame is composed of a "struct sparc_stackf" then
    a "struct pt_regs", the code was using "struct reg_window"
    instead of "struct sparc_stackf".
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit a051bc5bb1ac6dc138d529077fa20cbbc6622d95
Author: David S. Miller <davem@davemloft.net>
Date:   Wed May 21 18:14:28 2008 -0700

    sparc64: Fix kernel thread stack termination.
    
    Because of the silly way I set up the initial stack for
    new kernel threads, there is a loop at the top of the
    stack.
    
    To fix this, properly add another stack frame that is copied
    from the parent and terminate it in the child by setting
    the frame pointer in that frame to zero.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 071f92d05967a0c8422f1c8587ce0b4d90a8b447
Author: Rami Rosen <ramirose@gmail.com>
Date:   Wed May 21 17:47:54 2008 -0700

    net: The world is not perfect patch.
    
      Unless there will be any objection here, I suggest consider the
    following patch which simply removes the code for the
    -DI_WISH_WORLD_WERE_PERFECT in the three methods which use it.
    
    The compilation errors we get when using -DI_WISH_WORLD_WERE_PERFECT
    show that this code was not built and not used for really a long time.
    
    Signed-off-by: Rami Rosen <ramirose@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 4b749440445ebcb6fad402fc762bc35af871f689
Author: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Date:   Wed May 21 17:40:05 2008 -0700

    tcp: Make prior_ssthresh a u32
    
    If previous window was above representable values of u16,
    strange things will happen if undo with the truncated value
    is called for. Alternatively, this could be fixed by some
    max trickery but that would limit undoing high-speed undos.
    
    Adds 16-bit hole but there isn't anything to fill it with.
    
    Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 88860c9ef45963eb69411b0d2ace4e8ba0f7a32f
Author: David S. Miller <davem@davemloft.net>
Date:   Wed May 21 17:36:21 2008 -0700

    xfrm_user: Remove zero length key checks.
    
    The crypto layer will determine whether that is valid
    or not.
    
    Suggested by Herbert Xu, based upon a report and patch
    by Martin Willi.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Acked-by: Herbert Xu <herbert@gondor.apana.org.au>

commit 51f82a2b128131c411880aed2cb802b166fe3445
Author: Denis Cheng <crquan@gmail.com>
Date:   Wed May 21 17:34:32 2008 -0700

    net/ipv4/arp.c: Use common hex_asc helpers
    
    Here the local hexbuf is a duplicate of global const char hex_asc from
    lib/hexdump.c, except the hex letters' cases:
    
    	const char hexbuf[] = "0123456789ABCDEF";
    
    	const char hex_asc[] = "0123456789abcdef";
    
    and here to print HW addresses, the hex cases are not significant.
    
    Thanks to Harvey Harrison to introduce the hex_asc_hi/hex_asc_lo helpers.
    
    Signed-off-by: Denis Cheng <crquan@gmail.com>
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit b1443e2f6501f06930a162ff1ff08382a98bf23e
Author: David S. Miller <davem@davemloft.net>
Date:   Wed May 21 17:05:34 2008 -0700

    cassini: Only use chip checksum for ipv4 packets.
    
    According to David Monro, at least with Natsemi Saturn chips the
    cassini driver has some trouble with ipv6 checksums.
    
    Until we have more information about what's going on here, only
    use the chip checksums for ipv4.
    
    This workaround was suggested and tested by David.
    
    Update version and release date.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 78b58e549a3098a8c1408d0214bd25e5d5e7a3a3
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 06:32:11 2008 +0100

    HTC_EGPIO is ARM-only
    
    driver uses symbols defined only on ARM
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 337e3c48e95e071a6ec1bfe95b55325e97f4908e
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 06:32:11 2008 +0100

    provide out-of-line strcat() for m68k
    
    Whether we sidestep it in init/main.c or not, such situations
    will arise again; compiler does generate calls of strcat()
    on optimizations, so we really ought to have an out-of-line
    version...
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 8c5330a505ca58013a65ce9c55953ff7ded79202
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 06:32:11 2008 +0100

    caiaq endianness fix
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 839cd31050096c88d929cc7c790c80cae87e2d85
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 06:32:11 2008 +0100

    MODULE_LICENSE expects "GPL v2", not "GPLv2"
    
    ... and we have few enough places using the latter to make it
    simpler to do search and replace...
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit e3428e2cf83ca47b66c194559b9e8a74af915947
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 06:32:11 2008 +0100

    msnd_* is ISA-only
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 46cb69ccdf76bf3649a249f6e626c5adc3c2f572
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 06:32:11 2008 +0100

    missing dependencies on HAS_DMA
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 9d8df6aa9b1ca74127b11537d91de492dbea666a
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 06:32:11 2008 +0100

    ocfs2 endianness fixes
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit f6c2fb5ccff51e19850b1aca024a3b20b16a81e9
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 06:32:11 2008 +0100

    irda-usb endianness annotations and fixes
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 572abae844e380ef4f8484d4e374a9ccf73dd568
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 06:32:11 2008 +0100

    sbus bpp: instances missed in s/dev_name/bpp_dev_name/
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 79bc12a0a09c2eb1ccbb01c192045f994567bda2
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 06:32:11 2008 +0100

    ecryptfs fixes
    
    memcpy() from userland pointer is a Bad Thing(tm)
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 4ec7ffa2df247054d422b48148ad82369a45e986
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 06:32:11 2008 +0100

    misc drivers/net endianness noise
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 8152b4a5b40da7c3e8c80e578c5c0608c5a8a142
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 06:32:11 2008 +0100

    thanks to net/mac80211 we need to pull drivers/leds/Kconfig on uml
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 3e3b48e5198544dd90e27265a70c1a834139e025
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 06:32:11 2008 +0100

    missing export of csum_partial() on uml/amd64
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit d347926a7ef9fa1334894a0531aa0c5f8a1ddeae
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 06:32:11 2008 +0100

    uml: add missing exports for UML_RANDOM=m
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 13c48c490208d9e70d8d66d56f96c5054db69af7
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 06:32:11 2008 +0100

    fix hppfs Makefile breakage
    
    Fallout from commit 46d7b522ebf486edbd096965d534cc6465e9e309 ("uml: move
    hppfs_kern.c to hppfs.c")
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Acked-by: Jeff Dike <jdike@addtoit.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 3787fa6df5bb6e80b274ff805e10b6a9bfc4588c
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 06:32:11 2008 +0100

    fix include order in sys-i386/registers.c
    
    We want sys/ptrace.h before any includes of linux/ptrace.h and
    asm/user.h pulls the latter.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Acked-by: Jeff Dike <jdike@addtoit.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 296cd66f7f6e130fe08e6880ecb13c3fc615a8db
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Wed May 21 06:32:11 2008 +0100

    missed kmalloc() in pcap_user.c
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Acked-by: Jeff Dike <jdike@addtoit.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 7d227cd235c809c36c847d6a597956ad9e9d2bae
Author: Sridhar Samudrala <sri@us.ibm.com>
Date:   Wed May 21 16:42:20 2008 -0700

    tcp: TCP connection times out if ICMP frag needed is delayed
    
    We are seeing an issue with TCP in handling an ICMP frag needed
    message that is received after net.ipv4.tcp_retries1 retransmits.
    The default value of retries1 is 3. So if the path mtu changes
    and ICMP frag needed is lost for the first 3 retransmits or if
    it gets delayed until 3 retransmits are done, TCP doesn't update
    MSS correctly and continues to retransmit the orginal message
    until it timesout after tcp_retries2 retransmits.
    
    I am seeing this issue even with the latest 2.6.25.4 kernel.
    
    In tcp_retransmit_timer(), when retransmits counter exceeds
    tcp_retries1 value, the dst cache entry of the socket is reset.
    At this time, if we receive an ICMP frag needed message, the
    dst entry gets updated with the new MTU, but the TCP sockets
    dst_cache entry remains NULL.
    
    So the next time when we try to retransmit after the ICMP frag
    needed is received, tcp_retransmit_skb() gets called. Here the
    cur_mss value is calculated at the start of the routine with
    a NULL sk_dst_cache. Instead we should call tcp_current_mss after
    the rebuild_header that caches the dst entry with the updated mtu.
    Also the rebuild_header should be called before tcp_fragment
    so that skb is fragmented if the mss goes down.
    
    Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit c8942f1f0a7e2160ebf2e51ba89e50ee5895a1e7
Author: Patrick McHardy <kaber@trash.net>
Date:   Wed May 21 14:08:38 2008 -0700

    netfilter: Move linux/types.h inclusions outside of #ifdef __KERNEL__
    
    Greg Steuck <greg@nest.cx> points out that some of the netfilter
    headers can't be used in userspace without including linux/types.h
    first. The headers include their own linux/types.h include statements,
    these are stripped by make headers-install because they are inside
    #ifdef __KERNEL__ however. Move them out to fix this.
    
    Reported and Tested by Greg Steuck.
    
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 4da5105687e0993a3bbdcffd89b2b94d9377faab
Author: Kazunori MIYAZAWA <kazunori@miyazawa.org>
Date:   Wed May 21 13:26:11 2008 -0700

    af_key: Fix selector family initialization.
    
    This propagates the xfrm_user fix made in commit
    bcf0dda8d2408fe1c1040cdec5a98e5fcad2ac72 ("[XFRM]: xfrm_user: fix
    selector family initialization")
    
    Based upon a bug report from, and tested by, Alan Swanson.
    
    Signed-off-by: Kazunori MIYAZAWA <kazunori@miyazawa.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 3651751fff44ede58f65cbb1e39242139ead251b
Author: David S. Miller <davem@davemloft.net>
Date:   Tue May 20 23:42:09 2008 -0700

    sunhv: Fix locking in non-paged I/O case.
    
    This causes the lock to be taken twice, thus resulting in
    a deadlock.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 5cf11daf9abdfd7bf5f5893137155cb38ccbdeb8
Merge: d40ace0... 397d71d...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue May 20 21:12:14 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: (21 commits)
      [CIFS] Remove debug statement
      Fix possible access to undefined memory region.
      [CIFS] Enable DFS support for Windows query path info
      [CIFS] Enable DFS support for Unix query path info
      [CIFS] add missing seq_printf to cifs_show_options for hard mount option
      [CIFS] add more complete mount options to cifs_show_options
      [CIFS] Add missing defines for DFS
      CIFSGetDFSRefer cleanup + dfs_referral_level_3 fixed to conform REFERRAL_V3 the MS-DFSC spec.
      Fixed DFS code to work with new 'build_path_from_dentry', that returns full path if share in the dfs, now.
      [CIFS] enable parsing for transport encryption mount parm
      [CIFS] Finishup DFS code
      [CIFS] BKL-removal: convert CIFS over to unlocked_ioctl
      [CIFS] suppress duplicate warning
      [CIFS] Fix paths when share is in DFS to include proper prefix
      add function to convert access flags to legacy open mode
      clarify return value of cifs_convert_flags()
      [CIFS] don't explicitly do a FindClose on rewind when directory search has ended
      [CIFS] cleanup old checkpatch warnings
      [CIFS] CIFSSMBPosixLock should return -EINVAL on error
      fix memory leak in CIFSFindNext
      ...

commit 397d71ddfda5b11b85e396d6ea822011c132b962
Author: Steve French <sfrench@us.ibm.com>
Date:   Wed May 21 03:49:46 2008 +0000

    [CIFS] Remove debug statement
    
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 5651ced3ab196b5e7dc485c5777f210aa41e2d8d
Author: Igor Mammedov <niallain@gmail.com>
Date:   Tue May 20 13:02:01 2008 +0400

    Fix possible access to undefined memory region.
    
    Signed-off-by: Igor Mammedov <niallain@gmail.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit d8ac48d4cbae0cc59b7784399292fbda3e231be3
Merge: d3ede32... 5d283e8...
Author: David S. Miller <davem@davemloft.net>
Date:   Tue May 20 20:34:22 2008 -0700

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

commit 5d283e8cdb8097b6a3e9304c9c8942ad9dc1a4eb
Author: David Woodhouse <dwmw2@infradead.org>
Date:   Mon May 19 16:32:02 2008 +0100

    libertas: Fix ethtool statistics
    
    Fix various problems:
     - We converted MESH_ACCESS to a direct command but missed this caller.
     - We were trying to access mesh stats even on meshless firmware.
     - We should really zero the buffer if something goes wrong.
    
    Signed-off-by: David Woodhouse <dwmw2@infradead.org>
    Acked-by: Dan Williams <dcbw@redhat.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 0d580a774b3682b8b2b5c89ab9b813d149ef28e7
Author: Helmut Schaa <hschaa@suse.de>
Date:   Tue May 20 09:56:37 2008 +0200

    mac80211: fix NULL pointer dereference in ieee80211_compatible_rates
    
    Fix a possible NULL pointer dereference in ieee80211_compatible_rates
    introduced in the patch "mac80211: fix association with some APs". If no bss
    is available just use all supported rates in the association request.
    
    Signed-off-by: Helmut Schaa <hschaa@suse.de>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit d40ace0c7b4a329f7d869d0fbf27435543bb2acc
Merge: e616c63... 68432a0...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue May 20 19:30:54 2008 -0700

    Merge branch 'for-2.6.26' of git://linux-nfs.org/~bfields/linux
    
    * 'for-2.6.26' of git://linux-nfs.org/~bfields/linux: (25 commits)
      svcrdma: Verify read-list fits within RPCSVC_MAXPAGES
      svcrdma: Change svc_rdma_send_error return type to void
      svcrdma: Copy transport address and arm CQ before calling rdma_accept
      svcrdma: Set rqstp transport address in rdma_read_complete function
      svcrdma: Use ib verbs version of dma_unmap
      svcrdma: Cleanup queued, but unprocessed I/O in svc_rdma_free
      svcrdma: Move the QP and cm_id destruction to svc_rdma_free
      svcrdma: Add reference for each SQ/RQ WR
      svcrdma: Move destroy to kernel thread
      svcrdma: Shrink scope of spinlock on RQ CQ
      svcrdma: Use standard Linux lists for context cache
      svcrdma: Simplify RDMA_READ deferral buffer management
      svcrdma: Remove unused READ_DONE context flags bit
      svcrdma: Return error from rdma_read_xdr so caller knows to free context
      svcrdma: Fix error handling during listening endpoint creation
      svcrdma: Free context on post_recv error in send_reply
      svcrdma: Free context on ib_post_recv error
      svcrdma: Add put of connection ESTABLISHED reference in rdma_cma_handler
      svcrdma: Fix return value in svc_rdma_send
      svcrdma: Fix race with dto_tasklet in svc_rdma_send
      ...

commit e616c6303306df62223ebe2e68bb2f19c420dd81
Merge: 789319d... d3ede32...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue May 20 17:23:03 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: (27 commits)
      pktgen: make sure that pktgen_thread_worker has been executed
      [VLAN]: Propagate selected feature bits to VLAN devices
      drivers/atm/: remove CVS keywords
      vlan: Correctly handle device notifications for layered VLAN devices
      net: Fix call to ->change_rx_flags(dev, IFF_MULTICAST) in dev_change_flags()
      net_sched: cls_api: fix return value for non-existant classifiers
      ipsec: Use the correct ip_local_out function
      ipv6 addrconf: Allow infinite prefix lifetime.
      ipv6 route: Fix lifetime in netlink.
      ipv6 addrconf: Fix route lifetime setting in corner case.
      ndisc: Add missing strategies for per-device retrans timer/reachable time settings.
      ipv6: Move <linux/in6.h> from header-y to unifdef-y.
      l2tp: avoid skb truesize bug if headroom is increased
      wireless: Create 'device' symlink in sysfs
      wireless, airo: waitbusy() won't delay
      libertas: fix command timeout after firmware failure
      mac80211: Add RTNL version of ieee80211_iterate_active_interfaces
      mac80211 : Association with 11n hidden ssid ap.
      hostap: fix "registers" registration in procfs
      isdn/capi: Return proper errnos on module init.
      ...

commit 789319db76ccb8f61d2f6a91d2f2fcb70edae9c5
Merge: fd9908c... 93dae5b...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue May 20 17:21:32 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: Add global register dumping facility.
      sparc: remove CVS keywords
      sparc64: remove CVS keywords

commit fd9908c078b30db393e9855fb96f804793af23ba
Merge: 57312b7... afba937...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue May 20 17:20:49 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:
      USB: CDC WDM driver
      USB: ehci-orion: the Orion EHCI root hub does have a Transaction Translator
      USB: serial: ch341: New VID/PID for CH341 USB-serial
      USB: build fix
      USB: pxa27x_udc - Fix Oops
      USB: OPTION: fix name of Onda MSA501HS HSDPA modem
      USB: add TELIT HDSPA UC864-E modem to option driver
      usb-serial: Use ftdi_sio driver for RATOC REX-USB60F

commit 57312b75aa06b09c28acd9c5a9c70827da3696d2
Merge: 1b5e2a7... 24b4256...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue May 20 17:20:23 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
      SCSI: fix race in device_create
      USB: Core: fix race in device_create
      USB: Phidget: fix race in device_create
      s390: fix race in device_create
      SOUND: fix race in device_create
      UIO: fix race in device_create
      Power Supply: fix race in device_create
      LEDS: fix race in device_create
      IB: fix race in device_create
      ide: fix race in device_create
      fbdev: fix race in device_create
      mm: bdi: fix race in bdi_class device creation
      Driver core: add device_create_vargs and device_create_drvdata

commit 68432a03f8ff93a9eecee95cc8f02e7fe2025cc9
Merge: d71a4dd... a6f911c...
Author: J. Bruce Fields <bfields@citi.umich.edu>
Date:   Tue May 20 19:57:38 2008 -0400

    Merge branch 'from-tomtucker' into for-2.6.26

commit d3ede327e83f202c3a0962e207318f65717c5eb7
Author: Denis V. Lunev <den@openvz.org>
Date:   Tue May 20 15:12:44 2008 -0700

    pktgen: make sure that pktgen_thread_worker has been executed
    
    The following courruption can happen during pktgen stop:
    list_del corruption. prev->next should be ffff81007e8a5e70, but was 6b6b6b6b6b6b6b6b
    kernel BUG at lib/list_debug.c:67!
          :pktgen:pktgen_thread_worker+0x374/0x10b0
          ? autoremove_wake_function+0x0/0x40
          ? _spin_unlock_irqrestore+0x42/0x80
          ? :pktgen:pktgen_thread_worker+0x0/0x10b0
          kthread+0x4d/0x80
          child_rip+0xa/0x12
          ? restore_args+0x0/0x30
          ? kthread+0x0/0x80
          ? child_rip+0x0/0x12
    RIP  list_del+0x48/0x70
    
    The problem is that pktgen_thread_worker can not be executed if kthread_stop
    has been called too early. Insert a completion on the normal initialization
    path to make sure that pktgen_thread_worker will gain the control for sure.
    
    Signed-off-by: Denis V. Lunev <den@openvz.org>
    Acked-by: Alexey Dobriyan <adobriyan@openvz.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 51e779f0daa5c712439d37b907d58543e4fcf12a
Author: Johannes Berg <johannes@sipsolutions.net>
Date:   Mon May 19 07:18:10 2008 +0200

    mac80211: don't claim iwspy support
    
    We removed iwspy support a very long time ago because it is useless, but
    forgot to stop claiming to support it. Apparently, nobody cares, but
    remove it nonetheless.
    
    Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 682c97c04b3041d0f29241b8bfa013093201e269
Author: Pavel Roskin <proski@gnu.org>
Date:   Fri May 16 17:53:03 2008 -0400

    orinoco_cs: add ID for SpeedStream wireless adapters
    
    Reported by Gerald Willmann <gerald.willmann@econ.kuleuven.be>
    
    Signed-off-by: Pavel Roskin <proski@gnu.org>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 449fecca0b74502b571f4199d46bcd6a11a5e2c2
Author: Pavel Roskin <proski@gnu.org>
Date:   Fri May 16 17:52:57 2008 -0400

    hostap_cs: add ID for Conceptronic CON11CPro
    
    Reported by Santiago Garcia Mantinan <hostap@manty.net>
    
    Signed-off-by: Pavel Roskin <proski@gnu.org>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit ea8ee240251cbac73b66d70d35eeabfbff86d3ce
Author: Oliver Neukum <oliver@neukum.org>
Date:   Thu May 15 21:49:16 2008 +0200

    rtl8187: resource leak in error case
    
    This fixes resource leaks in error cases due to urb submission
    failures.
    
    Signed-off-by: Oliver Neukum <oneukum@suse.de>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 5fb13570543f4ae022996c9d7c0c099c8abf22dd
Author: Patrick McHardy <kaber@trash.net>
Date:   Tue May 20 14:54:50 2008 -0700

    [VLAN]: Propagate selected feature bits to VLAN devices
    
    Propagate feature bits from the NETDEV_FEAT_CHANGE notifier. For now
    only TSO is propagated for devices that announce their ability to
    support TSO in combination with VLAN accel by setting the NETIF_F_VLAN_TSO
    flag.
    
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit b9a3260f25ab5d2ba5c8b9508e7952848b9d704b
Author: Steve French <sfrench@us.ibm.com>
Date:   Tue May 20 21:52:32 2008 +0000

    [CIFS] Enable DFS support for Windows query path info
    
    Final piece for handling DFS in query_path_info, constructing a
    fake inode for the junction directory which the submount will cover.
    
    This handles the non-Unix (Windows etc.) code path.
    
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 7ff6e6f779960e1078a78b60a881571c04f52b9b
Author: Adrian Bunk <bunk@kernel.org>
Date:   Tue May 20 14:52:25 2008 -0700

    drivers/atm/: remove CVS keywords
    
    This patch removes CVS keywords that weren't updated for a long time.
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Acked-by: Chas Williams <chas@cmf.nrl.navy.mil>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 89fd2e282ad510f801c1f44a660086f9d5bdf088
Author: Bob Copeland <me@bobcopeland.com>
Date:   Mon May 12 21:16:44 2008 -0400

    ath5k: Fix loop variable initializations
    
    In ath5k_tasklet_rx, both status structures 'rxs' and 'rs' are
    initialized at the top of the tasklet, but not within the loop.
    If the loop is executed multiple times in the tasklet then the
    variables may see changes from previous packets.
    
    For TKIP, this results in 'Invalid Michael MIC' errors if two packets
    are processed in the tasklet: rxs.flag gets set to RX_DECRYPTED by
    mac80211 when it decrypts the first encrypted packet.  The subsequent
    packet will have RX_DECRYPTED set upon entry to mac80211, so mac80211
    will not try to decrypt it.
    
    We currently initialize all but two fields in the structures, so fix
    the other two.
    
    Signed-off-by: Bob Copeland <me@bobcopeland.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 81d85346b3fcd8b3167eac8b5fb415a210bd4345
Author: Patrick McHardy <kaber@trash.net>
Date:   Tue May 20 14:37:36 2008 -0700

    vlan: Correctly handle device notifications for layered VLAN devices
    
    Commit 30688a9 ([VLAN]: Handle vlan devices net namespace changing)
    changed the device notifier to special-case notifications for VLAN
    devices, effectively disabling state propagation to underlying VLAN
    devices. This is needed for layered VLANs though, so restore the
    original behaviour.
    
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Acked-by: Pavel Emelyanov <xemul@openvz.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 0e91796eb46e29edc791131c832a2232bcaed9dd
Author: David Woodhouse <dwmw2@infradead.org>
Date:   Tue May 20 14:36:14 2008 -0700

    net: Fix call to ->change_rx_flags(dev, IFF_MULTICAST) in dev_change_flags()
    
    Am I just being particularly dim today, or can the call to
    dev->change_rx_flags(dev, IFF_MULTICAST) in dev_change_flags() never
    happen?
    
    We've just set dev->flags = flags & IFF_MULTICAST, effectively. So the
    condition '(dev->flags ^ flags) & IFF_MULTICAST' is _never_ going to be
    true.
    
    Signed-off-by: David Woodhouse <dwmw2@infradead.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit f2df824948d559ea818e03486a8583e42ea6ab37
Author: Patrick McHardy <kaber@trash.net>
Date:   Tue May 20 14:34:46 2008 -0700

    net_sched: cls_api: fix return value for non-existant classifiers
    
    cls_api should return ENOENT when the requested classifier doesn't
    exist.
    
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 1ac06e0306d0192a7a4d9ea1c9e06d355ce7e7d3
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date:   Tue May 20 14:32:14 2008 -0700

    ipsec: Use the correct ip_local_out function
    
    Because the IPsec output function xfrm_output_resume does its
    own dst_output call it should always call __ip_local_output
    instead of ip_local_output as the latter may invoke dst_output
    directly.  Otherwise the return values from nf_hook and dst_output
    may clash as they both use the value 1 but for different purposes.
    
    When that clash occurs this can cause a packet to be used after
    it has been freed which usually leads to a crash.  Because the
    offending value is only returned from dst_output with qdiscs
    such as HTB, this bug is normally not visible.
    
    Thanks to Marco Berizzi for his perseverance in tracking this
    down.
    
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 1b5e2a7e23439c13f73cacab1cf227f30cb9ae9f
Merge: 737b0fb... eccf214...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue May 20 14:28:34 2008 -0700

    Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
    
    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
      iop-adma: fixup some kzalloc/memset confusions
      fsldma: update the fsldma driver MAINTAINERS info

commit afba937e540c902c989cd516fd97ea0c8499bb27
Author: Oliver Neukum <oliver@neukum.org>
Date:   Tue May 13 17:01:25 2008 +0200

    USB: CDC WDM driver
    
    Signed-off-by: Oliver Neukum <oneukum@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 129bd474a80726247e5b1c61fe66a413e63053bc
Author: Lennert Buytenhek <buytenh@wantstofly.org>
Date:   Tue May 20 19:08:53 2008 +0200

    USB: ehci-orion: the Orion EHCI root hub does have a Transaction Translator
    
    Commit 7329e211b987a493cbcfca0e98c60eb108ab42df ("USB: root hubs don't
    lie about their number of TTs") requires the various platform EHCI
    glue modules to set ->has_tt if the root hub has a Transaction
    Translator.
    
    The Orion EHCI root hub does have a Transaction Translator, so set
    ->has_tt in ehci_orion_setup().  This fixes oopsing on plugging in a
    low speed device.
    
    Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
    Acked-by: Nicolas Pitre <nico@marvell.com>
    Acked-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 82078234d4023c61b9d88e8be5e795423d17538e
Author: Michael F. Robbins <mrobbins@MIT.EDU>
Date:   Fri May 16 23:48:42 2008 -0400

    USB: serial: ch341: New VID/PID for CH341 USB-serial
    
    Recent USB-serial devices using the WinChipHead CH340/CH341 chipset are
    being shipped with a new vendor/product ID code pair, but an otherwise
    identical device.  (This is confirmed by looking at INF for the included
    Windows driver.)
    
    Patch is tested and working, both with new and old devices.
    
    Signed-off-by: Michael F. Robbins <mrobbins@mit.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit f82b9878e9fe7351370d4426d9437a62c0c1ebe5
Author: Ingo Molnar <mingo@elte.hu>
Date:   Fri May 16 09:30:14 2008 +0200

    USB: build fix
    
    this config:
    
    http://redhat.com/~mingo/misc/config-Wed_Apr_30_15_12_48_CEST_2008.bad
    
    fails to build due to an #error. Turn that into a #warning instead
    to not break randconfig builds unnecessarily.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 3f886620742edd4e7e037d7d9349be69df0ce59b
Author: karl beldan <karl.beldan@gmail.com>
Date:   Fri May 16 11:30:22 2008 +0200

    USB: pxa27x_udc - Fix Oops
    
    udc_disable oopses dereferencing udc_command.
    
    Signed-off-by: Karl Beldan <karl.beldan@gmail.com>
    Acked-by: Robert Jarzmik <rjarzmik@free.fr>
    Acked-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 1b2d23d49cf4b4b1fe3b43d3ffd6077fc4ee9ac6
Author: Arnaldo Carvalho de Melo <acme@redhat.com>
Date:   Fri May 16 15:41:40 2008 -0300

    USB: OPTION: fix name of Onda MSA501HS HSDPA modem
    
    This fixes the name of the onda MSA501HS device, I guess it is called
    different things in different countries.
    
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit ee53b0ca0153b4f944cb142b5e65c96a1860d765
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date:   Thu May 15 10:07:44 2008 -0700

    USB: add TELIT HDSPA UC864-E modem to option driver
    
    This adds the Telit UC864-E HDSPA modem support to the option driver.
    This lets their customers comply with the GPL instead of having to use a
    binary driver from the manufacturer.
    
    Cc: Simon Kissel <kissel@viprinet.com>
    Cc: Nico Erfurth <ne@nicoerfurth.de>
    Cc: Andrea Ghezzo <TS-EMEA@telit.com>
    Cc: Dietmar Staps <Dietmar.Staps@telit.com>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 26ab705396b65a469233a8327ecb51b8aebb6be0
Author: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Date:   Sat May 17 00:13:56 2008 +0900

    usb-serial: Use ftdi_sio driver for RATOC REX-USB60F
    
    This patch reverts 57833ea6b95a3995149f1f6d1a8d8862ab7a0ba2
    ("usb-serial: pl2303: add support for RATOC REX-USB60F") and adds
    support for the device to ftdi_sio driver.
    
    Cc: Akira Tsukamoto <akirat@rd.scei.sony.co.jp>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit eccf2144e1232c33a8235033ffa079b6ebf92faf
Author: Christophe Jaillet <christophe.jaillet@wanadoo.fr>
Date:   Tue May 20 16:33:06 2008 -0700

    iop-adma: fixup some kzalloc/memset confusions
    
    1) Remove an explicit memset(.., 0, ...) to a variable allocated with
    kzalloc (i.e. 'dest').
    
    2) Allocate 'src' with kmalloc instead of kzalloc as all elements of the
    'src' buffer are initialized in a 'for(...)' loop just after.
    
    3) remove useless 'sizeof(u8)', which always returns 1, when computing the
    size of the memory to be allocated.
    
    Signed-off-by: Christophe Jaillet <christophe.jaillet@wanadoo.fr>
    Signed-off-by: Dan Williams <dan.j.williams@intel.com>

commit 76b0c788e6033c514f2a75171b04c73c68d28e8d
Author: Zhang Wei <zw@zh-kernel.org>
Date:   Tue May 13 14:44:59 2008 -0700

    fsldma: update the fsldma driver MAINTAINERS info
    
    Add Li Yang as the new maintainer for fsldma driver and update
    my email address.
    
    Acked-by: Li Yang <leoli@freescale.com>
    Signed-off-by: Zhang Wei <zw@zh-kernel.org>
    Signed-off-by: Dan Williams <dan.j.williams@intel.com>

commit 24b42566c3fcbb5a9011d1446783d0f5844ccd45
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date:   Fri May 16 17:55:12 2008 -0700

    SCSI: fix race in device_create
    
    There is a race from when a device is created with device_create() and
    then the drvdata is set with a call to dev_set_drvdata() in which a
    sysfs file could be open, yet the drvdata will be NULL, causing all
    sorts of bad things to happen.
    
    This patch fixes the problem by using the new function,
    device_create_drvdata().  It fixes the problem in all of the scsi
    drivers that need it.
    
    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Cc: Doug Gilbert <dgilbert@interlog.com>
    Cc: James E.J. Bottomley <James.Bottomley@HansenPartnership.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit c013d040b70bc2bff5465917ebb255a70b650396
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date:   Fri May 16 17:55:12 2008 -0700

    USB: Core: fix race in device_create
    
    There is a race from when a device is created with device_create() and
    then the drvdata is set with a call to dev_set_drvdata() in which a
    sysfs file could be open, yet the drvdata will be NULL, causing all
    sorts of bad things to happen.
    
    This patch fixes the problem by using the new function,
    device_create_drvdata().
    
    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit bfd3a5a96c1dd432303fdf2283e770419f6aecb3
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date:   Fri May 16 17:55:12 2008 -0700

    USB: Phidget: fix race in device_create
    
    There is a race from when a device is created with device_create() and
    then the drvdata is set with a call to dev_set_drvdata() in which a
    sysfs file could be open, yet the drvdata will be NULL, causing all
    sorts of bad things to happen.
    
    This patch fixes the problem by using the new function,
    device_create_drvdata().  It fixes all 3 phidget drivers, which all have
    the same problem.
    
    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Cc: Sean Young <sean@mess.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit c5fb920aec2090a44aa4c33546b9f3c3affa538c
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date:   Fri May 16 17:55:12 2008 -0700

    s390: fix race in device_create
    
    There is a race from when a device is created with device_create() and
    then the drvdata is set with a call to dev_set_drvdata() in which a
    sysfs file could be open, yet the drvdata will be NULL, causing all
    sorts of bad things to happen.
    
    This patch fixes the problem by using the new function,
    device_create_drvdata().
    
    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
    Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 5d99a8b814abd76e89ef2cf90e29bbb879d6d66c
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date:   Fri May 16 17:55:12 2008 -0700

    SOUND: fix race in device_create
    
    There is a race from when a device is created with device_create() and
    then the drvdata is set with a call to dev_set_drvdata() in which a
    sysfs file could be open, yet the drvdata will be NULL, causing all
    sorts of bad things to happen.
    
    This patch fixes the problem by using the new function,
    device_create_drvdata().
    
    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Cc: Jaroslav Kysela <perex@perex.cz>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 43691da4cefcf0d0dd6432f9e7e0dba902b59597
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date:   Fri May 16 17:55:12 2008 -0700

    UIO: fix race in device_create
    
    There is a race from when a device is created with device_create() and
    then the drvdata is set with a call to dev_set_drvdata() in which a
    sysfs file could be open, yet the drvdata will be NULL, causing all
    sorts of bad things to happen.
    
    This patch fixes the problem by using the new function,
    device_create_drvdata().
    
    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Cc: Hans J. Koch <hjk@linutronix.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 54d29ad33e3483bcc7ca433a21cf294854e5154a
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date:   Fri May 16 17:55:12 2008 -0700

    Power Supply: fix race in device_create
    
    There is a race from when a device is created with device_create() and
    then the drvdata is set with a call to dev_set_drvdata() in which a
    sysfs file could be open, yet the drvdata will be NULL, causing all
    sorts of bad things to happen.
    
    This patch fixes the problem by using the new function,
    device_create_drvdata().
    
    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Cc: Anton Vorontsov <cbou@mail.ru>
    Cc: David Woodhouse <dwmw2@infradead.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 0b00fc5851551781e8a30153af2c94cee9fa84af
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date:   Fri May 16 17:55:12 2008 -0700

    LEDS: fix race in device_create
    
    There is a race from when a device is created with device_create() and
    then the drvdata is set with a call to dev_set_drvdata() in which a
    sysfs file could be open, yet the drvdata will be NULL, causing all
    sorts of bad things to happen.
    
    This patch fixes the problem by using the new function,
    device_create_drvdata().
    
    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Cc: Richard Purdie <rpurdie@rpsys.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 6c06aec2487f7568cf57471a20f422568f25d551
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date:   Fri May 16 17:55:12 2008 -0700

    IB: fix race in device_create
    
    There is a race from when a device is created with device_create() and
    then the drvdata is set with a call to dev_set_drvdata() in which a
    sysfs file could be open, yet the drvdata will be NULL, causing all
    sorts of bad things to happen.
    
    This patch fixes the problem by using the new function,
    device_create_drvdata().
    
    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Reviewed-by: Roland Dreier <rolandd@cisco.com>
    Cc: Sean Hefty <sean.hefty@intel.com>
    Cc: Hal Rosenstock <hal.rosenstock@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 716ad8750a3ffe6b458d52da2d1c01cbf3e2f60d
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date:   Fri May 16 17:55:12 2008 -0700

    ide: fix race in device_create
    
    There is a race from when a device is created with device_create() and
    then the drvdata is set with a call to dev_set_drvdata() in which a
    sysfs file could be open, yet the drvdata will be NULL, causing all
    sorts of bad things to happen.
    
    This patch fixes the problem by using the new function,
    device_create_drvdata().
    
    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Acked-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 8b485877e0b9eb23c3579f50cca165f75442c6cc
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date:   Thu May 15 13:44:08 2008 -0700

    fbdev: fix race in device_create
    
    There is a race from when a device is created with device_create() and
    then the drvdata is set with a call to dev_set_drvdata() in which a
    sysfs file could be open, yet the drvdata will be NULL, causing all
    sorts of bad things to happen.
    
    This patch fixes the problem by using the new function,
    device_create_drvdata().
    
    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Cc: James Simmons <jsimmons@infradead.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 19051c5035d217e572672a2ca9db06c1cef50e9b
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date:   Thu May 15 13:44:08 2008 -0700

    mm: bdi: fix race in bdi_class device creation
    
    There is a race from when a device is created with device_create() and
    then the drvdata is set with a call to dev_set_drvdata() in which a
    sysfs file could be open, yet the drvdata will be NULL, causing all
    sorts of bad things to happen.
    
    This patch fixes the problem by using the new function,
    device_create_vargs().
    
    Many thanks to Arthur Jones <ajones@riverbed.com> for reporting the bug,
    and testing patches out.
    
    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Cc: Arthur Jones <ajones@riverbed.com>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Miklos Szeredi <mszeredi@suse.cz>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 8882b39421bae317e3ee864edd845e994307ce16
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date:   Thu May 15 13:44:08 2008 -0700

    Driver core: add device_create_vargs and device_create_drvdata
    
    We want to have the drvdata field set properly when creating the device
    as sysfs callbacks can assume it is present and it can race the later
    setting of this field.
    
    So, create two new functions, deviec_create_vargs() and
    device_create_drvdata() that take this new field.
    
    device_create_drvdata() will go away in 2.6.27 as the drvdata field will
    just be moved to the device_create() call as it should be.
    
    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 0e4bbde94fdc33f5b3d793166b21bf768ca3e098
Author: Steve French <sfrench@us.ibm.com>
Date:   Tue May 20 19:50:46 2008 +0000

    [CIFS] Enable DFS support for Unix query path info
    
    Final piece for handling DFS in unix_query_path_info, constructing a
    fake inode for the junction directory which the submount will cover.
    
    Acked-by: Igor Mammedov <niallain@gmail.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 737b0fbf448306975267509e6c6a074885ddb43c
Merge: c110a2b... c1f69db...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue May 20 10:55:04 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: correct mailing list address
      PCI: Correct last two HP entries in the bfsort whitelist

commit c110a2bd82676a8f124cf4dfc39339fd366f0e59
Merge: 81b2dbc... 551f4cb...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue May 20 10:12:48 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
      firewire: prevent userspace from accessing shut down devices
      ieee1394: sbp2: use correct size of command descriptor block

commit 81b2dbcad86732ffc02bad87aa25c4651199fc77
Author: Arjan van de Ven <arjan@linux.intel.com>
Date:   Tue May 20 09:53:52 2008 -0700

    Fix a deadlock in the bttv driver
    
    vidiocgmbuf() does this:
            mutex_lock(&fh->cap.vb_lock);
            retval = videobuf_mmap_setup(&fh->cap, gbuffers, gbufsize,
                                         V4L2_MEMORY_MMAP);
    
    and videobuf_mmap_setup() then just does
            mutex_lock(&q->vb_lock);
            ret = __videobuf_mmap_setup(q, bcount, bsize, memory);
            mutex_unlock(&q->vb_lock);
    
    which is an obvious double-take deadlock.
    
    This patch fixes this by having vidiocgmbuf() just call the
    __videobuf_mmap_setup function instead.
    
    Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    Reported-by: Koos Vriezen <koos.vriezen@gmail.com>
    Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 551f4cb9de716ffcdaf968c99a450c22ff12e8c3
Author: Jay Fenlason <fenlason@redhat.com>
Date:   Fri May 16 11:15:23 2008 -0400

    firewire: prevent userspace from accessing shut down devices
    
    If userspace ignores the POLLERR bit from poll(), and only attempts to
    read() the device when POLLIN is set, it can still make ioctl() calls on
    a device that has been removed from the system.  The node_id and
    generation returned by GET_INFO will be outdated, but INITIATE_BUS_RESET
    would still cause a bus reset, and GET_CYCLE_TIMER will return data.
    And if you guess the correct generation to use, you can send requests to
    a different device on the bus, and get responses back.
    
    This patch prevents open, ioctl, compat_ioctl, and mmap against shutdown
    devices.
    
    Signed-off-by: Jay Fenlason <fenlason@redhat.com>
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit 93c596f7d611b379302bbdd26f31acdf72f4859a
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date:   Sun May 4 16:54:14 2008 +0200

    ieee1394: sbp2: use correct size of command descriptor block
    
    Boaz Harrosh wrote:
    > cmd->cmd_len is now guarantied to be set properly at all cases.
    > And some commands you want to support will not be set correctly
    > by COMMAND_SIZE().
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit babd90b274e6b43a7dc7bb08562bf566cbabdbf8
Merge: 424de91... 186c311...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue May 20 08:49:08 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] hda - Fix ASUS P5GD1 model
      [ALSA] hda - Fix ALC262 fujitsu model
      snd-pcsp: use HRTIMER_CB_SOFTIRQ

commit 424de91dd6163808729d7082de55c319e1096bee
Merge: bca39da... f8dea7a...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue May 20 08:16:25 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
      HID: remove CVS keywords
      HID: Add iMON LCDs to blacklist
      HID: add Microchip PICKit 1 and PICkit 2 to blacklist
      HID: split Numlock emulation quirk from HID_QUIRK_APPLE_HAS_FN.

commit bca39da5645c72048e8854340575c338b8100bca
Merge: 551395a... 09c2012...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue May 20 08:15:34 2008 -0700

    Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
      [POWERPC] Update defconfigs for desktop/server systems
      [POWERPC] Fix mpc8377_mds.dts DMA nodes to match spec
      [POWERPC] Update arch/powerpc/boot/.gitignore
      [POWERPC] Remove generated files on make clean
      [POWERPC] powerpc/mm/hash_low_32.S: Remove CVS keyword
      [POWERPC] Update Cell MAINTAINERS entry, add spufs entry
      lmb: Fix compile warning

commit 551395ae667d699189014f762355e9131fc03e79
Merge: a8375bd... 00377d8...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue May 20 08:15:18 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
      [GFS2] Prefer strlcpy() over snprintf()
      [GFS2] Fix cast from unsigned int to s64
      [GFS2] filesystem consistency error from do_strip

commit a8375bd81cf99cb81be37127eaf08316ecb87619
Author: Hugh Dickins <hugh@veritas.com>
Date:   Tue May 20 13:59:47 2008 +0100

    x86: strengthen 64-bit p?d_bad()
    
    The x86_64 pgd_bad(), pud_bad(), pmd_bad() inlines have differed from
    their x86_32 counterparts in a couple of ways: they've been unnecessarily
    weak (e.g. letting 0 or 1 count as good), and were typed as unsigned long.
    Strengthen them and return int.
    
    The PAE pmd_bad was too weak before, allowing any junk in the upper half;
    but got strengthened by the patch correcting its ~PAGE_MASK to ~PTE_MASK.
    The PAE pud_bad already said ~PTE_MASK; and since it folds into pgd_bad,
    and we don't set the protection bits at that level, it'll do as is.
    
    Signed-off-by: Hugh Dickins <hugh@veritas.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit cbb3077cbe718795d7ae5d78ed11659ca73c97b9
Author: Jeremy Fitzhardinge <jeremy@goop.org>
Date:   Tue May 20 08:26:24 2008 +0100

    xen: use PTE_MASK in pte_mfn()
    
    Use PTE_MASK to extract mfn from pte.
    
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    Tested-by: Hugh Dickins <hugh@veritas.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit ba23cef5c23cf1e9298032037d919157553d1211
Author: Jeremy Fitzhardinge <jeremy@goop.org>
Date:   Tue May 20 08:26:23 2008 +0100

    x86: use PTE_MASK rather than ad-hoc mask
    
    Use ~PTE_MASK to extract the non-pfn parts of the pte (ie, the pte
    flags), rather than constructing an ad-hoc mask.
    
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    Tested-by: Hugh Dickins <hugh@veritas.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 86aaf4fd4ea25ddde05772d03b93dbce23c0ead1
Author: Jeremy Fitzhardinge <jeremy@goop.org>
Date:   Tue May 20 08:26:22 2008 +0100

    x86: clarify use of _PAGE_CHG_MASK
    
    _PAGE_CHG_MASK is defined as the set of bits not updated by
    pte_modify(); specifically, the pfn itself, and the Accessed and Dirty
    bits (which are updated by hardware).
    
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    Tested-by: Hugh Dickins <hugh@veritas.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 7f84133af6aaa86e9ef0e9e1970655439a8cf3a1
Author: Jeremy Fitzhardinge <jeremy@goop.org>
Date:   Tue May 20 08:26:21 2008 +0100

    x86: use PTE_MASK in pgtable_32.h
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit a4d6886270a5c892d71cd6e09186196a150a50dc
Author: Jeremy Fitzhardinge <jeremy@goop.org>
Date:   Tue May 20 08:26:20 2008 +0100

    x86: use PTE_MASK in 32-bit PAE
    
    Use PTE_MASK in 3-level pagetables (ie, 32-bit PAE).
    
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    Tested-by: Hugh Dickins <hugh@veritas.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit c57c05d0032cd5a500c5eba18ede4867a6d2cd5f
Author: Jeremy Fitzhardinge <jeremy@goop.org>
Date:   Tue May 20 08:26:19 2008 +0100

    x86: rearrange __(VIRTUAL|PHYSICAL)_MASK
    
    Put the definitions of __(VIRTUAL|PHYSICAL)_MASK before their uses.
    
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    Tested-by: Hugh Dickins <hugh@veritas.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 1bb271db63c356212564aad050b2cf026f800858
Author: Jeremy Fitzhardinge <jeremy@goop.org>
Date:   Tue May 20 08:26:18 2008 +0100

    x86: fix warning on 32-bit non-PAE
    
    Fix the warning:
    
    include2/asm/pgtable.h: In function `pte_modify':
    include2/asm/pgtable.h:290: warning: left shift count >= width of type
    
    On 32-bit PAE the virtual and physical addresses are both 32-bits,
    so it ends up evaluating 1<<32.  Do the shift as a 64-bit shift then
    cast to the appropriate size.  This should all be done at compile time,
    and so have no effect on generated code.
    
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    Tested-by: Hugh Dickins <hugh@veritas.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 2bd3a99c9d1851182f73d0a024dc5bdb0a470e8c
Author: Jeremy Fitzhardinge <jeremy@goop.org>
Date:   Tue May 20 08:26:17 2008 +0100

    x86: define PTE_MASK in a universally useful way
    
    Define PTE_MASK so that it contains a meaningful value for all x86
    pagetable configurations.  Previously it was defined as a "long" which
    means that it was too short to cover a 32-bit PAE pte entry.
    
    It is now defined as a pteval_t, which is an integer type long enough
    to contain a full pte (or pmd, pud, pgd).
    
    This fixes an Xorg crash on 32-bit x86 with PAE due to corruption of the
    NX bit in mprotect due to the incorrect type/value of PTE_MASK reported
    by Hugh Dickins:
    
      "Yes, thanks Jeremy: I've checked that each stage builds and runs X on
       my boxes here, x86_32 and x86_32+PAE and x86_64.  (So even 1/8 is
       enough to fix the PAT pte_modify issue, though 2/8 then fixes
       compiler warnings.)"
    
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    Tested-by: Hugh Dickins <hugh@veritas.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit f8dea7a3d47ee7c857965b22e33229e7de410a88
Author: Adrian Bunk <bunk@kernel.org>
Date:   Tue May 20 01:31:25 2008 +0200

    HID: remove CVS keywords
    
    This patch removes CVS keywords that weren't updated for a long time
    from comments.
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit 0952c9e8eda6dea621176b2263323e74d05f50c1
Author: Dylan R Semler <dylan.semler@gmail.com>
Date:   Wed May 14 11:38:14 2008 +0200

    HID: Add iMON LCDs to blacklist
    
    The new iMON LCDs from SoundGraph need to be blacklisted from HID in order to
    be used by lirc.
    
    Signed-off-by: Dylan R Semler <dylan.semler@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit f4971031f4acd98423a2903c6517fb3ef1aea8dc
Author: Xiaofan Chen <xiaofanc@gmail.com>
Date:   Tue May 13 17:11:59 2008 +0200

    HID: add Microchip PICKit 1 and PICkit 2 to blacklist
    
    Microchip PICkit 1 and PICKit 2 USB Programmers are USB HID class of device but
    they are not real HID device. They are now supported by libusb based programs
    like the following programs.
    
    pk2 and pk2cmd Linux port:
    	http://home.pacbell.net/theposts/picmicro/
    usb_pickit:
    	http://tfc.duke.free.fr/pickit.html
    usb_pickit original version:
    	http://charm.cs.uiuc.edu/users/olawlor/projects/2003/microchip/
    
    Therefore it ispreferred to blacklist them.
    
    Signed-off-by: Xiaofan Chen <xiaofanc@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit 6e7045990f35ef9250804b3fd85e855b8c2aaeb6
Author: Diego 'Flameeyes' Petteno <flameeyes@gmail.com>
Date:   Mon May 5 16:20:50 2008 +0200

    HID: split Numlock emulation quirk from HID_QUIRK_APPLE_HAS_FN.
    
    Since 2.6.25 the HID_QUIRK_APPLE_HAS_FN quirk is enabled even for
    non-laptop Apple keyboards of the Aluminium series. The USB version of
    these don't need Numlock emulation, like the laptop (and Aluminium
    Wireless) do, as they have a proper keypad.
    
    This patch splits the Numlock emulation for Apple keyboards in a
    different quirk flag, so that it can be enabled for all the keyboards
    but the Aluminium USB ones.
    
    If the Numlock emulation is enabled for Aluminium USB keyboards, the
    JKL and UIO keys become the numeric pad, and the rest of the keyboard
    is disabled, included the key used to disable Numlock.
    
    Additionally, these keyboard should not have a Numlock at all, as the
    Numlock key is instead replaced by the 'Clear' key as usual for Apple
    USB keyboards.
    
    Signed-off-by: Diego 'Flameeyes' Petteno <flameeyes@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit 09c201219b000c5d79a7a7ebeb2f9768e97224fc
Author: Paul Mackerras <paulus@samba.org>
Date:   Tue May 20 20:04:12 2008 +1000

    [POWERPC] Update defconfigs for desktop/server systems
    
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 186c3117f8aac0b2ac5290aaed254fcfdcc937de
Author: Travis Place <wishie@wishie.net>
Date:   Tue May 20 11:54:41 2008 +0200

    [ALSA] hda - Fix ASUS P5GD1 model
    
    Corrected the model assignment for the ASUS P5GD1 w/SPDIF after reports of
    surround sound not being possible.
    
    Signed-off-by: Travis Place <wishie@wishie.net>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit ebc7a406633acefc6d12c1ccc9441bfef69e0f33
Author: Takashi Iwai <tiwai@suse.de>
Date:   Tue May 20 09:23:05 2008 +0200

    [ALSA] hda - Fix ALC262 fujitsu model
    
    Fixed the speaker auto-mute with two laptop and docking headphones.
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Acked-by: Tony Vroon <tony@linx.net>

commit 4b7afb0d0d23b298a7e6d30eaba0679449542d2e
Author: Stas Sergeev <stsp@aknet.ru>
Date:   Tue May 20 11:47:29 2008 +0200

    snd-pcsp: use HRTIMER_CB_SOFTIRQ
    
    Change HRTIMER_CB_IRQSAFE to HRTIMER_CB_SOFTIRQ,
    as suggested by Thomas Gleixner.
    That solves the lock dependancy reported in
    Bug #10701.
    That also allows to call hrtimer_start()
    directly, tasklet "stupid hack" removed.
    
    Signed-off-by: Stas Sergeev <stsp@aknet.ru>
    Acked-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 927c258ac6c68868c6d36ce6cc17cda831ab8738
Merge: d3d3d3c... 8939700...
Author: Paul Mackerras <paulus@samba.org>
Date:   Tue May 20 19:46:37 2008 +1000

    Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge

commit 93dae5b70e7c1c8e927d22e1c20a941ca376906a
Author: David S. Miller <davem@davemloft.net>
Date:   Mon May 19 23:46:00 2008 -0700

    sparc64: Add global register dumping facility.
    
    When a cpu really is stuck in the kernel, it can be often
    impossible to figure out which cpu is stuck where.  The
    worst case is when the stuck cpu has interrupts disabled.
    
    Therefore, implement a global cpu state capture that uses
    SMP message interrupts which are not disabled by the
    normal IRQ enable/disable APIs of the kernel.
    
    As long as we can get a sysrq 'y' to the kernel, we can
    get a dump.  Even if the console interrupt cpu is wedged,
    we can trigger it from userspace using /proc/sysrq-trigger
    
    The output is made compact so that this facility is more
    useful on high cpu count systems, which is where this
    facility will likely find itself the most useful :)
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 88278ca27a43ae503572b52ea2c171fbf45db5a2
Author: Adrian Bunk <bunk@kernel.org>
Date:   Mon May 19 16:53:02 2008 -0700

    sparc: remove CVS keywords
    
    This patch removes the CVS keywords that weren't updated for a long time
    from comments.
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit b00dc8376465ee5f8dd49b95924e31b4c2404ab0
Author: Adrian Bunk <bunk@kernel.org>
Date:   Mon May 19 16:52:27 2008 -0700

    sparc64: remove CVS keywords
    
    This patch removes the CVS keywords that weren't updated for a long time
    from comments.
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 8939700edcd2bdb7a1af0defceb2532ee2565bc3
Author: Kumar Gala <galak@kernel.crashing.org>
Date:   Sun May 18 13:30:03 2008 -0500

    [POWERPC] Fix mpc8377_mds.dts DMA nodes to match spec
    
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

commit 4978757987e5535614a1307bf8ccc938e28765a9
Author: Kumar Gala <galak@kernel.crashing.org>
Date:   Sun May 18 13:25:28 2008 -0500

    [POWERPC] Update arch/powerpc/boot/.gitignore
    
    * Add dtbImage.*
    * Added zImage.holly
    * Folded zImage.coff.lds into zImage.*lds
    * Removed some unused zImage.<foo> ignores
    
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

commit b58a45752886bdd282b1e707e01d41454ab7e271
Author: Kumar Gala <galak@kernel.crashing.org>
Date:   Sun May 18 13:23:03 2008 -0500

    [POWERPC] Remove generated files on make clean
    
    dtbImage.* and several zImage. targets get created but never cleaned up.
    
    Also, moved zImage to the clean-files line associated with all other image
    results (was previously duplicated).
    
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

commit 6f704992d3658aadff9e506c7fd80957fce33c5f
Author: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date:   Mon May 19 16:56:11 2008 -0700

    ipv6 addrconf: Allow infinite prefix lifetime.
    
    We need to handle infinite prefix lifetime specially.
    With help from original reporter "Bonitch, Joseph"
    <Joseph.Bonitch@xerox.com>.
    
    Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 69cdf8f92a8dd191eee0e834c631d84a140b1121
Author: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date:   Mon May 19 16:55:13 2008 -0700

    ipv6 route: Fix lifetime in netlink.
    
    We could not see appropriate lifetime if the route had been scheduled
    to expired at 0 (in jiffies).  We should check rt6i_flags instead of
    rt6i_expires to determine whether lifetime is valid or not.
    
    Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit a3264435b4ca1ccee54cbef2970f2ba4bef39e2d
Author: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date:   Mon May 19 16:54:29 2008 -0700

    ipv6 addrconf: Fix route lifetime setting in corner case.
    
    Because of arithmetic overflow avoidance, the actual lifetime setting
    (vs the value given by RA) did not increase monotonically around
    0x7fffffff/HZ.
    
    Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 8033c6e9736c29cce5f0d0abbca9a44dffb20c39
Merge: 2d3cf58... e5c0ef9...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 19 16:40:30 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
      at91_mci: minor cleanup
      mmc: mmc host test driver
      mmc: Fix omap compile by replacing dev_name with dma_dev_name

commit 2d3cf588e9bf6df0a22581baece7edeacfbbc9f5
Author: Brice Goglin <brice@myri.com>
Date:   Sat May 17 12:45:36 2008 +0200

    Add maintainers for myri10ge driver
    
    Add a MAINTAINERS entry for the myri10ge driver.
    
    Signed-off-by: Brice Goglin <brice@myri.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 16ae527bfa03c6c82328098eafae972807ed32d4
Merge: e23a5f6... 6793a05...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 19 16:38:10 2008 -0700

    Merge branch 'audit.b51' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current
    
    * 'audit.b51' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
      [PATCH] list_for_each_rcu must die: audit
      [patch 1/1] audit_send_reply(): fix error-path memory leak
      [PATCH] open sessionid permissions

commit e23a5f66877d32f21a2ac15a200ad4a2b4c8b0ee
Merge: c9091f9... e9baf6e...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 19 16:37:45 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
      [PATCH] return to old errno choice in mkdir() et.al.
      [Patch] fs/binfmt_elf.c: fix wrong return values
      [PATCH] get rid of leak in compat_execve()
      [Patch] fs/binfmt_elf.c: fix a wrong free
      [PATCH] avoid multiplication overflows and signedness issues for max_fds
      [PATCH] dup_fd() part 4 - race fix
      [PATCH] dup_fd() - part 3
      [PATCH] dup_fd() part 2
      [PATCH] dup_fd() fixes, part 1
      [PATCH] take init_files to fs/file.c

commit c9091f9e571386992c8c5badcec84d49753b9df1
Merge: cc2020e... 13c501e...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 19 16:36:28 2008 -0700

    Merge branch 'for-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx
    
    * 'for-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx:
      [POWERPC] 4xx: Workaround for CHIP_11 Errata

commit cc2020e62dd607ef907bb44325ac95cbb5b76eb2
Author: Alan Cox <alan@redhat.com>
Date:   Mon May 19 14:21:51 2008 +0100

    MAINTAINERS needs further order fixing
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit d3d3d3cdb12dcc72e7bbff3d01073b7600349d3c
Author: Adrian Bunk <bunk@kernel.org>
Date:   Tue May 20 01:07:25 2008 +0300

    [POWERPC] powerpc/mm/hash_low_32.S: Remove CVS keyword
    
    This removes a CVS keyword that wasn't updated for a long time from a
    comment.
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 754cdd4aba225b74dcc35cc384aeb0c42b505e8b
Merge: db07b02... 460ed2e...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 19 16:33:29 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
      Blackfin SPORTS UART Driver: converting BFIN->BLACKFIN
      Blackfin serial driver: add extra IRQ flag for 8250 serial driver
      8250 Serial Driver: Added support for 8250-class UARTs in HV Sistemas H8606 board
      Blackfin arch: Fix bug - USB fails to build for BF524/BF526
      Blackfin arch: update boards defconfig files
      Blackfin arch: IO Port functions to read/write unalligned memory
      Blackfin arch: enable a choice to provide 4M DMA memory
      Blackfin arch: cleanup the icplb/dcplb multiple hit checks
      Blackfin arch: Add workaround to read edge triggered GPIOs
      Blackfin arch: Sync channel defines with struct dma_register dma_io_base_addr.
      Blackfin arch: Check for Anomaly 05000182
      [Blackfin] arch: rename bf5xx-flash to bfin-async-flash
      [Blackfin] arch: Blackfin checksum annotations

commit db07b02304d0d70bf8273abc93d94e4c8d2f9cec
Merge: 88e6c94... 336f1d3...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 19 16:33:08 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
      sh: Fix up restorer in debug_trap exception return path.
      sh: Make is_valid_bugaddr() more intelligent on nommu.
      sh: use the common ascii hex helpers
      sh: fix sh7785 master clock value
      sh: Fix up thread info pointer in syscall_badsys resume path.
      sh: Fix up optimized SH-4 memcpy on big endian.
      sh: disable initrd defaults in .empty_zero_page.
      sh: display boot params by default on entry.

commit 44dc19c829c057dc78a5ffacaf851ac4c301eb58
Merge: 0686caa... 229ce3a...
Author: David S. Miller <davem@davemloft.net>
Date:   Mon May 19 16:29:40 2008 -0700

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

commit 88e6c9499f959cdac9ef120a1a1e857da5944052
Merge: 8c4bab3... c85665f...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 19 16:29:29 2008 -0700

    Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (28 commits)
      drivers/ata: trim trailing whitespace
      Fixups to ATA ACPI hotplug
      libata: ignore SIMG4726 config pseudo device
      sata_sil24: don't use NCQ if marvell 4140 PMP is attached
      libata: don't schedule LPM action seperately during probing
      libata: make sure PMP notification is turned off during recovery
      libata: increase PMP register access timeout to 3s
      libata: ignore recovered PHY errors
      libata: kill hotplug related race condition
      libata: move reset freeze/thaw handling into ata_eh_reset()
      libata: reorganize ata_eh_reset() no reset method path
      libata: fix sata_link_hardreset() @online out parameter handling
      sata_promise: other cleanups
      sata_promise: mmio access cleanups
      sata_promise: fix irq clearing buglets
      ata: remove FIT() macro
      sata_mv: ensure empty request queue for FBS-NCQ EH
      sata_mv: cache main_irq_mask register in hpriv
      sata_mv: disregard masked irqs
      sata_mv: fix pmp drives not found
      ...

commit 0686caa35ed17cf5b9043f453957e702a7eb588d
Author: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date:   Mon May 19 16:25:42 2008 -0700

    ndisc: Add missing strategies for per-device retrans timer/reachable time settings.
    
    Noticed from Al Viro <viro@ftp.linux.org.uk> via David Miller
    <davem@davemloft.net>.
    
    Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit b815454221665b9253f68606bc27f8189ac9dce4
Author: Arnd Bergmann <arnd@arndb.de>
Date:   Fri May 16 11:10:59 2008 +0200

    [POWERPC] Update Cell MAINTAINERS entry, add spufs entry
    
    The MAINTAINERS file entry for the cell platform is outdated,
    even the name of the platform changed since the early days
    when it was initially submitted.
    The SPU file system is now maintained by Jeremy Kerr.
    
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit c1f69db782595a9869395dad4b60d331906c22ef
Author: Jesse Barnes <jbarnes@hobbes.lan>
Date:   Mon May 19 15:28:16 2008 -0700

    PCI: correct mailing list address
    
    Forgot to update the PCI error handling address with the new @vger one.
    
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit 89562b777c50d100d1694db7b1b023279839b9ae
Author: Steve French <sfrench@us.ibm.com>
Date:   Mon May 19 22:26:42 2008 +0000

    [CIFS] add missing seq_printf to cifs_show_options for hard mount option
    
    Also Kari Hurtta noticed a missing check in the same function which is now fixed.
    
    CC: Kari Hurtta <hurtta+gmane@siilo.fmi.fi>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit c85665ffa8e351a5b38f8e4ceaec527d8783c970
Author: Jeff Garzik <jeff@garzik.org>
Date:   Mon May 19 17:56:10 2008 -0400

    drivers/ata: trim trailing whitespace
    
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit ae6c23c4e1ec9720b99e1e6850fe47c6c7fddbb3
Author: Matthew Garrett <mjg59@srcf.ucam.org>
Date:   Mon May 19 17:29:34 2008 +0100

    Fixups to ATA ACPI hotplug
    
    The libata-acpi.c code currently accepts hotplug messages from both the
    port and the device. This does not match the behaviour of the bay
    driver, and may result in confusion when two hotplug requests are
    received for the same device. This patch limits the hotplug notification
    to removable ACPI devices, which in turn allows it to use the _STA
    method to determine whether the device has been removed or inserted.
    On removal, devices are marked as detached. On insertion, a hotplug scan
    is started. This should avoid lockups caused by the ata layer attempting
    to scan devices which have been removed. The uevent sending is moved
    outside the spinlock in order to avoid a warning generated by it firing
    when interrupts are disabled.
    
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 50af2fa1e18d0ab411d06bf727ecadb7e01721e9
Author: Tejun Heo <htejun@gmail.com>
Date:   Mon May 19 01:15:14 2008 +0900

    libata: ignore SIMG4726 config pseudo device
    
    I was hoping ATA_HORKAGE_NODMA | ATA_HORKAGE_SKIP_PM could keep it
    happy but no even this doesn't work under certain configurations and
    it's not like we can do anything useful with the cofig device anyway.
    Replace ATA_HORKAGE_SKIP_PM with ATA_HORKAGE_DISABLE and use it for
    the config device.  This makes the device completely ignored by
    libata.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 906c1ff44a81aaad96a9feb40ea13d73bbf3662a
Author: Tejun Heo <htejun@gmail.com>
Date:   Mon May 19 01:15:13 2008 +0900

    sata_sil24: don't use NCQ if marvell 4140 PMP is attached
    
    When 4140 PMP is attached to sil24, NCQ commands to fan out port 1 and
    2 (0 based) often stall if commands are in progress to other ports.
    I've tried a number of things but can't tell what's going on.  It
    never happens w/ ahci and reportedly sata_mv which can issue NCQ
    commands to multiple devices simultaneously like sil24 does.
    
    Disable NCQ for devices behind 4140 PMP for the time being.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Cc: Mark Lord <liml@rtr.ca>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 391191c116c088edc6794a6e5ace10a13928c2f6
Author: Tejun Heo <htejun@gmail.com>
Date:   Mon May 19 01:15:12 2008 +0900

    libata: don't schedule LPM action seperately during probing
    
    There's no reason to schedule LPM action after probing is complete
    causing another EH iteration.  Just schedule it together with probing
    itself.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit f1bbfb90e81dd84d59de6370689ee6fe6a71fee0
Author: Tejun Heo <htejun@gmail.com>
Date:   Mon May 19 01:15:11 2008 +0900

    libata: make sure PMP notification is turned off during recovery
    
    PMP notification during reset can make some controllers fail reset
    processing and needs to be turned off during resets.  PMP attach and
    full-revalidation path did this via sata_pmp_configure() but the quick
    revalidation wasn't.  Move the notification disable code right above
    fan-out port recovery so that it's always turned off.
    
    This fixes obscure reset failures.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit bf1bff6fa9fdd4e92e57d80a5434fd5201c051fc
Author: Tejun Heo <htejun@gmail.com>
Date:   Mon May 19 01:15:10 2008 +0900

    libata: increase PMP register access timeout to 3s
    
    This timeout was set low because previously PMP register access was
    done via polling and register access timeouts could stack up.  This is
    no longer the case.  One timeout will make all following accesses fail
    immediately.
    
    In rare cases both marvell and SIMG PMPs need almost a second.  Bump
    it to 3s.
    
    While at it, rename it to SATA_PMP_RW_TIMEOUT.  It's not specific to
    SCR access.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit e0614db2a398d4d0dc5fb47fe2c2783141262a3e
Author: Tejun Heo <htejun@gmail.com>
Date:   Mon May 19 01:15:09 2008 +0900

    libata: ignore recovered PHY errors
    
    No reason to get overzealous about recovered comm and data errors.
    Some PHYs habitually sets them w/o no good reason and being draconian
    about these soft error conditions doesn't seem to help anybody.
    
    If need ever rises, we might need to add soft PHY error condition, say
    AC_ERR_MAYBE_ATA_BUS and use it only to determine whether speed down
    is necessary but I don't think that's very likely to happen.  It's far
    more likely we'll get timeouts or fatal transmission errors if
    recovered errors are so prominent that they hamper operation.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit f046519fc85a8fdf6a058b4ac9d897cdee6f3e52
Author: Tejun Heo <htejun@gmail.com>
Date:   Mon May 19 01:15:08 2008 +0900

    libata: kill hotplug related race condition
    
    Originally, whole reset processing was done while the port is frozen
    and SError was cleared during @postreset().  This had two race
    conditions.  1: hotplug could occur after reset but before SError is
    cleared and libata won't know about it.  2: hotplug could occur after
    all the reset is complete but before the port is thawed.  As all
    events are cleared on thaw, the hotplug event would be lost.
    
    Commit ac371987a81c61c2efbd6931245cdcaf43baad89 kills the first race
    by clearing SError during link resume but before link onlineness test.
    However, this doesn't fix race #2 and in some cases clearing SError
    after SRST is a good idea.
    
    This patch solves this problem by cross checking link onlineness with
    classification result after SError is cleared and port is thawed.
    Reset is retried if link is online but all devices attached to the
    link are unknown.  As all devices will be revalidated, this one-way
    check is enough to ensure that all devices are detected and
    revalidated reliably.
    
    This, luckily, also fixes the cases where host controller returns
    bogus status while harddrive is spinning up after hotplug making
    classification run before the device sends the first FIS and thus
    causes misdetection.
    
    Low level drivers can bypass the logic by setting class explicitly to
    ATA_DEV_NONE if ever necessary (currently none requires this).
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit dc98c32cbe80750ae2d9d9fbdae305d38f005de7
Author: Tejun Heo <htejun@gmail.com>
Date:   Mon May 19 01:15:07 2008 +0900

    libata: move reset freeze/thaw handling into ata_eh_reset()
    
    Previously reset freeze/thaw handling lived outside of ata_eh_reset()
    mainly because the original PMP reset code needed the port frozen
    while resetting all the fan-out ports, which is no longer the case.
    
    This patch moves freeze/thaw handling into ata_eh_reset().
    @prereset() and @postreset() are now called w/o freezing the port
    although @prereset() an be called frozen if the port is frozen prior
    to entering ata_eh_reset().
    
    This makes code simpler and will help removing hotplug event related
    races.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 932648b007de76badc61c1b13d7282288dbe887e
Author: Tejun Heo <htejun@gmail.com>
Date:   Mon May 19 01:15:06 2008 +0900

    libata: reorganize ata_eh_reset() no reset method path
    
    Reorganize ata_eh_reset() such that @prereset() is called even when no
    reset method is available and if block is used instead of goto to skip
    actual reset.  This makes no reset case behave better (readiness wait)
    and future changes easier.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 0cbf0711a1ebcc4d3aea8e11def684afc2c07ef8
Author: Tejun Heo <htejun@gmail.com>
Date:   Mon May 19 01:15:05 2008 +0900

    libata: fix sata_link_hardreset() @online out parameter handling
    
    The @online out parameter is supposed to set to true iff link is
    online and reset succeeded as advertised in the function description
    and callers are coded expecting that.  However, sata_link_reset()
    didn't behave this way on device readiness test failure.  Fix it.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 7715a6f9cdb9c1422d2b1f4fea21b1fe86b5b0fe
Author: Mikael Pettersson <mikpe@it.uu.se>
Date:   Sat May 17 18:49:09 2008 +0200

    sata_promise: other cleanups
    
    Minor coding-style fixes for sata_promise:
    - remove stray blank lines
    - fix checkpatch.pl errors; warnings about long lines
      remain, but I don't intend to address those at this time
    - remove two inline directives: neither is essential and
      both functions are trivially inlinable anyway by virtue
      of being static and having a single unique call site
    - fix comment in pdc_interrupt(): the bits in PDC_INT_SEQMASK
      denote SEQIDs not tags, the distinction becomes important
      when NCQ gets implemented
    
    Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 821d22cdcd3c2944b93ac5f217ec0b6593ae6f48
Author: Mikael Pettersson <mikpe@it.uu.se>
Date:   Sat May 17 18:48:15 2008 +0200

    sata_promise: mmio access cleanups
    
    This patch cleans up sata_promise's mmio accesses.
    
    In sata_promise there are three distinct mmio address spaces:
    1. global registers, offsets from host->iomap[PDC_MMIO_BAR]
    2. per-port ATA registers, offsets from ap->ioaddr.cmd_addr
    3. per-port SATA registers, offsets from ap->ioaddr.scr_addr
    
    The driver currently often fails to indicate which address space
    a given mmio base pointer refers to, which is a source of bugs
    and confusion (see recent pdc_thaw() irq clearing bug; it's also
    been an obstacle for the pending NCQ extensions).
    
    To reduce these problems, adopt a coding style where the name of
    a base pointer always indicates which address space it refers to:
    1. global registers: host_mmio
    2. per-port ATA registers: ata_mmio
    3. per-port SATA registers: sata_mmio
    
    Also rearrange register offset definitions to clearly indicate
    which address space they belong to, and add a symbolic definition
    for the previously hard-coded PHYMODE4 register.
    
    Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit a13db78e2209ebfe1898207f53c353ed836d4a53
Author: Mikael Pettersson <mikpe@it.uu.se>
Date:   Sat May 17 18:47:35 2008 +0200

    sata_promise: fix irq clearing buglets
    
    This patch fixes two bugs in sata_promise's irq status clearing paths:
    1. When clearing the irq status for a specific port, the driver
       read the global SEQMASK register. This is wrong because that
       clears the irq status for _all_ ports.
    2. pdc_thaw() incorrectly added the PDC_INT_SEQMASK host register
       offset to a per-port ata engine base address. This resulted in
       it reading the unrelated PDC_PKT_SUBMIT register, which did not
       have the desired irq status clearing effect.
    
    In both cases the fix is to read from the port's Command/Status
    register. This also matches what Promise's own driver does.
    
    Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 07633b5d0723ce2ec31262e1096dcf61311bf078
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Wed May 14 16:17:00 2008 -0700

    ata: remove FIT() macro
    
    Use the kernel-provided clamp_val() macro.
    
    FIT was always applied to a member of struct ata_timing (unsigned short)
    and two constants.  clamp_val will not cast to short anymore.
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Cc: Jeff Garzik <jeff@garzik.org>
    Cc: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 06aaca3f6301d04463b1ee0eb75c0352147159f2
Author: Mark Lord <liml@rtr.ca>
Date:   Mon May 19 09:01:24 2008 -0400

    sata_mv: ensure empty request queue for FBS-NCQ EH
    
    Check for an empty request queue before stopping EDMA after a FBS-NCQ error,
    as per recommendation from the Marvell datasheet.
    
    This ensures that the EDMA won't suddenly become active again
    just after our subsequent check of the empty/idle bits.
    
    Also bump DRV_VERSION.
    
    Signed-off-by: Mark Lord <mlord@pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 96e2c487933e5f69e98fffdcae2c35c78a671c07
Author: Mark Lord <liml@rtr.ca>
Date:   Sat May 17 13:38:00 2008 -0400

    sata_mv: cache main_irq_mask register in hpriv
    
    Part five of simplifying/fixing handling of the main_irq_mask register
    to resolve unexpected interrupt issues observed in 2.6.26-rc*.
    
    Keep a cached copy of the main_irq_mask so that we don't have
    to stall the CPU to read it on every pass through mv_interrupt.
    
    This significantly speeds up interrupt handling, both for sata_mv,
    and for any other driver/device sharing the same PCI IRQ line.
    
    Signed-off-by: Mark Lord <mlord@pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit a44253d24a97ec3efe601267274a5fb64d8696c1
Author: Mark Lord <liml@rtr.ca>
Date:   Sat May 17 13:37:07 2008 -0400

    sata_mv: disregard masked irqs
    
    Part four of simplifying/fixing handling of the main_irq_mask register
    to resolve unexpected interrupt issues observed in 2.6.26-rc*.
    
    Ignore masked IRQs in mv_interrupt().
    This prevents "unexpected device interrupt while idle" messages.
    
    Signed-off-by: Mark Lord <mlord@pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 88e675e193159b9891c1c576de4348eaf490f5d0
Author: Mark Lord <liml@rtr.ca>
Date:   Sat May 17 13:36:30 2008 -0400

    sata_mv: fix pmp drives not found
    
    Part three of simplifying/fixing handling of the main_irq_mask register
    to resolve unexpected interrupt issues observed in 2.6.26-rc*.
    
    Partially fix a reported bug whereby we sometimes miss seeing drives on
    a port-multiplier, as reported by Gwendal Grignou <gwendal@google.com>.
    
    The problem was that we were receiving unexpected interrupts
    during EH from POLLed commands while accessing port-multiplier registers.
    These unexpected interrupts can be prevented by masking the DONE_IRQ bit
    for the port whenever not operating in EDMA mode.
    
    Also fix port_stop() to mask all port interrupts.
    
    Signed-off-by: Mark Lord <mlord@pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit c4de573b14d78ac83861d81d12977457d1e9cb6d
Author: Mark Lord <liml@rtr.ca>
Date:   Sat May 17 13:35:21 2008 -0400

    sata_mv: consolidate main_irq_mask updates
    
    Part two of simplifying/fixing handling of the main_irq_mask register
    to resolve unexpected interrupt issues observed in 2.6.26-rc*.
    
    Consolidate all updates of the host main_irq_mask register
    into a single function.  This simplifies maintenance,
    and also prepares the way for caching it (later).
    
    No functionality changes in this update.
    
    Signed-off-by: Mark Lord <mlord@pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 51de32d200b21333950abc52ea1e589bc4eecef7
Author: Mark Lord <liml@rtr.ca>
Date:   Sat May 17 13:34:42 2008 -0400

    sata_mv: don't blindly enable IRQs
    
    Part one of simplifying/fixing handling of the main_irq_mask register
    to resolve unexpected interrupt issues observed in 2.6.26-rc*.
    
    Don't blindly enable port IRQs at host init time.
    Instead, enable only the bits that we want,
    which in this case is simply the PCI_ERR bit.
    
    The per-port bits can wait until the ports are reset/probed for devices.
    
    Signed-off-by: Mark Lord <mlord@pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit c443c5002b24ff5d2f4efcc25a861f0cb835130a
Author: Mark Lord <liml@rtr.ca>
Date:   Wed May 14 09:24:39 2008 -0400

    sata_mv: async notify for genIIe only
    
    Now that we handle the FIS_IRQ_CAUSE register correctly,
    we can also now handle SATA asynchronous notification events.
    
    So enable them, but only for the more modern GenIIe chips.
    (older chips have unaddressed errata issues related to this).
    
    This fixes hot plug/unplug for port-muliplier ports.
    
    Signed-off-by: Mark Lord <mlord@pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit ad3aef51e17b9c6a90a9014805f1645e8e441c17
Author: Mark Lord <liml@rtr.ca>
Date:   Wed May 14 09:21:43 2008 -0400

    sata_mv: group genIIe flags
    
    Group all of the flags for GenIIe devices into a common definition,
    to ensure that any updates to them are shared by all GenIIe devices.
    
    This will help make future maintenance somewhat simpler.
    
    Signed-off-by: Mark Lord <mlord@pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit e40060772d85f3534d3d517197696e24bb01f45b
Author: Mark Lord <liml@rtr.ca>
Date:   Wed May 14 09:19:30 2008 -0400

    sata_mv: fis irq register fixes
    
    Fix handling of the FIS_IRQ_CAUSE register in sata_mv.
    
    This register exists *only* on GenIIe devices, so don't bother
    writing to it on older chips.  Also, it has to be read/cleared
    in mv_err_intr() before clearing the main ERR_IRQ_CAUSE register.
    
    This keeps sata_mv from getting stuck forever on certain error types.
    
    Signed-off-by: Mark Lord <mlord@pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 9dcffd99d0b1c0c1b8b2c0f85d240e791eca1055
Author: Mark Lord <liml@rtr.ca>
Date:   Wed May 14 09:18:12 2008 -0400

    sata_mv: always do softreset
    
    Always request a softreset after hardreset succeeds.
    
    This fixes a regression reported by Martin Michlmayr <tbm@cyrius.com>.
    
    Signed-off-by: Mark Lord <mlord@pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 68b90ee7c8046864301823d8d4449eb1ce1d2f74
Author: Christophe Jaillet <christophe.jaillet@wanadoo.fr>
Date:   Tue May 13 21:17:30 2008 +0200

    avr32/pata: avoid unnecessary memset (updated after comments)
    
    Remove an explicit memset(.., 0, ...) to a variable allocated with
    kzalloc (i.e. 'info').
    
    Signed-off-by: Christophe Jaillet <christophe.jaillet@wanadoo.fr>
    Acked-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit b6e7b447975b0364c3430284c7b16e2e89ccf9e9
Author: Sonic Zhang <sonic.zhang@analog.com>
Date:   Mon May 12 12:12:16 2008 +0800

    pata-bf54x: Set ATAPI HSM to control IDE device terminate sequence.
    
    Set ATAPI host state machine to control IDE device terminate sequence.
    Some IDE harddisk may assert terminate sequence in the middle of a
    formal DMA transaction and resume later. Bit DETECT_TERM in ATAPI_CTRL
    register determines whether the ATAPI host state machine or the kernel
    driver should take care of this case.
    
    Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit e6da97e7df385a1674cf9f72c31b7a0e46e2620d
Author: Robert P. J. Day <rpjday@crashcourse.ca>
Date:   Mon May 19 14:13:11 2008 -0700

    ipv6: Move <linux/in6.h> from header-y to unifdef-y.
    
    Given that <linux/in6.h> contains a __KERNEL__ test, it should be
    unifdef-ed.
    
    Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 090c48d3dd5ea90b37350334aaed9a93b0c1e0a1
Author: James Chapman <jchapman@katalix.com>
Date:   Mon May 19 14:10:01 2008 -0700

    l2tp: avoid skb truesize bug if headroom is increased
    
    A user reported seeing occasional bugs such as the following when
    using the L2TP driver.
    
      SKB BUG: Invalid truesize (272) len=72, sizeof(sk_buff)=208
    
    When L2TP adds its header in the transmit path, it might need to
    increase the headroom of the skb. In some cases, the increased
    headroom trips a kernel bug when the skb is freed because the skb has
    grown beyond its truesize value. The fix is to increase the truesize
    by the amount of headroom added, after orphaning the skb.
    
    While here, fix a misleading comment.
    
    Thanks to Iouri Kharon <bc-info@styx.cabel.net> for the initial
    report and testing the fix.
    
    Signed-off-by: James Chapman <jchapman@katalix.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 8c4bab3a1aadaf4e38b2bfaf557eab74322a9fd4
Merge: 88d5376... c3cc3bd...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 19 14:04:47 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
      dlm: <linux/dlm_plock.h> should be "unifdef"ed.
      dlm: fix plock dev_write return value
      dlm: tcp_connect_to_sock should check for -EINVAL, not EINVAL
      dlm: section mismatch warning fix
      dlm: convert connections_lock in a mutex

commit 88d53766bd0f3bc6e46a0dff25be147a2b98c511
Merge: 860da5e... 54aaace...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 19 13:53:21 2008 -0700

    Merge branch 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm
    
    * 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
      KVM: LAPIC: ignore pending timers if LVTT is disabled
      KVM: Update MAINTAINERS for new mailing lists
      KVM: Fix kvm_vcpu_block() task state race
      KVM: ia64: Set KVM_IOAPIC_NUM_PINS to 48
      KVM: ia64: fix GVMM module including position-dependent objects
      KVM: ia64: Define new kvm_fpreg struture to replace ia64_fpreg
      KVM: PIT: take inject_pending into account when emulating hlt
      s390: KVM guest: fix compile error
      KVM: x86 emulator: fix writes to registers with modrm encodings

commit c3cc3bd0d36d1b16d4cb17e8fc64fff613f0b902
Author: Robert P. J. Day <rpjday@crashcourse.ca>
Date:   Sat May 17 16:58:28 2008 -0400

    dlm: <linux/dlm_plock.h> should be "unifdef"ed.
    
    Given that <linux/dlm_plock.h> contains a conditional __KERNEL__ test,
    it should be moved from header-y to unifdef-y.
    
    Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
    Signed-off-by: David Teigland <teigland@redhat.com>

commit 817d10bad56f2fdfa321b4a864a21295226b123a
Author: David Teigland <teigland@redhat.com>
Date:   Tue May 13 14:28:26 2008 -0500

    dlm: fix plock dev_write return value
    
    The return value on writes to the plock device should be
    the number of bytes written.  It was returning 0 instead
    when an nfs lock callback was involved.
    
    Reported-by: Nathan Straz <nstraz@redhat.com>
    Signed-off-by: David Teigland <teigland@redhat.com>

commit 0035a4b14931eb62a5f8a7762284c18e7ab14289
Author: Marcin Slusarz <marcin.slusarz@gmail.com>
Date:   Sun May 11 22:01:29 2008 +0200

    dlm: tcp_connect_to_sock should check for -EINVAL, not EINVAL
    
    Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
    Cc: Christine Caulfield <ccaulfie@redhat.com>
    Cc: David Teigland <teigland@redhat.com>
    Cc: cluster-devel@redhat.com
    Signed-off-by: David Teigland <teigland@redhat.com>

commit 88ad23195e4609cef73b6fcf2b4c08aaaef33204
Author: Leonardo Potenza <lpotenza@inwind.it>
Date:   Sun May 11 19:15:34 2008 +0200

    dlm: section mismatch warning fix
    
    Removed the section mismatch message:
    WARNING: fs/dlm/dlm.o(.init.text+0x132): Section mismatch in reference from the function init_module() to the function .exit.text:dlm_netlink_exit()
    
    Since dlm_netlink_exit() is called in the init_dlm() error handling,
    the __exit annotation has been removed.
    
    Signed-off-by: Leonardo Potenza <lpotenza@inwind.it>
    Signed-off-by: David Teigland <teigland@redhat.com>

commit 7a936ce71eed7b887b8a0d6c54dd8a9072f71c9f
Author: Matthias Kaehlcke <matthias@kaehlcke.net>
Date:   Mon May 12 10:04:51 2008 -0500

    dlm: convert connections_lock in a mutex
    
    The semaphore connections_lock is used as a mutex.  Convert it to the mutex
    API.
    
    Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net>
    Cc: Christine Caulfield <ccaulfie@redhat.com>
    Cc: David Teigland <teigland@redhat.com>
    Cc: Steven Whitehouse <swhiteho@redhat.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: David Teigland <teigland@redhat.com>

commit 860da5e578c25d1ab4528c0d1ad13f9969e3490f
Merge: 1bf9947... e948e99...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 19 13:30:40 2008 -0700

    Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
    
    * 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/i915: save and restore dsparb and d_state registers.
      drm/i915: fix off by one in VGA save/restore of AR & CR regs.
      drm: disable tasklets not IRQs when taking the drm lock spinlock
      Revert "drm/vbl rework: rework how the drm deals with vblank."

commit 8d64c781f0c5fbfdf8016bd1634506ff2ad1376a
Author: Tony Camuso <tcamuso@redhat.com>
Date:   Thu May 15 14:40:14 2008 -0400

    PCI: Correct last two HP entries in the bfsort whitelist
    
    Replace Redundant Whitelist Entries with the Correct Ones
    
    The ProLiant DL585 G2 and the DL585 G2 are entered reundantly in the
    dmi_system_id table. What should have been there are the DL360 and DL380. This
    patch simply replaces the redundant entries with the correct entries.
    
    Signed-off-by: Tony Camuso <tony.camuso@hp.com>
    Signed-off-by: Pat Schoeller <patrick.schoeller@hp.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit 1bf99477226963d84b182b3995e355d3091199be
Merge: 83e0c24... 7d3cc8b...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 19 11:32:21 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
      Don't clean bounds.h and asm-offsets.h
      kconfig: incorrect 'len' field initialisation ?
      kernel-doc: allow unnamed bit-fields
      kbuild: filter away debug symbols from kernel symbols
      Remove *.rej pattern from .gitignore
      MAINTAINERS: document names of new kbuild trees
      kbuild: disable modpost warnings for linkonce sections
      kbuild: escape meta characters in regular expression in make TAGS

commit 7d3cc8b6d899e53222c22a78d98bb53a695f7962
Author: Jan Blunck <jblunck@suse.de>
Date:   Fri May 16 13:54:59 2008 +0200

    Don't clean bounds.h and asm-offsets.h
    
    Since 97965478a66fbdf0f4ad5e4ecc4828f0cb548a45 ("mm: Get rid of __ZONE_COUNT")
    mmzone.h includes bounds.h.
    Calling make clean after make prepare removes bounds.h
    again so when building external modules this fails.
    
    Signed-off-by: Jan Blunck <jblunck@suse.de>
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
    --

commit 107f43a0f7282511ec570214a0b8f639224ff525
Author: Christophe Jaillet <christophe.jaillet@wanadoo.fr>
Date:   Sun May 18 23:10:24 2008 +0200

    kconfig: incorrect 'len' field initialisation ?
    
    1) The field 'len' of the 'gstr' structure seems to track the size of the memory
    already allocated for the "growable string". So the value of this field should be
    the same as the 'malloc()' just above, shouldn't it ?
    
    Signed-off-by: Christophe Jaillet <christophe.jaillet@wanadoo.fr>
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

commit 7b97887eab6c35d23f2e4680bd5e285415068f35
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date:   Fri May 16 15:45:52 2008 -0700

    kernel-doc: allow unnamed bit-fields
    
    Allow for unnamed bit-fields and skip them instead of printing an
    erroneous warning message for them, such as:
    
    Warning(include/asm-s390/cio.h:103): No description found for parameter 'u32'
    
    which contains:
    
    struct tm_scsw {
    	u32 :1;
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

commit aab34ac8582303ef57b792710fc5dd5991477475
Author: Sam Ravnborg <sam@ravnborg.org>
Date:   Mon May 19 20:07:58 2008 +0200

    kbuild: filter away debug symbols from kernel symbols
    
    Andi Kleen <andi@firstfloor.org>
    reported that he saw a lot of symbols like this:
    
    0000000000000b24 N DW.aio.h.903a6d92.2
    0000000000000bce N DW.task_io_accounting.h.8d8de327.0
    0000000000000bec N DW.hrtimer.h.c23659c6.0
    
    in his System.map / kallsyms output.
    
    Simple solution is to skip all debugging
    symbols (they are marked 'N').
    
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
    Cc: Paulo Marques <pmarques@grupopie.com>

commit 83e0c24a38aa91f7d932bbcab257093b82435074
Merge: 161fb0c... 42ece6c...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 19 09:24:49 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:
      snd-pcsp: silent misleading warning
      snd-pcsp: depend on CONFIG_EXPERIMENTAL
      snd-pcsp: put back the compatibility code for the older alsa-libs
      snd-pcsp: adjust help texts to frighten users

commit 13c501e69c3fba3ca0651abcc4aa7c9091fda70a
Author: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Date:   Fri May 16 00:43:46 2008 +1000

    [POWERPC] 4xx: Workaround for CHIP_11 Errata
    
    The PowerPC 440EP, 440GR, 440EPx, and 440GRx chips have an issue that
    causes the PLB3-to-PLB4 bridge to wait indefinitely for transaction
    requests that cross the end-of-memory-range boundary.  Since the DDR
    controller only returns the valid portion of a read request, the bridge
    will prevent other PLB masters from completing their transactions.
    
    This implements the recommended workaround for this errata for chips that
    use older versions of firmware that do not already handle it.  The last
    4KiB of memory are hidden from the kernel to prevent the problem
    transactions from occurring.
    
    Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
    Acked-by: Stefan Roese <sr@denx.de>
    Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>

commit a6f911c04e20b98feb4b33d3aba2976851977d6a
Author: Tom Tucker <tom@opengridcomputing.com>
Date:   Tue May 13 09:16:05 2008 -0500

    svcrdma: Verify read-list fits within RPCSVC_MAXPAGES
    
    A RDMA read-list cannot contain more elements than RPCSVC_MAXPAGES or
    it will overflow the DTO context. Verify this when processing the
    protocol header.
    
    Signed-off-by: Tom Tucker <tom@opengridcomputing.com>

commit 008fdbc57164b0ac237ad6ee2766944f02ac9c28
Author: Tom Tucker <tom@opengridcomputing.com>
Date:   Wed May 7 15:47:42 2008 -0500

    svcrdma: Change svc_rdma_send_error return type to void
    
    The svc_rdma_send_error function is called when an RPCRDMA protocol
    error is detected. This function attempts to post an error reply message.
    Since an error posting to a transport in error is ignored, change
    the return type to void.
    
    Signed-off-by: Tom Tucker <tom@opengridcomputing.com>

commit af261af4db14230fb35bcdc0ba9ef78ed6cf7bc1
Author: Tom Tucker <tom@opengridcomputing.com>
Date:   Wed May 7 13:52:42 2008 -0500

    svcrdma: Copy transport address and arm CQ before calling rdma_accept
    
    This race was found by inspection. Messages can be received from the peer
    immediately following the rdma_accept call, however, the CQ have not yet
    been armed and the transport address has not yet been set.
    
    Set the transport address in the connect request handler and arm the CQ
    prior to calling rdma_accept.
    
    Signed-off-by: Tom Tucker <tom@opengridcomputing.com>

commit 69500c43b45f7155b72dcadad31cd55cda789c93
Author: Tom Tucker <tom@opengridcomputing.com>
Date:   Wed May 7 13:49:58 2008 -0500

    svcrdma: Set rqstp transport address in rdma_read_complete function
    
    The rdma_read_complete function needs to copy the rqstp transport address
    from the transport. Failure to do so can result in using the wrong
    authentication method for the RPC or bug checking if the rqstp address
    is not valid.
    
    Signed-off-by: Tom Tucker <tom@opengridcomputing.com>

commit 97a3df382e01c49555ea844bd7c4e5a08f245b9d
Author: Tom Tucker <tom@opengridcomputing.com>
Date:   Thu May 1 14:02:45 2008 -0500

    svcrdma: Use ib verbs version of dma_unmap
    
    Use the ib_verbs version of the dma_unmap service in the
    svc_rdma_put_context function. This should support providers
    using software rdma.
    
    Signed-off-by: Tom Tucker <tom@opengridcomputing.com>

commit 356d0a1519867422c3f17f79e2183f8c2d44f8ee
Author: Tom Tucker <tom@opengridcomputing.com>
Date:   Thu May 1 11:25:02 2008 -0500

    svcrdma: Cleanup queued, but unprocessed I/O in svc_rdma_free
    
    When the transport is closing, the DTO tasklet may queue data
    that never gets processed. Clean up resources associated with
    this I/O.
    
    Signed-off-by: Tom Tucker <tom@opengridcomputing.com>

commit 1711386c62c97f7fb086a2247d44cdb1f8867640
Author: Tom Tucker <tom@opengridcomputing.com>
Date:   Thu May 1 11:13:50 2008 -0500

    svcrdma: Move the QP and cm_id destruction to svc_rdma_free
    
    Move the destruction of the QP and CM_ID to the free path so that the
    QP cleanup code doesn't race with the dto_tasklet handling flushed WR.
    The QP reference is not needed because we now have a reference for
    every WR.
    
    Also add a guard in the SQ and RQ completion handlers to ignore
    calls generated by some providers when the QP is destroyed.
    
    Signed-off-by: Tom Tucker <tom@opengridcomputing.com>

commit 0905c0f0a2346516ecd12f0a4f33dca571b0dccd
Author: Tom Tucker <tom@opengridcomputing.com>
Date:   Thu May 1 10:49:03 2008 -0500

    svcrdma: Add reference for each SQ/RQ WR
    
    Add a reference on the transport for every outstanding WR.
    
    Signed-off-by: Tom Tucker <tom@opengridcomputing.com>

commit 8da91ea8de873ee8be82377ff18637d05e882058
Author: Tom Tucker <tom@opengridcomputing.com>
Date:   Wed Apr 30 22:00:46 2008 -0500

    svcrdma: Move destroy to kernel thread
    
    Some providers may wait while destroying adapter resources.
    Since it is possible that the last reference is put on the
    dto_tasklet, the actual destroy must be scheduled as a work item.
    
    Signed-off-by: Tom Tucker <tom@opengridcomputing.com>

commit 47698e083e40bbd3ef87f5561390ae33abb13cd0
Author: Tom Tucker <tom@opengridcomputing.com>
Date:   Tue May 6 11:49:05 2008 -0500

    svcrdma: Shrink scope of spinlock on RQ CQ
    
    The rq_cq_reap function is only called from the dto_tasklet. The
    only resource shared with other threads is the sc_rq_dto_q. Move the
    spin lock to protect only this list.
    
    Signed-off-by: Tom Tucker <tom@opengridcomputing.com>

commit 8740767376b32a7772607e1b2b07cde0c24120cc
Author: Tom Tucker <tom@opengridcomputing.com>
Date:   Wed Apr 30 20:44:39 2008 -0500

    svcrdma: Use standard Linux lists for context cache
    
    Replace the one-off linked list implementation used to implement the
    context cache with the standard Linux list_head lists. Add a context
    counter to catch resource leaks. A WARN_ON will be added later to
    ensure that we've freed all contexts.
    
    Signed-off-by: Tom Tucker <tom@opengridcomputing.com>

commit 02e7452de74d308ca642f54f7e5ef801ced60a92
Author: Tom Tucker <tom@opengridcomputing.com>
Date:   Wed Apr 30 19:50:56 2008 -0500

    svcrdma: Simplify RDMA_READ deferral buffer management
    
    An NFS_WRITE requires a set of RDMA_READ requests to fetch the write
    data from the client. There are two principal pieces of data that
    need to be tracked: the list of pages that comprise the completed RPC
    and the SGE of dma mapped pages to refer to this list of pages. Previously
    this whole bit was managed as a linked list of contexts with the
    context containing the page list buried in this list. This patch
    simplifies this processing by not keeping a linked list, but rather only
    a pionter from the last submitted RDMA_READ's context to the context
    that maps the set of pages that describe the RPC.  This significantly
    simplifies this code path. SGE contexts are cleaned up inline in the DTO
    path instead of at read completion time.
    
    Signed-off-by: Tom Tucker <tom@opengridcomputing.com>

commit 10a38c33f46d128d11e299acba744bc325cde420
Author: Tom Tucker <tom@opengridcomputing.com>
Date:   Wed Apr 30 17:32:17 2008 -0500

    svcrdma: Remove unused READ_DONE context flags bit
    
    The RDMACTXT_F_READ_DONE bit is not longer used. Remove it.
    
    Signed-off-by: Tom Tucker <tom@opengridcomputing.com>

commit d16d40093a95f2b31007d7a7abefc50e6b27e236
Author: Tom Tucker <tom@opengridcomputing.com>
Date:   Tue May 6 10:04:50 2008 -0500

    svcrdma: Return error from rdma_read_xdr so caller knows to free context
    
    The rdma_read_xdr function did not discriminate between no read-list and
    an error posting the read-list. This results in a leak of a page if there
    is an error posting the read-list.
    
    Signed-off-by: Tom Tucker <tom@opengridcomputing.com>

commit 58e8f62137f1c55fe3d31234167660f2ce509297
Author: Tom Tucker <tom@opengridcomputing.com>
Date:   Tue May 6 09:45:54 2008 -0500

    svcrdma: Fix error handling during listening endpoint creation
    
    A listening endpoint isn't known to the generic transport switch until
    the svc_create_xprt function returns without error. Calling
    svc_xprt_put within the xpo_create function causes the module reference
    count to be erroneously decremented.
    
    Signed-off-by: Tom Tucker <tom@opengridcomputing.com>

commit 5ac461a6f05499fa233ea43b1de80b679d1eec21
Author: Tom Tucker <tom@opengridcomputing.com>
Date:   Fri Apr 25 18:08:59 2008 -0500

    svcrdma: Free context on post_recv error in send_reply
    
    If an error is encountered trying to post a recv buffer in send_reply,
    free the passed in context. Return an error to the caller so it is
    aware that the request was not posted.
    
    Signed-off-by: Tom Tucker <tom@opengridcomputing.com>

commit 05a0826a6e6d95ab6e9c3e4a10b58e10f233cc2b
Author: Tom Tucker <tom@opengridcomputing.com>
Date:   Fri Apr 25 14:11:31 2008 -0500

    svcrdma: Free context on ib_post_recv error
    
    If there is an error posting the recv WR to the RQ, free the
    context associated with the WR. This would leak a context when
    asynchronous errors occurred on the transport while conccurent threads
    were processing their RPC.
    
    Signed-off-by: Tom Tucker <tom@opengridcomputing.com>

commit 120693d12cde0cc735d784c951b53381efec918f
Author: Tom Tucker <tom@opengridcomputing.com>
Date:   Thu Apr 24 14:17:21 2008 -0500

    svcrdma: Add put of connection ESTABLISHED reference in rdma_cma_handler
    
    The svcrdma transport takes a reference when it gets the ESTABLISHED
    event from the provider. This reference is supposed to be removed when
    the DISCONNECT event is received, however, the call to svc_xprt_put
    was missing in the switch statement. This results in the memory
    associated with the transport never being freed.
    
    Signed-off-by: Tom Tucker <tom@opengridcomputing.com>

commit 9d6347acd2134373c3a4c65a4d43e4f1d59aa012
Author: Tom Tucker <tom@opengridcomputing.com>
Date:   Fri Apr 25 15:51:27 2008 -0500

    svcrdma: Fix return value in svc_rdma_send
    
    Fix the return value on close to -ENOTCONN so caller knows to free context.
    Also if a thread is waiting for free SQ space, check for close when waking
    to avoid posting WR to a closing transport.
    
    Signed-off-by: Tom Tucker <tom@opengridcomputing.com>

commit dbcd00eba99945acfc433508a58eadc5dcd18cad
Author: Tom Tucker <tom@opengridcomputing.com>
Date:   Tue May 6 11:33:11 2008 -0500

    svcrdma: Fix race with dto_tasklet in svc_rdma_send
    
    The svc_rdma_send function will attempt to reap SQ WR to make room for
    a new request if it finds the SQ full. This function races with the
    dto_tasklet that also reaps SQ WR. To avoid polling and arming the CQ
    unnecessarily move the test_and_clear_bit of the RDMAXPRT_SQ_PENDING
    flag and arming of the CQ to the sq_cq_reap function.
    
    Refactor the rq_cq_reap function to match sq_cq_reap so that the
    code is easier to follow.
    
    Signed-off-by: Tom Tucker <tom@opengridcomputing.com>

commit 0e7f011a19696cc25d68a8d6631fc6c5aa60a54c
Author: Tom Tucker <tom@opengridcomputing.com>
Date:   Wed Apr 23 16:49:54 2008 -0500

    svcrdma: Simplify receive buffer posting
    
    The svcrdma transport provider currently allocates receive buffers
    to the RQ through the xpo_release_rqst method. This approach is overly
    complicated since it means that the rqstp rq_xprt_ctxt has to be
    selectively set based on whether the RPC is going to be processed
    immediately or deferred. Instead, just post the receive buffer when
    we are certain that we are replying in the send_reply function.
    
    Signed-off-by: Tom Tucker <tom@opengridcomputing.com>

commit aa3314c8d6da673b3454549eed45547a79f7cbe1
Author: Tom Tucker <tom@opengridcomputing.com>
Date:   Thu Apr 24 21:30:47 2008 -0500

    svc: Remove unused header files from svc_xprt.c
    
    This cosmetic patch removes unused header files that svc_xprt.c
    inherited from svcsock.c
    
    Signed-off-by: Tom Tucker <tom@opengridcomputing.com>

commit fc63a050861a53ba99a6222229cda555796d669e
Author: Tom Tucker <tom@opengridcomputing.com>
Date:   Fri Apr 25 11:07:10 2008 -0500

    svc: Remove extra check for XPT_DEAD bit in svc_xprt_enqueue
    
    Remove a redundant check for the XPT_DEAD bit in the svc_xprt_enqueue
    function. This same bit is checked below while holding the pool lock
    and prints a debug message if found to be dead.
    
    Signed-off-by: Tom Tucker <tom@opengridcomputing.com>

commit 336f1d326831873ffab6de5fcec4b3be05103ae0
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Mon May 19 19:39:33 2008 +0900

    sh: Fix up restorer in debug_trap exception return path.
    
    There are a few different types of debug trap exceptions, though now
    that they are all going through a special jump table, the restorer needs
    to be unified as well.
    
    Presently this is falling through the ret_from_fork path, which more or
    less does the right thing on SH-3/4 whilst being completely unsuitable on
    MMU-less targets.
    
    Ultimately what we want here is a branch through the platform's
    restore_all directly, without worrying about the retval being clobbered.
    We can accomplish that through a branch to __restore_all directly, so
    switch it so we come back from the jump table and branch to the restorer.
    
    This fixes up a recursion in the nommu WARN_ON() path, as well as some
    other userspace nastiness where said recursion caused serious stack
    corruption.
    
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 9a33fc217d2248838d52f8ef214b1909073f3eb4
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Mon May 19 19:32:07 2008 +0900

    sh: Make is_valid_bugaddr() more intelligent on nommu.
    
    Currently is_valid_bugaddr() is true for anything >= PAGE_OFFSET, which
    happens to be 0 on nommu configurations. Make this a bit smarter by just
    reading in the opcode and comparing it against the trap type that we
    already know. Follows the logic from avr32.
    
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 42ece6c1f8162cd782b44dc4863679e888531df5
Author: Stas Sergeev <stsp@aknet.ru>
Date:   Sun May 18 18:30:03 2008 +0200

    snd-pcsp: silent misleading warning
    
    It appears that alsa allows a sound buffer with size not
    evenly devided by the period size. This triggers a warning in
    snd-pcsp and floods the log. As a quick fix, the warning should
    be disabled.
    
    Signed-off-by: Stas Sergeev <stsp@aknet.ru>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 2bc536a235382f2a14fbbefd4fa9cd6089c9d0d0
Author: Stas Sergeev <stsp@aknet.ru>
Date:   Sat May 17 08:46:55 2008 +0200

    snd-pcsp: depend on CONFIG_EXPERIMENTAL
    
    Considering all the feedbacks I got, depending snd-pcsp on
    CONFIG_EXPERIMENTAL looks like the only safe way to get out
    of all the troubles at one go. :)
    
    Signed-off-by: Stas Sergeev <stsp@aknet.ru>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 4dfd79546dfed83bf756f5c912f686ebac187c16
Author: Stas Sergeev <stsp@aknet.ru>
Date:   Sat May 17 08:44:41 2008 +0200

    snd-pcsp: put back the compatibility code for the older alsa-libs
    
    The attached patch adds back the compatibility code, allowing the
    driver to work with older alsa-libs.
    The removal was premature, it breaks the real-life configs.
    
    Signed-off-by: Stas Sergeev <stsp@aknet.ru>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 3ccee69019d3b23f02204f4c2cb3085f436da252
Author: Stas Sergeev <stsp@aknet.ru>
Date:   Fri May 16 12:10:03 2008 +0200

    snd-pcsp: adjust help texts to frighten users
    
    Added the warning text to the help of snd-pcsp about the possible problem
    with this driver so that user can know of the problem in advance.
    
    Also, removed the obsoleted text about ancient pc-speaker patch in
    CONFIG_SOUND help.
    
    Signed-off-by: Stas Sergeev <stsp@aknet.ru>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit c203e45f069af47ca7623e4dcd8c00bfba2722e4
Merge: a94477d... b8291ad...
Author: Lachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Date:   Mon May 19 15:09:05 2008 +1000

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

commit f9ebcd9d410ba7209a8f321c41edf8615fc3ce67
Author: Kumar Gala <galak@kernel.crashing.org>
Date:   Sun May 18 13:18:01 2008 -0500

    lmb: Fix compile warning
    
    lib/lmb.c: In function 'lmb_dump_all':
    lib/lmb.c:51: warning: format '%lx' expects type 'long unsigned int', but argument 2 has type 'u64'
    
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

commit d71a4dd72e67210ae0767ccae69c79f1c933ff64
Author: J. Bruce Fields <bfields@citi.umich.edu>
Date:   Fri May 9 12:01:19 2008 -0700

    svcrpc: fix proc/net/rpc/auth.unix.ip/content display
    
    Commit f15364bd4cf8799a7677b6daeed7b67d9139d974 ("IPv6 support for NFS
    server export caches") dropped a couple spaces, rendering the output
    here difficult to read.
    
    (However note that we expect the output to be parsed only by humans, not
    machines, so this shouldn't have broken any userland software.)
    
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

commit 88dd0be3874566796fa4ffbdf927a53c4a6a2f4b
Author: J. Bruce Fields <bfields@citi.umich.edu>
Date:   Mon May 5 19:47:29 2008 -0400

    nfsd: reorder printk in do_probe_callback to avoid use-after-free
    
    We're currently dereferencing the client after we drop our reference
    count to it.
    
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

commit 161fb0cf5c7e94cd0490e4bd04edcf1e24d1d288
Merge: b8291ad... b452876...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun May 18 15:32:44 2008 -0700

    Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
    
    * 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
      SUNRPC: AUTH_SYS "machine creds" shouldn't use negative valued uid/gid
      nfs: make nfs4_drop_state_owner() static
      nfs: path_{get,put}() cleanups
      nfs: replace remaining __FUNCTION__ occurrences
      nfs/lsm: make NFSv4 set LSM mount options
      NFSv4: Check the return value of decode_compound_hdr_arg()
      nfs: fix race in nfs_dirty_request
      NFS: Ensure that 'noac' and/or 'actimeo=0' turn off attribute caching

commit b4528762ca92261c6ed3f03e76adeb1dc587aacb
Author: Trond Myklebust <Trond.Myklebust@netapp.com>
Date:   Sun May 11 12:18:51 2008 -0700

    SUNRPC: AUTH_SYS "machine creds" shouldn't use negative valued uid/gid
    
    Apparently this causes Solaris 10 servers to refuse our NFSv4 SETCLIENTID
    calls. Fall back to root creds for now, since most servers that care are
    very likely to have root squashing enabled.
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit 54aaacee35afd594bba3244c20b02cc98d80a961
Author: Marcelo Tosatti <mtosatti@redhat.com>
Date:   Wed May 14 02:29:06 2008 -0300

    KVM: LAPIC: ignore pending timers if LVTT is disabled
    
    Only use the APIC pending timers count to break out of HLT emulation if
    the timer vector is enabled.
    
    Certain configurations of Windows simply mask out the vector without
    disabling the timer.
    
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit 1fc9d2bf75bbe5482cc503681dae0935df29b6b0
Author: Avi Kivity <avi@qumranet.com>
Date:   Sun May 18 13:50:23 2008 +0300

    KVM: Update MAINTAINERS for new mailing lists
    
    The KVM mailing lists are now hosted on vger.kernel.org.  Also update
    the website URL.
    
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit e5c239cfd5b0ec22751c099dbf4d91f3c504a64f
Author: Marcelo Tosatti <mtosatti@redhat.com>
Date:   Thu May 8 19:47:01 2008 -0300

    KVM: Fix kvm_vcpu_block() task state race
    
    There's still a race in kvm_vcpu_block(), if a wake_up_interruptible()
    call happens before the task state is set to TASK_INTERRUPTIBLE:
    
    CPU0                            CPU1
    
    kvm_vcpu_block
    
    add_wait_queue
    
    kvm_cpu_has_interrupt = 0
                                    set interrupt
                                    if (waitqueue_active())
                                            wake_up_interruptible()
    
    kvm_cpu_has_pending_timer
    kvm_arch_vcpu_runnable
    signal_pending
    
    set_current_state(TASK_INTERRUPTIBLE)
    schedule()
    
    Can be fixed by using prepare_to_wait() which sets the task state before
    testing for the wait condition.
    
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit bd25ed033af52c8c054d43a9cce9c5976266ae74
Author: Xiantao Zhang <xiantao.zhang@intel.com>
Date:   Wed May 14 19:44:57 2008 +0800

    KVM: ia64: Set KVM_IOAPIC_NUM_PINS to 48
    
    Guest's firmware needs an iosapic with 48 pins for ia64 guests.  Needed to
    get networking going.
    
    Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit 25c437b01f3a04af5362c7fd80ba91a0ec74f007
Author: Xiantao Zhang <xiantao.zhang@intel.com>
Date:   Wed May 7 17:34:52 2008 +0800

    KVM: ia64: fix GVMM module including position-dependent objects
    
    The GVMM module is position independent since it is relocated to the guest
    address space.
    
    Commit ea696f9cf ("ia64 kvm fixes for O=... builds") broke this by linking
    GVMM with non-PIC objects.
    
    Fix by creating two files: memset.S and memcpy.S which just include the files
    under arch/ia64/lib/{memset.S, memcpy.S} respectively.
    
    [akpm: don't delete files which we need]
    
    Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit 021f4b6cc966d02b2bcd68841bc2f0c4897edcbb
Author: Xiantao Zhang <xiantao.zhang@intel.com>
Date:   Wed May 7 17:37:32 2008 +0800

    KVM: ia64: Define new kvm_fpreg struture to replace ia64_fpreg
    
    The kernel's ia64_fpreg structure conflicts with userspace headers, so
    define a new structure to replace it.
    
    Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit eedaa4e2af681a266c084c410238855bdfbc2787
Author: Marcelo Tosatti <mtosatti@redhat.com>
Date:   Tue May 6 13:32:54 2008 -0300

    KVM: PIT: take inject_pending into account when emulating hlt
    
    Otherwise hlt emulation fails if PIT is not injecting IRQ's.
    
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit 5ca9fd54e3d75489ff9c70d7af6e0b9a390dd656
Author: Heiko Carstens <heiko.carstens@de.ibm.com>
Date:   Tue May 6 17:38:30 2008 +0300

    s390: KVM guest: fix compile error
    
    Fix kvm compile error:
    
    Commit c45a6816c19dee67b8f725e6646d428901a6dc24
    (virtio: explicit advertisement of driver features)
    and commit e976a2b997fc4ad70ccc53acfe62811c4aaec851
    (s390: KVM guest: virtio device support, and kvm hypercalls)
    don't like each other:
    
      CC      drivers/s390/kvm/kvm_virtio.o
    drivers/s390/kvm/kvm_virtio.c:224: error: unknown field 'feature' specified in initializer
    drivers/s390/kvm/kvm_virtio.c:224: warning: initialization from incompatible pointer type
    make[3]: *** [drivers/s390/kvm/kvm_virtio.o] Error 1
    
    Cc: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
    Acked-by: Carsten Otte <cotte@de.ibm.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit 107d6d2efa9eb8c48d050936d8019230ac6b24cd
Author: Avi Kivity <avi@qumranet.com>
Date:   Mon May 5 14:58:26 2008 +0300

    KVM: x86 emulator: fix writes to registers with modrm encodings
    
    A register destination encoded with a mod=3 encoding left dst.ptr NULL.
    Normally we don't trap writes to registers, but in the case of smsw, we do.
    
    Fix by pointing dst.ptr at the destination register.
    
    Signed-off-by: Avi Kivity <avi@qumranet.com>

commit e5c0ef90e6cfd40c819bd70748d675067ff862e7
Author: Marc Pignat <marc.pignat@hevs.ch>
Date:   Fri May 9 11:07:07 2008 +0200

    at91_mci: minor cleanup
    
    MMC_POWER_ON is a noop, no need to set the power pin again.
    
    Signed-off-by: Marc Pignat <marc.pignat@hevs.ch>
    Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>

commit 460ed2ea04da012e5575eb357a47a7f6407767de
Author: Mike Frysinger <vapier.adi@gmail.com>
Date:   Sat May 17 18:22:26 2008 +0800

    Blackfin SPORTS UART Driver: converting BFIN->BLACKFIN
    
    Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
    Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>

commit eedd306b51274fb64c00924b5ead679153fca78d
Author: Javier Herrero <jherrero@hvsistemas.es>
Date:   Sat May 17 18:21:57 2008 +0800

    Blackfin serial driver: add extra IRQ flag for 8250 serial driver
    
    Signed-off-by: Javier Herrero <jherrero@hvsistemas.es>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>

commit b4aa54d951d38d7a989d6b6385494ef5ea7371d7
Author: Javier Herrero <jherrero@hvsistemas.es>
Date:   Sat May 17 18:21:42 2008 +0800

    8250 Serial Driver: Added support for 8250-class UARTs in HV Sistemas H8606 board
    
    Added support for 8250-class UARTs in HV Sistemas H8606 board,
    modification in 8250.c driver for correct compilation with Blackfin
    
    Besides, I think that there is more people using 8250-class UARTs
    with a different hardware than the H8606 board. This code can be shared
    by them.
    
    Signed-off-by: Javier Herrero <jherrero@hvsistemas.es>
    Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>

commit 7e291434eb128d7b4217dde6e0543f4342dd51fa
Author: Bryan Wu <cooloney@kernel.org>
Date:   Mon May 19 14:56:42 2008 +0800

    Blackfin arch: Fix bug - USB fails to build for BF524/BF526
    
    BF524 is the same as BF525, except the speed of the processor
    BF526 is the same as BF527, except the speed of the processor
    
    Signed-off-by: Bryan Wu <cooloney@kernel.org>

commit ecb9567e287e082f78fcf055e34613eaf1f7df24
Author: Michael Hennerich <michael.hennerich@analog.com>
Date:   Mon May 19 14:56:33 2008 +0800

    Blackfin arch: update boards defconfig files
    
    Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>

commit 59069676383c6446f50555e04aed7f51d5de695e
Author: Michael Hennerich <michael.hennerich@analog.com>
Date:   Sat May 17 16:38:52 2008 +0800

    Blackfin arch: IO Port functions to read/write unalligned memory
    
    Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>

commit 86ad79321cbacdc4deebcde81849d19e26dd18e2
Author: Cliff Cai <cliff.cai@analog.com>
Date:   Sat May 17 16:36:52 2008 +0800

    Blackfin arch: enable a choice to provide 4M DMA memory
    
    support two cascaded AD73322 cards, more uncached DMA
    memory is needed, so add a choice to provide 4M DMA memory
    
    Signed-off-by: Cliff Cai <cliff.cai@analog.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>

commit c6c6f75d54ca734c409e336245662934c21fcee0
Author: Mike Frysinger <vapier.adi@gmail.com>
Date:   Sat May 17 16:18:08 2008 +0800

    Blackfin arch: cleanup the icplb/dcplb multiple hit checks
    
    so that we always send the same signal and we handle the NULL ptr condition properly
    
    Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>

commit 803a8d2acbf220aeb27f0a98dacb36d4af3d6559
Author: Michael Hennerich <michael.hennerich@analog.com>
Date:   Sat May 17 16:01:51 2008 +0800

    Blackfin arch: Add workaround to read edge triggered GPIOs
    
    Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>

commit 92322da9b568a5ddc3ab872491bdc0f1b47ef904
Author: Michael Hennerich <michael.hennerich@analog.com>
Date:   Sat May 17 15:59:11 2008 +0800

    Blackfin arch: Sync channel defines with struct dma_register dma_io_base_addr.
    
    Otherwise we use the wrong DMA channels.
    
    Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>

commit 5ce998cf6d1dbb28f14dea879a366ed5348f9681
Author: Michael Hennerich <michael.hennerich@analog.com>
Date:   Sat May 17 15:57:01 2008 +0800

    Blackfin arch: Check for Anomaly 05000182
    
    IMDMA does not operate to full speed for 600MHz and higher devices
    
    Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>

commit 6793a051fb9311f0f1ab7eafc5a9e69b8a1bd8d4
Author: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Date:   Wed May 14 17:10:12 2008 -0700

    [PATCH] list_for_each_rcu must die: audit
    
    All uses of list_for_each_rcu() can be profitably replaced by the
    easier-to-use list_for_each_entry_rcu().  This patch makes this change
    for the Audit system, in preparation for removing the list_for_each_rcu()
    API entirely.  This time with well-formed SOB.
    
    Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit fcaf1eb8685a00a99259e138e403841e984385b0
Author: Andrew Morton <akpm@linux-foundation.org>
Date:   Wed May 14 16:11:48 2008 -0700

    [patch 1/1] audit_send_reply(): fix error-path memory leak
    
    Addresses http://bugzilla.kernel.org/show_bug.cgi?id=10663
    
    Reporter: Daniel Marjamki <danielm77@spray.se>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit 6ee650467d5bf972d10441e99688e9b48171f99c
Author: Steve Grubb <sgrubb@redhat.com>
Date:   Tue Apr 29 15:01:13 2008 -0400

    [PATCH] open sessionid permissions
    
    The current permissions on sessionid are a little too restrictive.
    
    Signed-off-by: Steve Grubb <sgrubb@redhat.com>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit 2b280fab12b6697b6a7a24a13aaf9f4339edd075
Author: Steve French <sfrench@us.ibm.com>
Date:   Sat May 17 03:12:45 2008 +0000

    [CIFS] add more complete mount options to cifs_show_options
    
    adds various options to cifs_show_options
    (displayed when you cat /proc/mounts with a cifs mount).  I limited
    the new ones to values that are associated with the mount with the
    exception of "seal" (which is a per tree connection property, but I
    thought was important enough to show through).
    
    Eventually cifs's parse_mount_options also needs to
    be rewritten to use the match_token API but that would be a big enough
    change that I would prefer that changing parse_mount_options wait
    until next release.
    
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit e9baf6e59842285bcf9570f5094e4c27674a0f7c
Author: Al Viro <viro@zeniv.linux.org.uk>
Date:   Thu May 15 04:49:12 2008 -0400

    [PATCH] return to old errno choice in mkdir() et.al.
    
    	In case when both EEXIST and EROFS would apply we used to
    return the former in mkdir(2) and friends.  Lest anyone suspects
    us of being consistent, in the same situation knfsd gave clients
    nfs_erofs...
    
    	ro-bind series had switched the syscall side of things to
    returning -EROFS and immediately broke an application - namely,
    mkdir -p.  Patch restores the original behaviour...
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit 23c4971e3d97de4e1b7961ca6eacee35aa15ce5f
Author: WANG Cong <xiyou.wangcong@gmail.com>
Date:   Thu May 8 21:52:33 2008 +0800

    [Patch] fs/binfmt_elf.c: fix wrong return values
    
    create_elf_tables() returns 0 on success. But when strnlen_user() "fails",
    it returns 0 directly. So this is wrong.
    
    Signed-off-by: WANG Cong <wangcong@zeuux.org>
    Cc: Alexander Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit 08a6fac1c63233c87eec129938022f1a9a4d51f6
Author: Al Viro <viro@zeniv.linux.org.uk>
Date:   Sat May 10 16:38:25 2008 -0400

    [PATCH] get rid of leak in compat_execve()
    
    Even though copy_compat_strings() doesn't cache the pages,
    copy_strings_kernel() and stuff indirectly called by e.g.
    ->load_binary() is doing that, so we need to drop the
    cache contents in the end.
    
    [found by WANG Cong <wangcong@zeuux.org>]
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit 5f719558edf9c84bfbb1f7ad37e84c483282d09f
Author: WANG Cong <xiyou.wangcong@gmail.com>
Date:   Tue May 6 12:45:35 2008 +0800

    [Patch] fs/binfmt_elf.c: fix a wrong free
    
    In kmalloc failing path, we shouldn't free pointers in 'info',
    because the struct 'info' is uninitilized when kmalloc is called.
    
    And when kmalloc returns NULL, it's needless to kfree it.
    
    Signed-off-by: WANG Cong <wangcong@zeuux.org>
    Cc: Alexander Viro <viro@zeniv.linux.org.uk>
    Reviewed-by: Pekka Enberg <penberg@cs.helsinki.fi>
    
    --
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit eceea0b3df05ed262ae32e0c6340cc7a3626632d
Author: Al Viro <viro@zeniv.linux.org.uk>
Date:   Sat May 10 10:08:32 2008 -0400

    [PATCH] avoid multiplication overflows and signedness issues for max_fds
    
    Limit sysctl_nr_open - we don't want ->max_fds to exceed MAX_INT and
    we don't want size calculation for ->fd[] to overflow.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit adbecb128cd2cc5d14b0ebef6d020ced0efd0ec6
Author: Al Viro <viro@zeniv.linux.org.uk>
Date:   Thu May 8 21:19:42 2008 -0400

    [PATCH] dup_fd() part 4 - race fix
    
    Parent _can_ be a clone task, contrary to the comment.  Moreover,
    more files could be opened while we allocate a copy, in which case
    we end up copying only part into new descriptor table.  Since what
    we get _is_ affected by all changes in the old range, we can get
    rather weird effects - e.g.
    	dup2(0, 1024); close(0);
    in parallel with fork() resulting in child that sees the effect of
    close(), but not that of dup2() done just before that close().
    
    What we need is to recalculate the open_count after having reacquired
    ->file_lock and if external fdtable we'd just allocated is too small for
    it, free the sucker and redo allocation.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit afbec7fff4928c273a1f1bb14dfdfdf62688a193
Author: Al Viro <viro@zeniv.linux.org.uk>
Date:   Thu May 8 21:11:17 2008 -0400

    [PATCH] dup_fd() - part 3
    
    merge alloc_files() into dup_fd(), leave setting newf->fdt until the end
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit 9dec3c4d306b09b31331e475e895bb9674e16d81
Author: Al Viro <viro@zeniv.linux.org.uk>
Date:   Thu May 8 21:02:45 2008 -0400

    [PATCH] dup_fd() part 2
    
    use alloc_fdtable() instead of expand_files(), get rid of pointless
    grabbing newf->file_lock, kill magic in copy_fdtable() that used to
    be there only to skip copying when called from dup_fd().
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit 02afc6267f6d55d47aba9fcafdbd1b7230d2294a
Author: Al Viro <viro@zeniv.linux.org.uk>
Date:   Thu May 8 19:42:56 2008 -0400

    [PATCH] dup_fd() fixes, part 1
    
    Move the sucker to fs/file.c in preparation to the rest
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit f52111b1546943545e67573c4dde1c7613ca33d3
Author: Al Viro <viro@zeniv.linux.org.uk>
Date:   Thu May 8 18:19:16 2008 -0400

    [PATCH] take init_files to fs/file.c
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit 229ce3abb6d6d4598de8ef1ed1e2da8163a9bbc0
Author: Masakazu Mokuno <mokuno@sm.sony.co.jp>
Date:   Wed May 14 14:16:50 2008 +0900

    wireless: Create 'device' symlink in sysfs
    
    Some network interfaces of the wireless drivers lack the 'device'
    symlink in sysfs.
    This patch lets the drivers create the links.
    
    Signed-off-by: Masakazu Mokuno <mokuno@sm.sony.co.jp>
    Acked-by: Dan Williams <dcbw@redhat.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit b7acbdfbd1f277c1eb23f344f899cfa4cd0bf36a
Author: Roel Kluin <roel.kluin@gmail.com>
Date:   Tue May 13 22:12:27 2008 +0200

    wireless, airo: waitbusy() won't delay
    
    There will be no delay even when COMMAND_BUSY (defined 0x8000) is set:
    0x8000 & (delay < 10000) will evaluate to 0 - when delay is 0.
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 02969d296e91626d9942ea15f8a95fe056025ef1
Author: Brian Cavagnolo <brian@cozybit.com>
Date:   Tue May 13 13:54:59 2008 +0100

    libertas: fix command timeout after firmware failure
    
    This is a fix for OLPC ticket #6586: "SCAN command fails, timer doesn't
    fire". In fact, the timer was firing; the problem was that the dnld_sent
    state variable was not being updated after the timer expired, so
    lbs_execute_next_command was not being called.
    
    Signed-off-by: Brian Cavagnolo <brian@cozybit.com>
    Signed-off-by: Javier Cardona <javier@cozybit.com>
    Signed-off-by: David Woodhouse <dwmw2@infradead.org>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 2f561feb386d6adefbad63c59a1fcd298ac6a79c
Author: Ivo van Doorn <ivdoorn@gmail.com>
Date:   Sat May 10 13:40:49 2008 +0200

    mac80211: Add RTNL version of ieee80211_iterate_active_interfaces
    
    Since commit e38bad4766a110b61fa6038f10be16ced8c6cc38
    	mac80211: make ieee80211_iterate_active_interfaces not need rtnl
    rt2500usb and rt73usb broke down due to attempting register access
    in atomic context (which is not possible for USB hardware).
    
    This patch restores ieee80211_iterate_active_interfaces() to use RTNL lock,
    and provides the non-RTNL version under a new name:
    	ieee80211_iterate_active_interfaces_atomic()
    
    So far only rt2x00 uses ieee80211_iterate_active_interfaces(), and those
    drivers require the RTNL version of ieee80211_iterate_active_interfaces().
    Since they already call that function directly, this patch will automatically
    fix the USB rt2x00 drivers.
    
    v2: Rename ieee80211_iterate_active_interfaces_rtnl
    
    Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
    Acked-by: Johannes Berg <johannes@sipsolutions.net>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 34a961f7db36f10abd6b153411fe8c810f21f6b3
Author: Abhijeet Kolekar <abhijeet.kolekar@intel.com>
Date:   Fri May 9 09:35:41 2008 -0700

    mac80211 : Association with 11n hidden ssid ap.
    
    This patch fixes the association problem with 11n hidden ssid ap.
    Patch fixes the problem of associating with hidden ssid when
    all three parameters ap,essid and channel are given to iwconfig.
    This patch removes the condition of checking three parameters
    and always checks for bss in bss list while associating.
    
    Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit a1fe78f16eac7d03d3c391dd5d54559826574982
Author: Steve French <sfrench@us.ibm.com>
Date:   Fri May 16 18:48:38 2008 +0000

    [CIFS] Add missing defines for DFS
    
    Also has minor cleanup of previous patch
    
    CC: Igor Mammedov <niallain@gmail.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit fec4585fd71cc5ec35d134e8c3854f6e8c4503f0
Author: Igor Mammedov <niallain@gmail.com>
Date:   Fri May 16 13:06:30 2008 +0400

    CIFSGetDFSRefer cleanup + dfs_referral_level_3 fixed to conform REFERRAL_V3 the MS-DFSC spec.
    
    Signed-off-by: Igor Mammedov <niallain@gmail.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 1d2e88e73ee0af52b0ed63b5fb8f42a919a4d9de
Author: Adrian Bunk <bunk@kernel.org>
Date:   Fri May 2 13:42:45 2008 -0700

    nfs: make nfs4_drop_state_owner() static
    
    nfs4_drop_state_owner() can now become static.
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit 31f31db1a15671513df9cd9fbe56ef45ee1e9a2a
Author: Jan Blunck <jblunck@suse.de>
Date:   Fri May 2 13:42:45 2008 -0700

    nfs: path_{get,put}() cleanups
    
    Here are some more places where path_{get,put}() can be used instead of
    dput()/mntput() pair.
    
    Signed-off-by: Jan Blunck <jblunck@suse.de>
    Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
    Cc: "J. Bruce Fields" <bfields@fieldses.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit 3110ff8048fb757b36112b044b384aea9c44d6e4
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Fri May 2 13:42:44 2008 -0700

    nfs: replace remaining __FUNCTION__ occurrences
    
    __FUNCTION__ is gcc-specific, use __func__
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
    Cc: "J. Bruce Fields" <bfields@fieldses.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit 46c8ac74250a396aca855e494f49a960797a6b5e
Author: Eric Paris <eparis@redhat.com>
Date:   Fri May 2 13:42:42 2008 -0700

    nfs/lsm: make NFSv4 set LSM mount options
    
    NFSv3 get_sb operations call into the LSM layer to set security options passed
    from userspace.  NFSv4 hooks were not originally added since it was reasonably
    late in the merge window and NFSv3 was the only thing that had regressed (v4
    has never supported any LSM options)
    
    This patch makes NFSv4 call into the LSM to set security options rather than
    just blindly dropping them with no notice to the user as happens today.  This
    patch was tested in a simple NFSv4 environment with the context= option and
    appeared to work as expected.
    
    Signed-off-by: Eric Paris <eparis@redhat.com>
    Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
    Cc: "J. Bruce Fields" <bfields@fieldses.org>
    Cc: Stephen Smalley <sds@tycho.nsa.gov>
    Acked-by: James Morris <jmorris@namei.org>
    Cc: Casey Schaufler <casey@schaufler-ca.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit 3a6258e1fb5ff717dcefa04afc35f81aaae3f3e0
Author: Trond Myklebust <Trond.Myklebust@netapp.com>
Date:   Tue May 6 13:32:40 2008 -0400

    NFSv4: Check the return value of decode_compound_hdr_arg()
    
    If decode_compound_hdr_arg() returns a resource error, then we cannot
    proceed to process the callback. Return a 'GARBAGE_ARGS' rpc-level error to
    the caller instead.
    If, however, the minor version field is incorrect, then we need to
    propagate the resulting NFS4ERR_MINOR_VERS_MISMATCH error back as the
    compound status field (setting the nops field to 0).
    
    Finally, if encode_compound_hdr_res() returns an error, we need to return
    an RPC_SYSTEM_ERR to the caller.
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit 38def50fabc479dc96ea6bd2cb2526e0dfc36fa4
Author: Fred Isaman <iisaman@citi.umich.edu>
Date:   Thu May 1 20:03:22 2008 +0300

    nfs: fix race in nfs_dirty_request
    
    When called from nfs_flush_incompatible, the req is not locked, so
    req->wb_page might be set to NULL before it is used by PageWriteback.
    
    Signed-off-by: Fred Isaman <iisaman@citi.umich.edu>
    Signed-off-by: Benny Halevy <bhalevy@panasas.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit b0b539739fe9b7d75002412a787cfdf4efddbc33
Author: Trond Myklebust <Trond.Myklebust@netapp.com>
Date:   Mon May 5 11:45:41 2008 -0400

    NFS: Ensure that 'noac' and/or 'actimeo=0' turn off attribute caching
    
    Both the 'noac' and 'actimeo=0' mount options should ensure that attributes
    are not cached, however a bug in nfs_attribute_timeout() means that
    currently, the attributes may in fact get cached for up to one jiffy. This
    has been seen to cause corruption in some applications.
    
    The reason for the bug is that the time_in_range() test returns 'true' as
    long as the current time lies between nfsi->read_cache_jiffies and
    nfsi->read_cache_jiffies + nfsi->attrtimeo. In other words, if jiffies
    equals nfsi->read_cache_jiffies, then we still cache the attribute data.
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

commit de2db8d790b058fcd75d603780b913bd824972b3
Author: Igor Mammedov <niallain@gmail.com>
Date:   Fri May 16 13:10:32 2008 +0400

    Fixed DFS code to work with new 'build_path_from_dentry', that returns full path if share in the dfs, now.
    
    Signed-off-by: Igor Mammedov <niallain@gmail.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit bfd3c7a728fbe642f79f99482a6c01158c675545
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Mon May 12 12:05:43 2008 -0700

    sh: use the common ascii hex helpers
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 65b83427c6e5814556855c42bf9b4edeafd66623
Author: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
Date:   Thu May 15 17:44:00 2008 +0900

    sh: fix sh7785 master clock value
    
    Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 561c2bccc7c5cf3d42f38f1f4d61c7b609d4631e
Author: Hideo Saito <saito@densan.co.jp>
Date:   Thu May 15 13:30:05 2008 +0900

    sh: Fix up thread info pointer in syscall_badsys resume path.
    
    Entry to resume_userspace expects r8 to contain current_thread_info,
    which happens in all paths except for syscall_badsys, where r8 was
    being inadvertently trampled. Reload it before the branch.
    
    Signed-off-by: Hideo Saito <saito@densan.co.jp>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit e08b954c9a140f2062649faec72514eb505f18c3
Author: Hideo Saito <saito@densan.co.jp>
Date:   Thu May 15 13:28:46 2008 +0900

    sh: Fix up optimized SH-4 memcpy on big endian.
    
    Signed-off-by: Hideo Saito <saito@densan.co.jp>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 972ad0e0d51b67b862ae6143d858fb7da2f2a5f6
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Tue May 13 17:41:46 2008 +0900

    sh: disable initrd defaults in .empty_zero_page.
    
    When using initramfs on systems that don't explicitly clear LOADER_TYPE,
    unpack_to_rootfs() tramples tramples the range with the defaults taken
    out of .empty_zero_page. This causes kernels with valid initramfs images
    to bail out with crc or gzip magic mismatch errors after the second
    unpack takes place on certain platform configurations.
    
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 0105346cc763a6e34e80feb6adb36ed9781150d4
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Tue May 13 17:40:17 2008 +0900

    sh: display boot params by default on entry.
    
    Some kernel and boot loader configurations tweak the .empty_zero_page
    settings, while others do not. Print the values out on entry as a
    debugging aid.
    
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 23f40dc650c0344b37fe54143868a31be66db882
Author: Mathieu Chouquet-Stringer <mchouque@free.fr>
Date:   Wed May 14 19:03:18 2008 -0400

    hostap: fix "registers" registration in procfs
    
    The "registers" entry was incorrectly created in the procfs root instead
    of the device specific directory.  Move "registers" registration
    immediately after the containing procfs directory is created.
    
    Signed-off-by: Mathieu Chouquet-Stringer <mchouque@free.fr>
    Signed-off-by: Pavel Roskin <proski@gnu.org>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 95b1cb90b79896c4bf5ea484bee2b41d7d293f43
Author: Steve French <sfrench@us.ibm.com>
Date:   Thu May 15 16:44:38 2008 +0000

    [CIFS] enable parsing for transport encryption mount parm
    
    Samba now supports transport encryption on particular exports
    (mounted tree ids can be encrypted for servers which support the
    unix extensions).  This adds parsing support to cifs mount
    option parsing for this.
    
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 066b2118976e6e7cc50eed39e2747c75343a23c4
Author: Marcin Slusarz <marcin.slusarz@gmail.com>
Date:   Wed May 14 23:30:06 2008 -0700

    isdn/capi: Return proper errnos on module init.
    
    cdebug_init() is called from kcapi_init() which is module
    initialization function, so it must return negative values on errors.
    
    Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
    Acked-by: Karsten Keil <kkeil@suse.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit ffd8211fb18e1052b2d9eded629cc3c0b872d06a
Author: Alan Cox <alan@redhat.com>
Date:   Wed May 14 23:28:47 2008 -0700

    iphase: Fix 64bit warning.
    
    Time is unsigned long (except when you are in a hurry) so we need to
    store rx_tmp_jif in the right sized object.
    
    Signed-off-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 01bbf2c7ddc93479eecebf8495848c0f362130c5
Author: Andrew Morton <akpm@linux-foundation.org>
Date:   Wed May 14 23:27:18 2008 -0700

    hysdn: No longer broken on SMP.
    
    With the cli/sti code sorted out we think this driver is OK for use on
    SMP systems.
    
    Acked-by: Mark Asselstine <mark.asselstine@windriver.com>
    Acked-by: Karsten Keil <kkeil@suse.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit a9dd7fe28742c6b22eb8f214a04c4d2bcb2c0899
Author: Mark Asselstine <mark.asselstine@windriver.com>
Date:   Wed May 14 23:25:33 2008 -0700

    hysdn: Remove cli()/sti() calls.
    
    The use of cli()/sti() within the do/while was a way to ensure
    interrupts were only disabled for short periods of time while the bulk
    of the time interrupts were free to occur.  The use of the spin lock
    has eliminated the need to play with interrupts in this way while
    still allowing for IO to be protected.
    
    The remaining 3 sti() calls seem unneeded now that at no other point
    in the driver is there a call to cli().
    
    Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
    Acked-by: Karsten Keil <kkeil@suse.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit a1a61a435b3cc157830b7d42b175151ae5eabdd3
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Wed May 14 23:24:09 2008 -0700

    atm: Cleanup atm_tcp.h and atm.h for userspace.
    
    The atm_tcp.h uses types from linux/atm.h, but does not include it.
    It should also use the standard __u## types from linux/types.h rather
    than the uint##_t types since the former can be found with the kernel
    already.
    
    Same goes for linux/atm.h.  The linux/socket.h include there also gets
    dropped as atm.h does not actually use anything from socket.h.
    
    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit c2cf07d591ef7bc25c220249822d9bdf0f44c75c
Author: Steve French <sfrench@us.ibm.com>
Date:   Thu May 15 06:20:02 2008 +0000

    [CIFS] Finishup DFS code
    
    Fixup GetDFSRefer to prepare for cleanup of SMB response processing
    Fix build warning in link.c
    
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit f9ddcca4cf7d95238beb295484d1de7c0bf490dd
Author: Steve French <sfrench@us.ibm.com>
Date:   Thu May 15 05:51:55 2008 +0000

    [CIFS] BKL-removal: convert CIFS over to unlocked_ioctl
    
    cifs_ioctl doesn't seem to need the BKL for anything, so convert it over
    to use unlocked_ioctl.
    
    Signed-off-by: Andi Kleen <andi@firstfloor.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit c32916374b2b4f4d2b7ccdb357fe7989f3b407a6
Author: Steve French <sfrench@us.ibm.com>
Date:   Thu May 15 05:41:54 2008 +0000

    [CIFS] suppress duplicate warning
    
    fs/cifs/dir.c: In function 'cifs_ci_compare':
    fs/cifs/dir.c:582: warning: passing argument 1 of 'memcpy' discards
    qualifiers from pointer target type
    
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 38d2f38be9e4a2f1e3324c973a903aa972f71d0f
Author: Stephen Hemminger <shemminger@vyatta.com>
Date:   Wed May 14 22:35:04 2008 -0700

    bonding: handle case of device named bonding_master
    
    If device already exists named bonding_masters, then fail. This is a wierd
    corner case only a QA group could love.
    
    Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 0599ad53fee2d084f9ba26247d7452f06a40d298
Author: Stephen Hemminger <shemminger@vyatta.com>
Date:   Wed May 14 22:34:16 2008 -0700

    sysfs: remove error messages for -EEXIST case
    
    It is possible that the entry in sysfs already exists, one case of this is
    when a network device is renamed to bonding_masters. Anyway, in this case
    the proper error path is for device_rename to return an error code, not to
    generate bogus backtrace and errors.
    
    Also, to avoid possible races, the create link should be done before the
    remove link. This makes a device rename atomic operation like other renames.
    
    Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit dcc997738e538919101d8756f19ca23110b25d8d
Author: Stephen Hemminger <shemminger@vyatta.com>
Date:   Wed May 14 22:33:38 2008 -0700

    net: handle errors from device_rename
    
    device_rename can fail with -EEXIST or -ENOMEM, so handle any
    problems.
    
    Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 646dd539878a194bc14b104621c0b2b33587e40f
Author: Steve French <sfrench@us.ibm.com>
Date:   Thu May 15 01:50:56 2008 +0000

    [CIFS] Fix paths when share is in DFS to include proper prefix
    
    Some versions of Samba (3.2-pre e.g.) are stricter about checking to make sure that
    paths in DFS name spaces are sent in the form \\server\share\dir\subdir ...
    instead of \dir\subdir
    
    Acked-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 88ae600d58a8d3160144af480133a988404b8d59
Author: Pierre Ossman <drzeus@drzeus.cx>
Date:   Sun Aug 12 14:23:50 2007 +0200

    mmc: mmc host test driver
    
    A dummy driver that performs a series of requests that are often mis-
    handled by host drivers.
    
    Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>

commit df48dd028766ce2fc05d1f1d9da9bf89855d5282
Author: Tony Lindgren <tony@atomide.com>
Date:   Tue May 6 16:36:47 2008 -0700

    mmc: Fix omap compile by replacing dev_name with dma_dev_name
    
    This patch fixes error:
    
    drivers/mmc/host/omap.c: In function 'mmc_omap_get_dma_channel':
    drivers/mmc/host/omap.c:1038: error: called object 'dev_name' is not a function
    
    Commit 06916639e2fed9ee475efef2747a1b7429f8fe76 adds a function
    called dev_name. This will cause a name conflict as dev_dbg calls
    dev_name(((host->mmc)->parent)).
    
    This same issue should not affect other drivers as they don't seem
    to use dev_name with dev_dbg.
    
    Thanks to Paul Walmsley <paul@pwsan.com> for figuring this one out.
    
    Cc: Paul Walmsley <paul@pwsan.com>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
    Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>

commit 35fc37d5175091c36d034a28c057da0f9594ee7e
Author: Jeff Layton <jlayton@redhat.com>
Date:   Wed May 14 10:22:03 2008 -0700

    add function to convert access flags to legacy open mode
    
    SMBLegacyOpen always opens a file as r/w. This could be problematic
    for files with ATTR_READONLY set. Have it interpret the access_mode
    into a sane open mode.
    
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit e10f7b551d2a79b113d5ce66b5dc9f3657035445
Author: Jeff Layton <jlayton@redhat.com>
Date:   Wed May 14 10:21:33 2008 -0700

    clarify return value of cifs_convert_flags()
    
    cifs_convert_flags returns 0x20197 in the default case. It's not
    immediately evident where that number comes from, so change it
    to be an or'ed set of flags. The compiler will boil it down anyway.
    
    (Thanks to Guenter Kukkukk for clarifying the flags).
    
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 77c57ec89682c73785d12d51a6d1f873b292fa42
Author: Steve French <sfrench@us.ibm.com>
Date:   Tue May 13 21:39:32 2008 +0000

    [CIFS] don't explicitly do a FindClose on rewind when directory search has ended
    
    Do the following series of operations on a CIFS share:
    
        opendir(dir)
        readdir(dir)
        unlink(file in dir)
        rewinddir(dir)
        readdir(dir)
    
    If the readdir read all entries in the directory this will make CIFS throw an error like this:
    
         CIFS VFS: Send error in FindClose = -9
    
    CIFS requests "Close at end of search" of the server by setting this bit when issuing FindFirst or FindNext.  Therefore when all search entries are returned, the server may return "end of search" and close the search implicitly when this bit is set by the client on the request.  We check for this when a readdir is explicitly closed - but when the client notices that a directory has changed after the last operation, we attempt to close the directory before reopening by reissuing a second FindFirst. But, the directory may already been implicitly closed (due to end of search) because the first readdir finished. So we only want to issue a FindClose call in this case when we don't expect it to already be closed.
    
    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 582d21e5e319d38c0485d8b9e92f6f2341f7c79b
Author: Steve French <sfrench@us.ibm.com>
Date:   Tue May 13 04:54:12 2008 +0000

    [CIFS] cleanup old checkpatch warnings
    
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 9cd9c616f5890c9345546e03c99ba392b7a82cdf
Author: Mike Frysinger <vapier.adi@gmail.com>
Date:   Tue May 13 12:31:32 2008 +0800

    [Blackfin] arch: rename bf5xx-flash to bfin-async-flash
    
     - move all kconfig board settings into board resources
     - fixup casting style according to lkml feedback
     - rewrite driver so that it can handle arbitrary
       of instances according to the declared platform resources
    
    Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
    Cc: Joern Engel <joern@logfs.org>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>

commit ed5f037005d728de19a0f63678ac35b42064966d
Author: Marcin Slusarz <marcin.slusarz@gmail.com>
Date:   Tue May 13 04:01:01 2008 +0000

    [CIFS] CIFSSMBPosixLock should return -EINVAL on error
    
    all other codepaths in this function return negative values on errors
    
    Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 6353450a2deefaa79cdb4fd2b72830c7db610256
Author: Jeff Layton <jlayton@redhat.com>
Date:   Mon May 12 19:56:05 2008 -0700

    fix memory leak in CIFSFindNext
    
    When CIFSFindNext gets back an -EBADF from a call, it sets the return
    code of the function to 0 and eventually exits. Doing this makes the
    cleanup at the end of the function skip freeing the SMB buffer, so
    we need to make sure we free the buffer explicitly when doing this.
    
    If we don't you end up with errors like this when unplugging the cifs
    kernel module:
    
    slab error in kmem_cache_destroy(): cache `cifs_request': Can't free all objects
     [<c046bdbf>] kmem_cache_destroy+0x61/0xf3
     [<e0f03045>] cifs_destroy_request_bufs+0x14/0x28 [cifs]
     [<e0f2016e>] exit_cifs+0x1e/0x80 [cifs]
     [<c043aeae>] sys_delete_module+0x192/0x1b8
     [<c04451fd>] audit_syscall_entry+0x14b/0x17d
     [<c0405413>] syscall_call+0x7/0xb
     =======================
    
    Signed-off-by: Jeff Layton <jlayton@redhat.com>

commit d0a9c078db4769f7305ff9774558776d12bfb25b
Author: Jeff Layton <jlayton@redhat.com>
Date:   Mon May 12 22:23:49 2008 +0000

    [CIFS] CIFS currently allows for permissions to be changed on files, even
    when unix extensions and cifsacl support are disabled. These
    permissions changes are "ephemeral" however. They are lost whenever
    a share is mounted and unmounted, or when memory pressure forces
    the inode out of the cache.
    
    Because of this, we'd like to introduce a behavior change to make
    CIFS behave more like local DOS/Windows filesystems. When unix
    extensions and cifsacl support aren't enabled, then don't silently
    ignore changes to permission bits that can't be reflected on the
    server.
    
    Still, there may be people relying on the current behavior for
    certain applications. This patch adds a new "dynperm" (and a
    corresponding "nodynperm") mount option that will be intended
    to make the client fall back to legacy behavior when setting
    these modes.
    
    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 00377d8e3842776d1da633ad9c79a16ecb548b92
Author: Jean Delvare <khali@linux-fr.org>
Date:   Fri May 9 17:59:51 2008 +0200

    [GFS2] Prefer strlcpy() over snprintf()
    
    strlcpy is faster than snprintf when you don't use the returned value.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

commit ad99f77778e83358c371dab7a50bde69270ed6b8
Author: Andrew Price <andy@andrewprice.me.uk>
Date:   Thu May 1 11:55:38 2008 +0100

    [GFS2] Fix cast from unsigned int to s64
    
    This fixes bz 444829 where allocating a new block caused gfs2 file systems to
    report 0 bytes used in df. It was caused by a broken cast from an unsigned int
    in gfs2_block_alloc() to a negative s64 in gfs2_statfs_change(). This patch
    casts the unsigned int to an s64 before the unary minus is applied.
    
    Signed-off-by: Andrew Price <andy@andrewprice.me.uk>
    Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

commit 091806edd458486af13ad83c9802f5b8b54d6d19
Author: Bob Peterson <rpeterso@redhat.com>
Date:   Tue Apr 29 12:35:48 2008 -0500

    [GFS2] filesystem consistency error from do_strip
    
    This patch fixes a GFS2 filesystem consistency error reported from
    function do_strip.  The problem was caused by a timing window
    that allowed two vfs inodes to be created in memory that point
    to the same file.  The problem is fixed by making the vfs's
    iget_test, iget_set mechanism check and set a new bit in the
    in-core gfs2_inode structure while the vfs inode spin_lock is held.
    
    Signed-off-by: Bob Peterson <rpeterso@redhat.com>
    Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

commit 45b3947c2de5841d691f1d27d30419b9fae2d86c
Author: Al Viro <viro@zeniv.linux.org.uk>
Date:   Mon May 12 11:55:10 2008 +0800

    [Blackfin] arch: Blackfin checksum annotations
    
    FSVOtest in this case, since I don't have the hardware...
    However, all changes seen by gcc are actually
     - explicit cast to unsigned short in return expression of functions
        returning unsigned short
     - csum_fold() return type changed from unsigned int to __sum16
       (unsigned short), same as for all other architecture and as net/* expects;
       expression actually returned is ((~(sum << 16)) >> 16) with sum being
       unsigned 32bit, so it's (a) going to fit into the range of unsigned short
       and (b) had been unsigned all along, so no sign expansion mess happened.
    
    Tested-by: Bryan Wu <cooloney@kernel.org>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: David Miller <davem@davemloft.net>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>

commit 1f5d3a6b6532e25a5cdf1f311956b2b03d343a48
Author: S.Çağlar Onur <caglar@pardus.org.tr>
Date:   Fri May 2 14:10:08 2008 +0300

    Remove *.rej pattern from .gitignore
    
    With commit 3f1b0e1f287547903f11fa1e6de7d2765597766e ".gitignore update"
    Linus's current git tree starts to ignore any "*.rej" files.
    So "git status" no longer shows these files, but the ones who works with
    quilt patchsets, this not makes life easier as expected.
    Because sometimes a work flow (at least for me) requires
    "quilt push -f" followed by "git status" to see unresolved merge
    conflicts, work on these conflicts to correct them and finalize
    the patch with "quilt refresh".
    
    And if there are some "*.rej" files exists in tree, for whatever
    reason, this means something goes really wrong there and i think
    this situation not deserves to be ignored.
    
    Signed-off-by: S.Çağlar Onur <caglar@pardus.org.tr>
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

commit 591b0179e80f7d59b5e6e57063e92fdbface98fb
Author: Sam Ravnborg <sam@ravnborg.org>
Date:   Sun May 11 10:07:03 2008 +0200

    MAINTAINERS: document names of new kbuild trees
    
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

commit fd1db0a31319bd21c521b197ce17c557556b821b
Author: Andi Kleen <andi@firstfloor.org>
Date:   Thu May 8 13:41:11 2008 +0200

    kbuild: disable modpost warnings for linkonce sections
    
    Disable modpost warnings for linkonce sections
    
    My build gives lots of warnings like
    
    WARNING: sound/core/snd.o (.gnu.linkonce.wi.mpspec_def.h.30779716): unexpected section name.
    The (.[number]+) following section name are ld generated and not expected.
    Did you forget to use "ax"/"aw" in a .S file?
    Note that for example <linux/init.h> contains
    section definitions for use in .S files.
    
    But for .linkonce. duplicated sections are actually ok and expected.
    So just disable the warning for this case.
    
    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

commit a95bcfac2b5f353f99c6a338d77eb5584ab35d83
Author: Masatake YAMATO <yamato@redhat.com>
Date:   Wed May 7 16:04:31 2008 +0900

    kbuild: escape meta characters in regular expression in make TAGS
    
    Alexey Dobriyan <adobriyan@gmail.com> introduced a code adds
    menuconfig SOMETHING in Kconfig to tags output when you did "make tags".
    
    See http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=80ff26241623875636674a31c0540a78c0fb5433
    
    "make tags" may work fine with his code. However make TAGS doesn't work well
    because etags command requires backslashes to escape meta characters like
    `(', `)' and `|'.
    
    Here is a patch.
    
    Signed-off-by: Masatake YAMATO <yamato@redhat.com>
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

commit e948e99400b28af152414f15f8c8023ff2430b79
Author: Keith Packard <keithp@keithp.com>
Date:   Wed May 7 12:27:53 2008 +1000

    drm/i915: save and restore dsparb and d_state registers.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit a59e122a67b88925944d3bbf33d15229cf0fc3de
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Wed May 7 12:25:46 2008 +1000

    drm/i915: fix off by one in VGA save/restore of AR & CR regs.
    
    turns out it's important to save/restore AR14 in particular.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit f116cc561eae0a426b8fa6b3e22e80ba0bcf7aee
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date:   Wed May 7 12:22:39 2008 +1000

    drm: disable tasklets not IRQs when taking the drm lock spinlock
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit af6061af0d9f84a4665f88186dc1ff9e4fb78330
Author: Dave Airlie <airlied@linux.ie>
Date:   Wed May 7 12:15:39 2008 +1000

    Revert "drm/vbl rework: rework how the drm deals with vblank."
    
    This reverts commit ac741ab71bb39e6977694ac0cc26678d8673cda4.
    
    Okay this looks like wasn't as fully baked as I'd led myself to believe.
    
    Revert for now for further baking.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit a94477da38e0b261a7ecea71f4c95a3bcd5be69c
Author: David Chinner <dgc@sgi.com>
Date:   Wed Apr 30 18:15:34 2008 +1000

    [XFS] Include linux/random.h in all builds, not just debug builds.
    
    SGI-PV: 979416
    SGI-Modid: xfs-linux-melb:xfs-kern:31008a
    
    Signed-off-by: David Chinner <dgc@sgi.com>
    Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>