commit c3b25b32e8bef526cca748e1ba023c6bdd705a99
Merge: 28928b2... c4913c7...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Jun 2 15:30:44 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
      [CRYPTO] cts: Init SG tables

commit 28928b2f1d769abdc173c96e2632d30cbde9ec4a
Merge: 63e1462... 0f475b2...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Jun 2 15:28:45 2008 -0700

    Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
      [PATCH 3/3] ocfs2/net: Silence build warnings
      [PATCH 2/3] ocfs2/dlm: Silence build warnings
      [PATCH 1/3] ocfs2/net: Silence build warnings
      ocfs2: Rename 'user_stack' plugin structure to 'ocfs2_user_plugin'

commit 63e14626eddb534ab429e9c2b95d3f7038b596b6
Author: Anton Vorontsov <avorontsov@ru.mvista.com>
Date:   Sun Jun 1 11:49:32 2008 +0200

    mmc_spi: mmc_spi.h should include linux/interrupts.h
    
    Since mmc_spi.h uses irqreturn_t type, it should include appropriate
    header, otherwise build will break if users didn't include it (some of
    them do not use interrupts).
    
    Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
    Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit b09916e4f07de1cb2259cb01ec31e6ce535471bc
Merge: 00e98a9... 96d97f2...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Jun 2 15:26:02 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:
      kbuild: fix $(src) assignmnet with external modules

commit 00e98a9992641a14ace0bbc2dfcbc4e856ac3fd3
Merge: f365ad5... a4ed1e4...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Jun 2 15:25:27 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:
      8250 Serial Driver: revert extra IRQ flag definition patch
      Blackfin arch: update anomaly headers from toolchain trunk
      Blackfin arch: Remove bad and usless code
      Blackfin arch: Fix bug - set corret SSEL and IRQ to enable AD7877 on BF527
      Blackfin arch: Fix typo. it should be _outsw_8
      Blackfin arch: Cleanup no functional changes

commit f365ad5fc001cbd02968a376e0aecffe52ce79e1
Merge: 61ac7bf... 9c8b28c...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Jun 2 15:25:03 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] Fix DMA nodes in the MPC8610 HPCD device tree
      [POWERPC] Export empty_zero_page and copy_page in arch/ppc
      [POWERPC] Add "memory" clobber to MMIO accessors
      [POWERPC] pasemi: update pasemi_defconfig, enable electra_cf
      electra_cf: Add MODULE_DEVICE_TABLE()

commit c4913c7b71abc79b008a3c118628cfb59bdb0efc
Author: Alexey Dobriyan <adobriyan@gmail.com>
Date:   Mon Jun 2 15:46:51 2008 +1000

    [CRYPTO] cts: Init SG tables
    
    Steps to reproduce:
    
    	modprobe tcrypt		# with CONFIG_DEBUG_SG=y
    
    testing cts(cbc(aes)) encryption
    test 1 (128 bit key):
    ------------[ cut here ]------------
    kernel BUG at include/linux/scatterlist.h:65!
    invalid opcode: 0000 [1] PREEMPT SMP DEBUG_PAGEALLOC
    CPU 0
    Modules linked in: tea xts twofish twofish_common tcrypt(+) [maaaany]
    Pid: 16151, comm: modprobe Not tainted 2.6.26-rc4-fat #7
    RIP: 0010:[<ffffffffa0bf032e>]  [<ffffffffa0bf032e>] :cts:cts_cbc_encrypt+0x151/0x355
    RSP: 0018:ffff81016f497a88  EFLAGS: 00010286
    RAX: ffffe20009535d58 RBX: ffff81016f497af0 RCX: 0000000087654321
    RDX: ffff8100010d4f28 RSI: ffff81016f497ee8 RDI: ffff81016f497ac0
    RBP: ffff81016f497c38 R08: 0000000000000000 R09: 0000000000000011
    R10: ffffffff00000008 R11: ffff8100010d4f28 R12: ffff81016f497ac0
    R13: ffff81016f497b30 R14: 0000000000000010 R15: 0000000000000010
    FS:  00007fac6fa276f0(0000) GS:ffffffff8060e000(0000) knlGS:0000000000000000
    CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
    CR2: 00007f12ca7cc000 CR3: 000000016f441000 CR4: 00000000000026e0
    DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
    DR3: 0000000000000000 DR6: 00000000ffff4ff0 DR7: 0000000000000400
    Process modprobe (pid: 16151, threadinfo ffff81016f496000, task ffff8101755b4ae0)
    Stack:  0000000000000001 ffff81016f496000 ffffffff80719f78 0000000000000001
     0000000000000001 ffffffff8020c87c ffff81016f99c918 20646c756f772049
     65687420656b696c 0000000000000020 0000000000000000 0000000033341102
    Call Trace:
     [<ffffffff8020c87c>] ? restore_args+0x0/0x30
     [<ffffffffa04aa311>] ? :aes_generic:crypto_aes_expand_key+0x311/0x369
     [<ffffffff802ab453>] ? check_object+0x15a/0x213
     [<ffffffff802aad22>] ? init_object+0x6e/0x76
     [<ffffffff802ac3ae>] ? __slab_free+0xfc/0x371
     [<ffffffffa0bf05ed>] :cts:crypto_cts_encrypt+0xbb/0xca
     [<ffffffffa07108de>] ? :crypto_blkcipher:setkey+0xc7/0xec
     [<ffffffffa07110b8>] :crypto_blkcipher:async_encrypt+0x38/0x3a
     [<ffffffffa2ce9341>] :tcrypt:test_cipher+0x261/0x7c6
     [<ffffffffa2cfd9df>] :tcrypt:tcrypt_mod_init+0x9df/0x1b30
     [<ffffffff80261e35>] sys_init_module+0x9e/0x1b2
     [<ffffffff8020c15a>] system_call_after_swapgs+0x8a/0x8f
    Code: 45 c0 e8 aa 24 63 df 48 c1 e8 0c 48 b9 00 00 00 00 00 e2 ff ff 48 8b 55 88 48 6b c0 68 48 01 c8 b9 21 43 65 87 48 39 4d 80 74 04 <0f> 0b eb fe f6 c2 01 74 04 0f 0b eb fe 83 e2 03 4c 89 ef 44 89
    RIP  [<ffffffffa0bf032e>] :cts:cts_cbc_encrypt+0x151/0x355
     RSP <ffff81016f497a88>
    ---[ end trace e8bahiarjand37fd ]---
    
    Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

commit 96d97f262aa6120f8dd8e8e9c7a0b0677de7e29e
Author: Sam Ravnborg <sam@ravnborg.org>
Date:   Sat May 31 22:28:40 2008 +0200

    kbuild: fix $(src) assignmnet with external modules
    
    When we introduced support for KBUILD_EXTRA_SYMBOLS
    we started to include the externam module's kbuild
    file when doing the final modpost step.
    
    As external modules often do:
    ccflags-y := -I$(src)
    
    We had problems because $(src) was unassinged and
    gcc then used the next parameter for -I resulting in
    strange build failures.
    
    Fix is to assign $(src) and $(obj) when building
    external modules.
    
    This fixes: http://bugzilla.kernel.org/show_bug.cgi?id=10798
    
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
    Cc: Tvrtko <tvrtko.ursulin@sophos.com>
    Cc: Andrea Arcangeli <andrea@qumranet.com>
    Cc: "Rafael J. Wysocki" <rjw@sisk.pl>

commit a4ed1e41a734d77c9a83a88a8736e19b68e6a2a0
Author: Bryan Wu <cooloney@kernel.org>
Date:   Sat May 31 16:10:04 2008 +0800

    8250 Serial Driver: revert extra IRQ flag definition patch
    
    As Russell pointed out, original patch will break some serial configurations
    because of the dependency of the <asm/serial.h> header file.
    
    Revert it first and try to find out other solution later
    
    Cc: Javier Herrero <jherrero@hvsistemas.es>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Cc: Russell King <rmk+lkml@arm.linux.org.uk>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>

commit a70ce072b3883e431575449f3e294c27235590e5
Author: Mike Frysinger <vapier.adi@gmail.com>
Date:   Sat May 31 15:47:17 2008 +0800

    Blackfin arch: update anomaly headers from toolchain trunk
    
    Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>

commit b06dcee9c8d24ef903dc0d192af22b8e179eef4b
Author: Michael Hennerich <michael.hennerich@analog.com>
Date:   Sat May 31 15:35:40 2008 +0800

    Blackfin arch: Remove bad and usless code
    
    Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>

commit 2eb74ae20e65e71c2d5bf7b8ad7d0ac5d5acf55f
Author: Bryan Wu <cooloney@kernel.org>
Date:   Sat May 31 15:17:25 2008 +0800

    Blackfin arch: Fix bug - set corret SSEL and IRQ to enable AD7877 on BF527
    
    AD7877 use SSEL_2 (P9.9) and IRQ_PF8 (P9.14) on BF527
    
     - populating JP3 to enable STAMP
     - disable SW11.2 to disconnect SSEL_2/PF12 from Rotary NAND
     - disable SW18.1 to disconnect SSEL_2 from MAX1233 touchscreen chip
    
    Signed-off-by: Bryan Wu <cooloney@kernel.org>

commit 9c8b28c2ef532c2cf32b59aaa0bc07eb3b866ef7
Author: Timur Tabi <timur@freescale.com>
Date:   Sat May 31 08:12:05 2008 +1000

    [POWERPC] Fix DMA nodes in the MPC8610 HPCD device tree
    
    The node for DMA2 in the MPC8610 HPCD device tree has the wrong compatible
    properties.  This breaks the DMA driver and the sound driver.
    
    Signed-off-by: Timur Tabi <timur@freescale.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 6907fa26d8934904a4c2594034c1affd8d717cae
Author: Tony Breeds <tony@bakeyournoodle.com>
Date:   Wed May 28 10:52:19 2008 +1000

    [POWERPC] Export empty_zero_page and copy_page in arch/ppc
    
    Currently ext4 and fuse fail to link if modular:
    ERROR: "copy_page" [fs/fuse/fuse.ko] undefined!
    ERROR: "empty_zero_page" [fs/ext4/ext4dev.ko] undefined!
    make[3]: *** [__modpost] Error 1
    make[2]: *** [modules] Error 2
    make[1]: *** [sub-make] Error 2
    
    While arch ppc exists it may as well compile, so this exports those
    symbols (which are already exported in arch/powerpc).
    
    Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit cfab3bdf8292edec19492c89520b1ad11279a648
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date:   Wed May 28 10:18:17 2008 +1000

    [POWERPC] Add "memory" clobber to MMIO accessors
    
    Gcc might re-order MMIO accessors vs. surrounding consistent
    memory accesses, which is a "bad thing", and could break drivers.
    This fixes it by adding a "memory" clobber to the MMIO accessors,
    which should prevent gcc from doing that reordering.
    
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 61ac7bf538db2044d0238fcd87b3d9df59294bf2
Merge: 14d03fd... 3072c37...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri May 30 15:39:05 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:
      ahci: change the Device IDs of nvidia MCP7B AHCI controller in ahci.c
      [libata] sata_fsl: Fix broken driver, add port multiplier (PMP) support
      libata: SRST can't be trusted on PMP sil3726
      libata: fix libata-scsi kernel-doc notation
      ata: Convert to static DEFINE_SPINLOCK(lock)
      ata_piix: fix macbook ich8m problems
      sata_mv: implement SoC guideline SATA_S11
      sata_mv: workaround for 60x1 errata sata13
      sata_mv: nuke unreleased GenIIe revisions
      sata_mv: PHY_MODEx errata fixes
      sata_mv: move SOC_FLAG to hpriv

commit 0f475b2abed6cbccee1da20a0bef2895eb2a0edd
Author: Sunil Mushran <sunil.mushran@oracle.com>
Date:   Mon May 12 18:31:37 2008 -0700

    [PATCH 3/3] ocfs2/net: Silence build warnings
    
    This patch silences the build warnings concerning o2net_init_nst()
    and friends when building without CONFIG_DEBUG_FS enabled.
    
    Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
    Signed-off-by: Mark Fasheh <mfasheh@suse.com>

commit 959040c37a8cae8117907d4aed87f1b01ff1ea19
Author: Sunil Mushran <sunil.mushran@oracle.com>
Date:   Mon May 12 18:31:36 2008 -0700

    [PATCH 2/3] ocfs2/dlm: Silence build warnings
    
    This patch silences the build warnings concerning dlm_debug_init()
    and friends when building without CONFIG_DEBUG_FS enabled.
    
    Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
    Signed-off-by: Mark Fasheh <mfasheh@suse.com>

commit 271d772d02507c7541d5e6b4938ed2380e59a39a
Author: Sunil Mushran <sunil.mushran@oracle.com>
Date:   Mon May 12 18:31:35 2008 -0700

    [PATCH 1/3] ocfs2/net: Silence build warnings
    
    This patch silences the build warnings concerning o2net_debugfs_init()
    and friends when building without CONFIG_DEBUG_FS enabled.
    
    Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
    Signed-off-by: Mark Fasheh <mfasheh@suse.com>

commit a12630b186d56a77d17c9b34c82b88dda4337ed7
Author: Joel Becker <joel.becker@oracle.com>
Date:   Fri May 9 18:49:29 2008 -0700

    ocfs2: Rename 'user_stack' plugin structure to 'ocfs2_user_plugin'
    
    The static structure describing the userspace cluster plugin for ocfs2
    was named 'user_stack', which is a real pain when people are grep(1)ing
    the tree for the program stack object 'user_stack'.  Change the name to
    something distinct and namespaced.
    
    Signed-off-by: Joel Becker <joel.becker@oracle.com>
    Signed-off-by: Mark Fasheh <mfasheh@suse.com>

commit 14d03fd98e076c6e60e1085a962410dc4d70ab59
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri May 30 14:02:21 2008 -0700

    Mark 'scripts/decodecode' executable
    
    .. because it is.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit ab8cd81830fef799177740d5ab709c0341e9ba5c
Merge: f8356ed... 2088761...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri May 30 10:20:03 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:
      lguest: notify on empty
      virtio: force callback on empty.
      virtio_blk: fix endianess annotations
      virtio_config: fix len calculation of config elements
      virtio_net: another race with virtio_net and enable_cb
      virtio: An entropy device, as suggested by hpa.
      virtio_blk: allow read-only disks
      lguest: fix ugly <NULL> in /proc/interrupts
      virtio: set device index in common code.
      virtio: virtio_pci should not set bus_id.
      virtio: bus_id for devices should contain 'virtio'
      Fix crash in virtio_blk during modprobe ; rmmod ; modprobe
      lguest: use ioremap_cache, not ioremap

commit f8356ed00ebcdc2f209504c02b4ab8ba9a8a7ebe
Merge: 7536d7b... a9b841e...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri May 30 10:18:02 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
      PCI: fix rpadlpar pci hotplug driver sysfs usage

commit 7536d7be7b718f8c5834cbcb7601816562e1b805
Merge: 57f50ca... 5adad01...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri May 30 10:17:19 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
      Input: rename SW_RADIO to SW_RFKILL_ALL
      Input: gtco - fix double kfree in error handling path
      Input: pxa27x_keypad - miscellaneous fixes
      Input: atkbd - mark keyboard as disabled when suspending/unloading
      Input: apanel - remove duplicate include
      Input: wm9713 - support five wire panels
      Input: wm97xx-core - fix race on PHY init
      Input: wm97xx-core - fix driver name
      Input: wm97xx-core - report a phys for WM97xx touchscreens
      Input: i8042 - make sure Dritek quirk is invoked at resume
      Input: i8042 - add Dritek quirk for Acer TravelMate 660

commit 57f50ca127a3189566af0d6378394c75a26f0f7e
Author: Ingo Molnar <mingo@elte.hu>
Date:   Fri May 30 17:02:50 2008 +0200

    drivers/watchdog/geodewdt.c: build fix
    
    * Wim Van Sebroeck <wim@iguana.be> wrote:
    
    > Author: Jordan Crouse <jordan.crouse@amd.com>
    > Date:   Mon Jan 21 10:07:00 2008 -0700
    >
    >     [WATCHDOG] Add a watchdog driver based on the CS5535/CS5536 MFGPT timers
    
    -tip testing found the following build failure on latest -git:
    
      drivers/watchdog/geodewdt.c: In function 'geodewdt_probe':
      drivers/watchdog/geodewdt.c:225: error: too many arguments to function 'geode_mfgpt_alloc_timer'
      make[1]: *** [drivers/watchdog/geodewdt.o] Error 1
      make: *** [drivers/watchdog/geodewdt.o] Error 2
    
    with this config:
    
      http://redhat.com/~mingo/misc/config-Fri_May_30_15_19_52_CEST_2008.bad
    
    find the fix below.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Acked-by: Jordan Crouse <jordan.crouse@amd.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit a9b841e1a336822a25899ec8cdf70a55a6696ae7
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date:   Fri May 30 13:39:12 2008 +1000

    PCI: fix rpadlpar pci hotplug driver sysfs usage
    
    When Greg "fixed" the sysfs usage of that driver a while back, he seem
    to have introduced a bug where the quotes are added around the name of
    our specific sysfs files, thus breaking the user space tool.
    
    This fixes it. Tested DLPAR operations on a POWER6 machine successfully.
    
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit 3072c379bccfa2844e33103ed9ff530780e660ea
Author: peerchen <peerchen@gmail.com>
Date:   Mon May 19 14:44:57 2008 +0800

    ahci: change the Device IDs of nvidia MCP7B AHCI controller in ahci.c
    
    Change the partial Device IDs of nvidia MCP7B AHCI controller in ahci.c,
    as the actual PCI IDs deployed in the field differed from the forecasted ones
    preemptively placed in the driver.
    
    Signed-off-by: Peer Chen <peerchen@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 034d8e8f273fcb02bebd6a62d8023ffa409fe92f
Author: Ashish Kalra <ashish.kalra@freescale.com>
Date:   Tue May 20 00:19:45 2008 -0500

    [libata] sata_fsl: Fix broken driver, add port multiplier (PMP) support
    
    The following commit (4c9bf4e799ce06a7378f1196587084802a414c03):
    libata: replace tf_read with qc_fill_rtf for non-SFF drivers
    
    Broke the sata_fsl.c driver in 2.6.26-rc.  I know the following patch fixes
    the issue, it clearly also adds port multipler support.  The current
    2.6.26-rc driver is broken.
    
    On boot with debug enabled we get something like (w/o this patch):
    
    spurious interrupt!!, CC = 0x1
    interrupt status 0x1
    xx_scr_read, reg_in = 1
    spurious interrupt!!, CC = 0x1
    interrupt status 0x1
    xx_scr_read, reg_in = 1
    spurious interrupt!!, CC = 0x1
    interrupt status 0x1
    xx_scr_read, reg_in = 1
    
    .. continues for ever.
    
    This change fixes this as a side effect of adding port multiplier support.
    
    Signed-off-by: Ashish Kalra <ashish.kalra@freescale.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 19ef9d5e45ce805700f34c248a71a511877b8a5d
Author: Tejun Heo <htejun@gmail.com>
Date:   Wed May 21 14:11:24 2008 +0900

    libata: SRST can't be trusted on PMP sil3726
    
    As in sil4726, SRST can't be trusted on sil3726 causing detection
    problems under certain configuraitons.  I thought it was from the
    Config Disk device but apparently not.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit ec2a20e61974f7c9ebe6dd99ac479ec309a750bc
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date:   Wed Apr 30 12:57:00 2008 -0700

    libata: fix libata-scsi kernel-doc notation
    
    Fix libata-scsi kernel-doc notation:
    
    Warning(linux-2.6.25-git15//drivers/ata/libata-scsi.c:1659): No description found for parameter 'cmd'
    Warning(linux-2.6.25-git15//drivers/ata/libata-scsi.c:1971): No description found for parameter 'buf'
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 2da676594a73825f10d2a99358cc7465119684f9
Author: Pradeep Singh Rautela <rautelap@gmail.com>
Date:   Thu May 29 23:28:14 2008 +0530

    ata: Convert to static DEFINE_SPINLOCK(lock)
    
    Replace deprecated static spinlock_t instance to static DEFINE_SPINLOCK(lock).
    
    Signed-off-by: Pradeep Singh <rautelap@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 23cf296e3b047da46112eb6b4dc89917c93c8f19
Author: Tejun Heo <htejun@gmail.com>
Date:   Thu May 29 22:04:22 2008 +0900

    ata_piix: fix macbook ich8m problems
    
    ICH8M on macbooks are peculiar in that some of them lock up when the
    second port is enabled, some return bogus values on SIDPR access while
    yet others hang on SIDPR access.  Also, the ich8m_apple_sata entry was
    wrongly added below generic ich8m entry making it virtually useless.
    
    This patch works around macbook ich8m problems by
    
    * moving ich8m_apple_sata entry above generic ich8m entry
    * dropping PIIX_FLAG_SIDPR from ich8m_apple_sata
    * adding subsystem 106b:00a1 as ich8m_apple_sata
    
    Reported and tested by MATSUBAYASHI.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Cc: MATSUBAYASHI 'Shaolin' Kohji <shaolin@rhythmaning.org>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 0388a8c0d54aa039758a8eca68d82325a563f8db
Author: Mark Lord <liml@rtr.ca>
Date:   Wed May 28 13:41:52 2008 -0400

    sata_mv: implement SoC guideline SATA_S11
    
    The 5182 System-On-Chip (SOC) variant wants certain lower
    bits to be cleared on any write to the PHY_MODE3 register.
    
    If/when support is added for other SOC variants, we'll need
    some way to uniquely identify the 5182, and not perform this
    workaround for the others.
    
    But for now, it is the only SOC variant we support here.
    
    Signed-off-by: Mark Lord <mlord@pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit b406c7a6655da7a2fcd9f72e41262f93ff707748
Author: Mark Lord <liml@rtr.ca>
Date:   Wed May 28 12:01:12 2008 -0400

    sata_mv: workaround for 60x1 errata sata13
    
    The "B2" variant of the 6041/6081 (genII) chips requires
    that the PHY_MODE3 register be rewritten after any write
    to PHY_MODE4.
    
    This fixes a regression introduced by an earlier patch.
    
    Signed-off-by: Mark Lord <mlord@pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 5cf73bfb061552aa18d816d2859409be9ace5306
Author: Mark Lord <liml@rtr.ca>
Date:   Tue May 27 17:58:56 2008 -0400

    sata_mv: nuke unreleased GenIIe revisions
    
    The only public release of the 6042/7042 chips was/is revision "B0".
    Remove code that attempted to deal with earlier, non-released revs.
    This matches the logic of the current Marvell "proprietary" driver.
    
    Also, bump up the sata_mv version number, to reflect this batch of erratas.
    
    Signed-off-by: Mark Lord <mlord@pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 8c30a8b9b574cf6c51e207464b852a6f559da153
Author: Mark Lord <liml@rtr.ca>
Date:   Tue May 27 17:56:31 2008 -0400

    sata_mv: PHY_MODEx errata fixes
    
    Fix and update the errata handling for the PHY_MODEx registers.
    This improves receiver noise tolerance, among other things.
    
    Signed-off-by: Mark Lord <mlord@pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 1f39847255a02c69190ae30c33b8ccf4c10840df
Author: Mark Lord <liml@rtr.ca>
Date:   Tue May 27 17:54:48 2008 -0400

    sata_mv: move SOC_FLAG to hpriv
    
    Convert the System-on-Chip flag from a host flag to an hpriv flag,
    for better consistency with other chip-rev flags, and for easier use
    in errata fixes etc.
    
    Also change the related "HAS_PCI()" into "!IS_SOC()" for better consistency
    of naming/use (everything else SOC-related already uses "SOC").
    
    There are no functionality changes in this patch.
    
    Signed-off-by: Mark Lord <mlord@pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 1beee8dc8cf58e3f605bd7b34d7a39939be7d8d2
Merge: 9db8ee3... 3446b9d...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri May 30 07:45:20 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: (26 commits)
      llc: Fix double accounting of received packets
      netfilter: nf_conntrack_expect: fix error path unwind in nf_conntrack_expect_init()
      bluetooth: fix locking bug in the rfcomm socket cleanup handling
      mac80211: fix alignment issue with compare_ether_addr()
      mac80211: Fix for NULL pointer dereference in sta_info_get()
      mac80211: fix a typo in ieee80211_handle_filtered_frame comment
      rndis_wlan: add missing range check for power_output modparam
      iwlwifi: fix rate scale TLC column selection bug
      iwlwifi: fix exit from stay_in_table state
      rndis_wlan: Make connections to TKIP PSK networks work
      mac80211 : Fixes the status message for iwconfig
      rt2x00: Use atomic interface iteration in irq context
      rt2x00: Reset antenna RSSI after switch
      rt2x00: Don't count retries as failure
      rt2x00: Fix memleak in tx() path
      mac80211: reorder channel and freq reporting in wext scan report
      b43: Fix controller restart crash
      mac80211: fix ieee80211_rx_bss_put/get imbalance
      net/mac80211: always true conditionals
      b43: Upload both beacon templates on initial load
      ...

commit 9db8ee3d96e98705ba4e9260815ca326b0d07741
Merge: e3aa51f... 0066ed5...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri May 30 07:44:19 2008 -0700

    Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
    
    * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
      [S390] Update default configuration.
      [S390] disassembler: fix idte instruction format.
      [S390] tape: fix race with stack local wait_queue_head_t.
      [S390] 3270: fix race with stack local wait_queue_head_t.
      [S390] dasd: use a generic wait_queue for sleep_on
      [S390] sclp_vt220: fix scheduling while atomic bug.
      [S390] showmem: Only walk spanned pages.
      [S390] appldata: prevent cpu hotplug when walking cpu_online_map.
      [S390] Fix section mismatch warnings.
      [S390] s390 types: make dma_addr_t 64 bit capable
      [S390] tape: Fix race condition in tape block device driver
      [S390] fix sparsemem related compile error with allnoconfig on s390

commit e3aa51fecdc941c859ed0515084323d3f997aa4a
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Thu May 29 17:51:57 2008 -0700

    acpi: fix sparse const errors
    
    In this case we want a constant pointer to constant chars:
    
    drivers/misc/thinkpad_acpi.c:3824:19: error: Just how const do you want this type to be?
    
    Like the error says.
    
    drivers/misc/thinkpad_acpi.c:3863:19: error: Just how const do you want this type to be?
    drivers/misc/thinkpad_acpi.c:3864:19: error: Just how const do you want this type to be?
    drivers/misc/thinkpad_acpi.c:3865:19: error: Just how const do you want this type to be?
    drivers/misc/thinkpad_acpi.c:3866:19: error: Just how const do you want this type to be?
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 5adad0133907790c50283bf03271d920d6897043
Author: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Date:   Fri May 30 10:40:46 2008 -0400

    Input: rename SW_RADIO to SW_RFKILL_ALL
    
    The SW_RADIO code for EV_SW events has a name that is not descriptive
    enough of its intended function, and could induce someone to think
    KEY_RADIO is its EV_KEY counterpart, which is false.
    
    Rename it to SW_RFKILL_ALL, and document what this event is for.  Keep
    the old name around, to avoid userspace ABI breaks.
    
    The SW_RFKILL_ALL event is meant to be used by rfkill master switches.  It
    is not bound to a particular radio switch type, and usually applies to all
    types.  It is semantically tied to master rfkill switches that enable or
    disable every radio in a system.
    
    Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit 501a5250589be41c4c060afa855bc60b4539a340
Author: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date:   Fri May 30 10:40:28 2008 -0400

    Input: gtco - fix double kfree in error handling path
    
    The code would try to free 'report' twice upon input_register_device()
    failure.
    
    Reported-by: Julia Lawall <julia@diku.dk>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit 3446b9d57edd0b96a89715fef222879e4919a115
Author: Arnaldo Carvalho de Melo <acme@redhat.com>
Date:   Fri May 30 02:57:29 2008 -0700

    llc: Fix double accounting of received packets
    
    llc_sap_rcv was being preceded by skb_set_owner_r, then calling
    llc_state_process that calls sock_queue_rcv_skb, that in turn calls
    skb_set_owner_r again making the space allowed to be used by the socket to be
    leaked, making the socket to get stuck.
    
    Fix it by setting skb->sk at llc_sap_rcv and leave the accounting to be done
    only at sock_queue_rcv_skb.
    
    Reported-by: Dmitry Petukhov <dmgenp@gmail.com>
    Tested-by: Dmitry Petukhov <dmgenp@gmail.com>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 0066ed55a9a061ed64bbc09c16f45daf0b976ac5
Author: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date:   Fri May 30 10:03:35 2008 +0200

    [S390] Update default configuration.
    
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

commit 209fb9090f4ca5874289c9ca82991393f85c1eff
Author: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date:   Fri May 30 10:03:34 2008 +0200

    [S390] disassembler: fix idte instruction format.
    
    The correct instruction format of idte is "idte r1,r3,r2" with
    r1 at bit 24, r3 at bit 16 and r2 at bit 28.
    
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

commit 4657fb8a98a4e02981a574492bbe470c147b6657
Author: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date:   Fri May 30 10:03:33 2008 +0200

    [S390] tape: fix race with stack local wait_queue_head_t.
    
    A wait_event call with a stack local wait_queue_head_t structure that is
    used to do the wake up for the wait_event is inherently racy. After the
    wait_event finished the wake_up call might not have completed yet.
    Replace the stack local wait_queue_head_t in tape_do_io and
    tape_do_io_interruptible with a per device wait queue.
    
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

commit 54ad64129cc166b9eec7151f3f9fc83589e33555
Author: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date:   Fri May 30 10:03:32 2008 +0200

    [S390] 3270: fix race with stack local wait_queue_head_t.
    
    A wait_event call with a stack local wait_queue_head_t structure that is
    used to do the wake up for the wait_event is inherently racy. After the
    wait_event finished the wake_up call might not have completed yet.
    Remove the stack local wait_queue_head_t from raw3270_start_init and
    use the global raw3270_wait_queue instead.
    
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

commit c80ee724966a8ce9a68020d9095233fb1c6f57e8
Author: Stefan Haberland <stefan.haberland@de.ibm.com>
Date:   Fri May 30 10:03:31 2008 +0200

    [S390] dasd: use a generic wait_queue for sleep_on
    
    Use a generic wait_queue to prevent the wait_queue in dasd_sleep_on_
    functions from being referenced by callback_data while it does not
    exist any more.
    
    Signed-off-by: Stefan Haberland  <stefan.haberland@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

commit d4820e44b0ae6830b1d634e6d0a425d839388c06
Author: Heiko Carstens <heiko.carstens@de.ibm.com>
Date:   Fri May 30 10:03:30 2008 +0200

    [S390] sclp_vt220: fix scheduling while atomic bug.
    
    The driver incorrectly assumed that putchar will only be called from
    schedulable process context and therefore blocked and waited if no
    free output buffers where available.
    Since putchar may also be called from BH context this may lead to
    deadlocks.
    To fix this just return the number of characters accepted and let the
    upper layer handle the rest.
    
    The console write function will busy wait (sclp_sync_wait) until a
    buffer is available again.
    
    Cc: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

commit c1bb7f31eaef6ed6b9f895b99d9ea12e6b853606
Author: Heiko Carstens <heiko.carstens@de.ibm.com>
Date:   Fri May 30 10:03:29 2008 +0200

    [S390] showmem: Only walk spanned pages.
    
    Convert show_mem() so its nearly the same as on x86/powerpc.
    Gives us proper locking and we get also rid of the only use of max_mapnr.
    Also the number of pages was contained in an int which might not be
    sufficient not too far in the future.
    
    Cc: Johannes Weiner <hannes@saeurebad.de>
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

commit 1760537b69123905bf4f4b56f5746ae4547e9694
Author: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Date:   Fri May 30 10:03:28 2008 +0200

    [S390] appldata: prevent cpu hotplug when walking cpu_online_map.
    
    Use get_online_cpus() to prevent cpu hotplug in situations where
    for_each_online_cpu() is called.
    
    Signed-off-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

commit 67060d9c1f5d91c917cc51bed464cb5638eaddbc
Author: Heiko Carstens <heiko.carstens@de.ibm.com>
Date:   Fri May 30 10:03:27 2008 +0200

    [S390] Fix section mismatch warnings.
    
    This fixes the last remaining section mismatch warnings in s390
    architecture code. It reveals also a real bug introduced by... me
    with git commit 2069e978d5a6e7b45d58027e3de7f879b8c5e488
    ("[S390] sparsemem vmemmap: initialize memmap.")
    
    Calling the generic vmemmap_alloc_block() function to get initialized
    memory is a nice idea, however that function is __meminit annotated
    and therefore the function might be gone if we try to call it later.
    This can happen if a DCSS segment gets added.
    
    So basically revert the patch and clear the memmap explicitly to fix
    the original bug.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

commit bebd9a455b2593ba6543b961bc82c43350c2d8d9
Author: Christian Borntraeger <borntraeger@de.ibm.com>
Date:   Fri May 30 10:03:26 2008 +0200

    [S390] s390 types: make dma_addr_t 64 bit capable
    
    virtio tests with guests larger than 4 GB revealed that the dma_addr_t
    definition for s390 did not make it into the 64bit world.
    This patch changes the definition on s390 to have an u64 on 64bit and
    u32 on 32bit systems.
    
    Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

commit f71ad62a264a89cb1952df0c92b167005de8d1b0
Author: Michael Holzheu <holzheu@de.ibm.com>
Date:   Fri May 30 10:03:25 2008 +0200

    [S390] tape: Fix race condition in tape block device driver
    
    Due to incorrect function call sequence it can happen that a tape block
    request is finished before the request is taken from the block request queue.
    
    The following sequence leads to that condition:
     * tapeblock_start_request() -> start CCW program
     * Request finishes -> IO interrupt
     * tapeblock_end_request()
     * end_that_request_last()
    
    If blkdev_dequeue_request() has not been called before end_that_request_last(),
    a kernel bug is triggered in end_that_request_last() because the request is
    still queued. To solve that problem blkdev_dequeue_request() has to be called
    before starting the CCW program.
    
    Signed-off-by: Michael Holzheu <holzheu@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

commit 97195d6b411fec8e33aa55b6a7c3dde7984d65ca
Author: Hans-Joachim Picht <hans@linux.vnet.ibm.com>
Date:   Fri May 30 10:03:24 2008 +0200

    [S390] fix sparsemem related compile error with allnoconfig on s390
    
    On s390 make allnoconfig fails with the following build error:
    
    arch/s390/mm/init.c: In function 'show_mem':
    arch/s390/mm/init.c:55: error: implicit declaration of function 'pfn_valid'
    make[1]: *** [arch/s390/mm/init.o] Error 1
    make: *** [arch/s390/mm] Error 2
    
    This problem can by fixed ensuring that ARCH_SELECT_MEMORY_MODEL
    is always turned on.
    
    Signed-off-by: Hans-Joachim Picht <hans@linux.vnet.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

commit 20887611523e749d99cc7d64ff6c97d27529fbae
Author: Rusty Russell <rusty@rustcorp.com.au>
Date:   Fri May 30 15:09:46 2008 -0500

    lguest: notify on empty
    
    This is the lguest implementation of the VIRTIO_F_NOTIFY_ON_EMPTY feature.
    It is currently only published for network devices, but it is turned on for
    everyone.
    
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit b4f68be6c5d507afdcd74f5be3df0b1209cda503
Author: Rusty Russell <rusty@rustcorp.com.au>
Date:   Fri May 30 15:09:45 2008 -0500

    virtio: force callback on empty.
    
    virtio allows drivers to suppress callbacks (ie. interrupts) for
    efficiency (no locking, it's just an optimization).
    
    There's a similar mechanism for the host to suppress notifications
    coming from the guest: in that case, we ignore the suppression if the
    ring is completely full.
    
    It turns out that life is simpler if the host similarly ignores
    callback suppression when the ring is completely empty: the network
    driver wants to free up old packets in a timely manner, and otherwise
    has to use a timer to poll.
    
    We have to remove the code which ignores interrupts when the driver
    has disabled them (again, it had no locking and hence was unreliable
    anyway).
    
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit 7757f09c70af87887dfc195e6d6ddd54f5cc7c39
Author: Christian Borntraeger <borntraeger@de.ibm.com>
Date:   Thu May 29 11:10:01 2008 +0200

    virtio_blk: fix endianess annotations
    
    Since commit 72e61eb40b55dd57031ec5971e810649f82b0259 (virtio: change config
    to guest endian) config space is no longer fixed endian.
    
    Lets change the virtio_blk_config variables.
    
    Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit 7f31fe05000af54e1af81f65a96cab90db8d7ed8
Author: Christian Borntraeger <borntraeger@de.ibm.com>
Date:   Thu May 29 11:08:01 2008 +0200

    virtio_config: fix len calculation of config elements
    
    Rusty,
    
    This patch is a prereq for the virtio_blk blocksize patch, please apply it
    first.
    
    Adding an u32 value to the virtio_blk_config unconvered a small bug the config
    space defintions:
    v is a pointer, to we have to use sizeof(*v) instead of sizeof(v).
    
    Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit 52a3a05f3ab82655ffa4c9bf6835565c98a3c2e5
Author: Christian Borntraeger <borntraeger@de.ibm.com>
Date:   Mon May 26 11:29:27 2008 +0200

    virtio_net: another race with virtio_net and enable_cb
    
    Hello Rusty,
    
    seems that we still have a problem with virtio_net and the enable_cb callback.
    During a long running network stress tests with virtio and got the following
    oops:
    
    ------------[ cut here ]------------
    kernel BUG at drivers/virtio/virtio_ring.c:230!
    illegal operation: 0001 [#1] SMP
    Modules linked in:
    CPU: 0 Not tainted 2.6.26-rc2-kvm-00436-gc94c08b-dirty #34
    Process netserver (pid: 2582, task: 000000000fbc4c68, ksp: 000000000f42b990)
    Krnl PSW : 0704c00180000000 00000000002d0ec8 (vring_enable_cb+0x1c/0x60)
               R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:0 AS:3 CC:0 PM:0 EA:3
    Krnl GPRS: 0000000000000000 0000000000000000 000000000ef3d000 0000000010009800
               0000000000000000 0000000000419ce0 0000000000000080 000000000000007b
               000000000adb5538 000000000ef40900 000000000ef40000 000000000ef40920
               0000000000000000 0000000000000005 000000000029c1b0 000000000fea7d18
    Krnl Code: 00000000002d0ebc: a7110001           tmll    %r1,1
               00000000002d0ec0: a7740004           brc     7,2d0ec8
               00000000002d0ec4: a7f40001           brc     15,2d0ec6
              >00000000002d0ec8: a517fffe           nill    %r1,65534
               00000000002d0ecc: 40103000           sth     %r1,0(%r3)
               00000000002d0ed0: 07f0               bcr     15,%r0
               00000000002d0ed2: e31020380004       lg      %r1,56(%r2)
               00000000002d0ed8: a7480000           lhi     %r4,0
    Call Trace:
    ([<000000000029c0fc>] virtnet_poll+0x290/0x3b8)
     [<0000000000333fb8>] net_rx_action+0x9c/0x1b8
     [<00000000001394bc>] __do_softirq+0x74/0x108
     [<000000000010d16a>] do_softirq+0x92/0xac
     [<0000000000139826>] irq_exit+0x72/0xc8
     [<000000000010a7b6>] do_extint+0xe2/0x104
     [<0000000000110508>] ext_no_vtime+0x16/0x1a
    Last Breaking-Event-Address:
     [<00000000002d0ec4>] vring_enable_cb+0x18/0x60
    
    I looked into the virtio_net code for some time and I think the following
    scenario happened. Please look at virtnet_poll:
    [...]
            /* Out of packets? */
            if (received < budget) {
                    netif_rx_complete(vi->dev, napi);
                    if (unlikely(!vi->rvq->vq_ops->enable_cb(vi->rvq))
                        && napi_schedule_prep(napi)) {
                            vi->rvq->vq_ops->disable_cb(vi->rvq);
                            __netif_rx_schedule(vi->dev, napi);
                            goto again;
                    }
            }
    
    If an interrupt arrives after netif_rx_complete, a second poll routine can run
    on a different cpu. The second check for napi_schedule_prep would prevent any
    harm in the network stack, but we have called enable_cb possibly after the
    disable_cb in skb_recv_done.
    
    static void skb_recv_done(struct virtqueue *rvq)
    {
            struct virtnet_info *vi = rvq->vdev->priv;
            /* Schedule NAPI, Suppress further interrupts if successful. */
            if (netif_rx_schedule_prep(vi->dev, &vi->napi)) {
                    rvq->vq_ops->disable_cb(rvq);
                    __netif_rx_schedule(vi->dev, &vi->napi);
            }
    }
    
    That means that the second poll routine runs with interrupts enabled, which is
    ok, since we can handle additional interrupts. The problem is now that the
    second poll routine might also call enable_cb, triggering the BUG.
    
    The only solution I can come up with, is to remove the BUG statement in
    enable_cb - similar to disable_cb. Opinions or better ideas where the oops
    could come from?
    
    Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit f7f510ec195781c857ab76366a3e1c59e1caae42
Author: Rusty Russell <rusty@rustcorp.com.au>
Date:   Fri May 30 15:09:44 2008 -0500

    virtio: An entropy device, as suggested by hpa.
    
    Note that by itself, having a "hardware" random generator does very
    little: you should probably run "rngd" in your guest to feed this into
    the kernel entropy pool.
    
    Included:
    	virtio_rng: dont use vmalloced addresses for virtio
    
    	If virtio_rng is build as a module, random_data is an address
    	in vmalloc space. As virtio expects guest real addresses, this
    	can cause any kind of funny behaviour, so lets allocate
    	random_data dynamically with kmalloc.
    
    	Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
    
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit 3ef536095446552823fc488fec1c5451aab1260d
Author: Christian Borntraeger <borntraeger@de.ibm.com>
Date:   Fri May 16 11:17:03 2008 +0200

    virtio_blk: allow read-only disks
    
    Hello Rusty,
    
    sometimes it is useful to share a disk (e.g. usr). To avoid file system
    corruption, the disk should be mounted read-only in that case. This patch
    adds a new feature flag, that allows the host to specify, if the disk should
    be considered read-only.
    
    Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit a16ffe93c46dfca211434d00453ebb695025978b
Author: Rusty Russell <rusty@rustcorp.com.au>
Date:   Fri May 30 15:09:42 2008 -0500

    lguest: fix ugly <NULL> in /proc/interrupts
    
    Before:
    	root@ubuntu:~# cat /proc/interrupts
    	           CPU0
    	  1:       1672    lguest-<NULL>    virtio0
    	  2:          1    lguest-<NULL>    virtio1
    	  ...
    After:
    	root@ubuntu:~# cat /proc/interrupts
    	           CPU0
    	  1:       2889    lguest-level     virtio0
    	  2:          9    lguest-level     virtio1
    
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit b769f579081943f14e0ff03b7b0bd3a11cf14625
Author: Rusty Russell <rusty@rustcorp.com.au>
Date:   Fri May 30 15:09:42 2008 -0500

    virtio: set device index in common code.
    
    Anthony Liguori points out that three different transports use the virtio code,
    but each one keeps its own counter to set the virtio_device's index field.  In
    theory (though not in current practice) this means that names could be
    duplicated, and that risk grows as more transports are created.
    
    So we move the selection of the unique virtio_device.index into the common code
    in virtio.c, which has the side-benefit of removing duplicate code.
    
    The only complexity is that lguest and S/390 use the index to uniquely identify
    the device in case of catastrophic failure before register_virtio_device() is
    called: now we use the offset within the descriptor page as a unique identifier
    for the printks.
    
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Cc: Christian Borntraeger <borntraeger@de.ibm.com>
    Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Cc: Carsten Otte <cotte@de.ibm.com>
    Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
    Cc: Chris Lalancette <clalance@redhat.com>
    Cc: Anthony Liguori <anthony@codemonkey.ws>

commit 5610bd1524332fe7d651eb56cc780e32763a2ac3
Author: Rusty Russell <rusty@rustcorp.com.au>
Date:   Fri May 30 15:09:42 2008 -0500

    virtio: virtio_pci should not set bus_id.
    
    The common virtio code sets the bus_id, overriding anything virtio_pci
    sets anyway.
    
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Cc: Christian Borntraeger <borntraeger@de.ibm.com>
    Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Cc: Carsten Otte <cotte@de.ibm.com>
    Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
    Cc: Chris Lalancette <clalance@redhat.com>
    Cc: Anthony Liguori <anthony@codemonkey.ws>

commit 2ad3cfbac58d0a6c6e65aafd9e0e757ca3d35292
Author: Rusty Russell <rusty@rustcorp.com.au>
Date:   Fri May 30 15:09:41 2008 -0500

    virtio: bus_id for devices should contain 'virtio'
    
    Chris Lalancette <clalance@redhat.com> points out that virtio.c sets all device
    names to '0', '1', etc, which looks silly in /proc/interrupts.  We change this
    from '%d' to 'virtio%d'.
    
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Cc: Christian Borntraeger <borntraeger@de.ibm.com>
    Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Cc: Carsten Otte <cotte@de.ibm.com>
    Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
    Cc: Chris Lalancette <clalance@redhat.com>
    Cc: Anthony Liguori <anthony@codemonkey.ws>

commit ac9d463afb1ca2434335351f3b7d9e4c8f8470e9
Author: Chris Lalancette <clalance@redhat.com>
Date:   Fri May 30 15:09:41 2008 -0500

    Fix crash in virtio_blk during modprobe ; rmmod ; modprobe
    
    Fix a modprobe virtio_blk ; rmmod virtio_blk ; modprobe virtio_blk crash; this
    was basically because we weren't doing "del_gendisk()" in the remove path.
    
    Signed-off-by: Chris Lalancette <clalance@redhat.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (moved del_gendisk up)

commit e27810f11340987df123a99eb9ae14c054a55639
Author: Rusty Russell <rusty@rustcorp.com.au>
Date:   Fri May 30 15:09:40 2008 -0500

    lguest: use ioremap_cache, not ioremap
    
    Thanks to Jon Corbet & LWN.  Only took me a day to join the dots.
    
    Host->Guest netcat before (with unnecessily large receive buffers):
    1073741824 bytes (1.1 GB) copied, 24.7528 seconds, 43.4 MB/s
    
    After:
    1073741824 bytes (1.1 GB) copied, 17.6369 seconds, 60.9 MB/s
    
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit 916941b2bfd9c4a8b66855f198ae16c3f51ef570
Merge: fbf4d7f... 413c239...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu May 29 21:29:39 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:
      driver-core: prepare for 2.6.27 api change by adding dev_set_name

commit fbf4d7ffda0398e8b20aa8b34ca751bf946699ef
Merge: 4bd2797... bb7e698...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu May 29 21:27:53 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:
      Revert "USB: EHCI: fix performance regression"
      USB: fsl_usb2_udc: fix recursive lock
      USB: usb-serial: option: Don't match Huawei driver CD images
      USB: pl2303: another product ID
      USB: add another scanner quirk
      USB: Add support for ROKR W5 in unusual_devs.h
      USB: Fix M600i unusual_devs entry
      USB: usb-storage: unusual_devs update for Cypress ATACB
      USB: EHCI: fix performance regression
      USB: EHCI: fix bug in Iso scheduling
      USB: EHCI: fix remote-wakeup regression
      USB: EHCI: suppress unwanted error messages
      USB: EHCI: fix up root-hub TT mess
      USB: add all configs to the "descriptors" attribute
      USB: fix possible deadlock involving sysfs attributes
      USB: Firmware loader driver for USB Apple iSight camera
      USB: FTDI_SIO : Add support for Matrix Orbital PID Range

commit 413c239fad68258157f903b3ffd9bfcc53f5e34b
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date:   Fri May 30 10:16:40 2008 +1000

    driver-core: prepare for 2.6.27 api change by adding dev_set_name
    
    Create the dev_set_name function now so that various subsystems can
    start changing over to it before other changes in 2.6.27 will make it
    compulsory.
    
    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit bb7e6984ecaebe6989d0e781e303469255871432
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date:   Thu May 29 19:43:27 2008 -0700

    Revert "USB: EHCI: fix performance regression"
    
    This reverts commit fa38dfcc56b5f6cce787f9aaa5d1830509213802.
    
    It wasn't really a regression and David and Alan are still working
    through the issues reported.
    
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 185e3dead35dacb79c8cca1073fd67a26d09a0d7
Author: Li Yang <leoli@freescale.com>
Date:   Thu May 29 21:04:45 2008 +0800

    USB: fsl_usb2_udc: fix recursive lock
    
    UDC needs to release lock before calling out to gadget driver, since
    it may need to reenter.  The change fixes kernel BUG observed on rt
    kernel.
    
    > kernel BUG at kernel/rtmutex.c:683!
    > stopped custom tracer.
    > Oops: Exception in kernel mode, sig: 5 [#1]
    > PREEMPT MPC834x ITX
    > NIP: c021629c LR: c0216270 CTR: 00000000
    > REGS: df761d70 TRAP: 0700   Not tainted  (2.6.23.9-rt13)
    > MSR: 00021032 <ME,IR,DR>  CR: 28000022  XER: 00000000
    > TASK = df632080[241] 'IRQ-38' THREAD: df760000
    > GPR00: 00000001 df761e20 df632080 00000000 11111111 00000000 df761e6c
    > 00000000
    > GPR08: df761e48 00000000 df761e50 00000000 80000000 ede5cdde 1fffd000
    > 00800000
    > GPR16: ffffffff 00000000 007fff00 00000040 00000000 007ffeb0 00000000
    > 1fff8b08
    > GPR24: 00000000 00000026 00000000 df79a320 c026b2e8 c02240bc 00009032
    > df79a320
    > NIP [c021629c] rt_spin_lock_slowlock+0x9c/0x200
    > LR [c0216270] rt_spin_lock_slowlock+0x70/0x200
    > Call Trace:
    > [df761e20] [c0216270] rt_spin_lock_slowlock+0x70/0x200 (unreliable)
    > [df761e90] [c0182828] fsl_ep_disable+0xcc/0x154
    > [df761eb0] [c0184d30] eth_reset_config+0x88/0x1d0
    > [df761ed0] [c0184ec0] eth_disconnect+0x48/0x64
    > [df761ef0] [c01831a4] reset_queues+0x60/0x78
    > [df761f00] [c0183b74] fsl_udc_irq+0x9b8/0xa58
    > [df761f50] [c003ef30] handle_IRQ_event+0x64/0x100
    > [df761f80] [c003f758] thread_simple_irq+0x6c/0xc8
    > [df761fa0] [c003f888] do_irqd+0xd4/0x2e4
    > [df761fd0] [c0032284] kthread+0x50/0x8c
    > [df761ff0] [c000f9b4] kernel_thread+0x44/0x60
    
    Signed-off-by: Li Yang <leoli@freescale.com>
    Cc: Eugene T. Bordenkircher <Eugene_Bordenkircher@selinc.com>
    Acked-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit a7f3872c43b8001f01000f79583d422c6995f98d
Author: Michael Karcher <kernel@mkarcher.dialup.fu-berlin.de>
Date:   Wed May 28 23:58:18 2008 +0200

    USB: usb-serial: option: Don't match Huawei driver CD images
    
    Add the interface info matching to all Huawei cards, as they all also
    contain a Mass Storage Device interface (usually containing Windows
    drivers) which should not get bound by this driver.
    
    See also drivers/usb/storage/unusual_devs.h
    
    Signed-off-by: Michael Karcher <kernel@mkarcher.dialup.fu-berlin.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 4be2fa186d54758296d30c565d7b5111dd45b000
Author: Steve Murphy <steve@gnusis.org>
Date:   Fri May 23 23:39:05 2008 +0530

    USB: pl2303: another product ID
    
    I've just got a USB GPRS/EDGE modem branded Manufacturer Micromax Model
    MMX610U (see http://www.airtel.in/level2_t3data.aspx?path=1/106/179)
    working by adding another product ID to pl2303.  Modem info reports same
    module as  Max Arnold's i.e.SIMCOM SIM600  but  with product ID 0x0612
    (cf Ox0611).
    
    From: Steve Murphy <steve@gnusis.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 598eff6d2f3b8805232edc5f4a6b0c1e698dc482
Author: René Rebe <rene@exactcode.de>
Date:   Tue May 27 09:05:46 2008 +0200

    USB: add another scanner quirk
    
    Like the HP53{00,70} scanner other devices of the OEM Avision require
    the USB_QUIRK_STRING_FETCH_255 to correct set a configuration with
    "recent" Linux kernels.
    
    Signed-off-by: René Rebe <rene@exactcode.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 2a8bc9e7cfb1761a62ea897b407ea13ec887fd0c
Author: Javier Smaldone <javier@smaldone.com.ar>
Date:   Mon May 26 21:44:00 2008 +0200

    USB: Add support for ROKR W5 in unusual_devs.h
    
    This patch adds support for rev 2 of an existing unusual_devs entry
    enabling ROKR W5s to work. Greg, please apply.
    
    From: Javier Smaldone <javier@smaldone.com.ar>
    Signed-off-by: Phil Dibowitz <phil@ipom.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit c5f23b0e08d84f4efc20dece04d7b6796dcc6774
Author: Phil Dibowitz <phil@ipom.com>
Date:   Mon May 26 21:33:58 2008 +0200

    USB: Fix M600i unusual_devs entry
    
    It turns out that the unusual_devs entry for the Motorola M600i needs
    another flag. This patch adds it. Thanks to Atte André Jensen
    <atte@ballbreaker.dk>.
    
    Signed-off-by: Phil Dibowitz <phil@ipom.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit c7257bd2ecb7b4cc42f9f152c7c059258d434169
Author: Alan Stern <stern@rowland.harvard.edu>
Date:   Wed May 21 13:53:01 2008 -0400

    USB: usb-storage: unusual_devs update for Cypress ATACB
    
    This patch (as1101) updates the unusual_devs entry for the Cypress
    ATACB pass-through.  The protocol field is changed from US_PR_BULK to
    US_PR_DEVICE, since the Cypress devices already set bInterfaceProtocol
    to Bulk-only.
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit fa38dfcc56b5f6cce787f9aaa5d1830509213802
Author: Alan Stern <stern@rowland.harvard.edu>
Date:   Tue May 20 16:59:33 2008 -0400

    USB: EHCI: fix performance regression
    
    This patch (as1099) fixes a performance regression in ehci-hcd.  The
    fundamental problem is that queue headers get removed from the
    schedule too quickly, since the code checks for a counter advancing
    rather than making an actual time-based check.  The latency involved
    in removing the queue header and then relinking it can severely
    degrade certain kinds of workloads.
    
    The patch replaces a simple counter with a timestamp derived from the
    controller's uframe value.  In addition, the delay for unlinking an
    idle queue header is increased from 5 ms to 10 ms; since some
    controllers (nVidia) have a latency of up to 1 ms for unlinking, this
    reduces the relative impact from 20% to 10%.
    
    Finally, a logical error left over from the IAA watchdog-timer
    conversion is corrected.  Now the driver will always either unlink an
    idle queue header or set up a timer to unlink it later.  The old code
    would sometimes fail to do either.
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Cc: David Brownell <david-b@pacbell.net>
    Cc: Leonid <leonidv11@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit b40e43fcc532fa44a375a37d592e32cd0d50fe7a
Author: Alan Stern <stern@rowland.harvard.edu>
Date:   Tue May 20 16:59:10 2008 -0400

    USB: EHCI: fix bug in Iso scheduling
    
    This patch (as1098) changes the way ehci-hcd schedules its periodic
    Iso transfers.  That the current scheduling code is wrong is clear on
    the face of it: Sometimes it returns -EL2NSYNC (meaning that an URB
    couldn't be scheduled because it was submitted too late), but it does
    this even when the URB_ISO_ASAP flag is set (meaning the URB should be
    scheduled as soon as possible).
    
    The new code properly implements as-soon-as-possible scheduling,
    assigning the next unexpired slot as the URB's starting point.  It
    also is more careful about checking for Iso URB completion: It doesn't
    bother to check for activity during frames that are already over,
    and it allows for the possibility that some of the URB's packets may
    have raced the hardware when they were submitted and so never got used
    (the packet status is set to -EXDEV).
    
    This fixes problems several people have experienced with USB video
    applications.
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Acked-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit d1f114d12bb4db3147e1b1342ae31083c5a79c84
Author: Alan Stern <stern@rowland.harvard.edu>
Date:   Tue May 20 16:58:58 2008 -0400

    USB: EHCI: fix remote-wakeup regression
    
    This patch (as1097) fixes a bug in the remote-wakeup handling in
    ehci-hcd.  The driver currently does not keep track of whether the
    change-suspend feature is enabled for each port; the feature is
    automatically reset the first time it is read.  But recent changes to
    the hub driver require that the feature be read at least twice in
    order to work properly.
    
    A bit-vector is added for storing the change-suspend feature values.
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Acked-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 3a31155cfff0935e4b178f3dca733d2d60d2eb8d
Author: Alan Stern <stern@rowland.harvard.edu>
Date:   Tue May 20 16:58:29 2008 -0400

    USB: EHCI: suppress unwanted error messages
    
    This patch (as1096) fixes an annoying problem: When a full-speed or
    low-speed device is plugged into an EHCI controller, it fails to
    enumerate at high speed and then is handed over to the companion
    controller.  But usbcore logs a misleading and unwanted error message
    when the high-speed enumeration fails.
    
    The patch adds a new HCD method, port_handed_over, which asks whether
    a port has been handed over to a companion controller.  If it has, the
    error message is suppressed.
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    CC: David Brownell <david-b@pacbell.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit a8e5177583e975fc1f7c621c93956f494df9b979
Author: Alan Stern <stern@rowland.harvard.edu>
Date:   Tue May 20 16:58:11 2008 -0400

    USB: EHCI: fix up root-hub TT mess
    
    This patch (as1095) cleans up the HCD glue and several of the EHCI
    bus-glue files.  The ehci->is_tdi_rh_tt flag is redundant, since it
    means the same thing as the hcd->has_tt flag, so it is removed and the
    other flag used in its place.
    
    Some of the bus-glue files didn't get the relinquish_port method added
    to their hc_driver structures.  Although that routine currently
    doesn't do anything for controllers with an integrated TT, in the
    future it might.  So the patch adds it where it is missing.
    
    Lastly, some of the bus-glue files have erroneous entries for their
    hc_driver's suspend and resume methods.  These method pointers are
    specific to PCI and shouldn't be used otherwise.
    
    (The patch also includes an invisible whitespace fix.)
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Acked-by: David Brownell <dbrownell@users.sourceforge.net>

commit 217a9081d8e69026186067711131b77f0ce219ed
Author: Alan Stern <stern@rowland.harvard.edu>
Date:   Tue May 20 16:40:42 2008 -0400

    USB: add all configs to the "descriptors" attribute
    
    This patch (as1094) changes the output of the "descriptors" binary
    attribute.  Now it will contain the device descriptor followed by all
    the configuration descriptors, not just the descriptor for the current
    config.
    
    Userspace libraries want to have access to the kernel's cached
    descriptor information, so they can learn about device characteristics
    without having to wake up suspended devices.  So far the only user of
    this attribute is the new libusb-1.0 library; thus changing its
    contents shouldn't cause any problems.
    
    This should be considered for 2.6.26, if for no other reason than to
    minimize the range of releases in which the attribute contains only the
    current config descriptor.
    
    Also, it doesn't hurt that the patch removes the device locking --
    which was formerly needed in order to know for certain which config was
    indeed current.
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit e16362a0c8d90e9adbfe477acbe32b021823fb22
Author: Alan Stern <stern@rowland.harvard.edu>
Date:   Tue May 20 16:37:34 2008 -0400

    USB: fix possible deadlock involving sysfs attributes
    
    There is a potential deadlock when the usb_generic driver is unbound
    from a device.  The problem is that generic_disconnect() is called
    with the device lock held, and it removes a bunch of device attributes
    from sysfs.  If a user task happens to be running an attribute method
    at the time, the removal will block until the method returns.  But at
    least one of the attribute methods (the store routine for power/level)
    needs to acquire the device lock!
    
    This patch (as1093) eliminates the deadlock by moving the calls to
    create and remove the sysfs attributes from the usb_generic driver
    into usb_new_device() and usb_disconnect(), where they can be invoked
    without holding the device lock.
    
    Besides, the other sysfs attributes are created when the device is
    registered and removed when the device is unregistered.  So it seems
    only fitting for the extra attributes to be created and removed at the
    same time.
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 62d104d0deeabd4148e49eba729d963e740e205f
Author: Matthew Garrett <mjg59@srcf.ucam.org>
Date:   Tue May 20 20:06:28 2008 +0100

    USB: Firmware loader driver for USB Apple iSight camera
    
    Uninitialised Apple iSight drivers present with a distinctive USB ID.
    Once firmware has been uploaded, they disconnect and reconnect with a
    new ID. At this point they can be driven by the uvcvideo driver. As this
    is unique to the Apple cameras and not functionality shared by any other
    UVC devices, it makes sense to provide the firmware loading
    functionality in a separate driver. This driver will read an isight.fw
    file extracted from the Apple driver using the tools at
    http://bersace03.free.fr/ift/ and upload it to the camera. It will also
    handle the case where the device loses its firmware during hibernation
    and must have it reloaded.
    
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit ebb3770c01a8afd049e3e91b0a026dcdfcb2da9f
Author: Ray Molenkamp <rmolenkamp@matrixorbital.ca>
Date:   Wed May 21 17:06:26 2008 -0600

    USB: FTDI_SIO : Add support for Matrix Orbital PID Range
    
    This patch adds support for the range of PIDs
    that have been allocated for FTDI based devices
    at Matrix Orbital.
    
    A small number of units have been shipped early 2008
    with a faulty USB Descriptor.  Products that may have
    this issue have been marked with the existing quirk to
    work around the problem.
    
    Signed-off-by: R. Molenkamp <rmolenkamp@matrixorbital.ca>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 4bd27972e2c35b1e9e672ff05e0a781644f9c905
Merge: a7f75d3... dca0261...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu May 29 10:04:54 2008 -0700

    Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
    
    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
      [CPUFREQ] fix double unlock of cpu_policy_rwsem in drivers/cpufreq/cpufreq.c

commit a7f75d3bed2871655d9806c62a5d6f46552b9a4a
Merge: 3897b82... 6715930...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu May 29 09:26:17 2008 -0700

    Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      sched: re-tune NUMA topologies
      sched: stop wake_affine from causing serious imbalance
      sched: fix sched_clock_cpu()
      revert ("sched: fair-group: SMP-nice for group scheduling")
      sched: cleanup
      show_schedstat(): fix memleak
      sched: unite unlikely pairs in rt_policy() and schedule_debug()
      revert ("sched: fair: weight calculations")

commit dca026139317dcbc642a30320d551f559692182f
Author: Lothar Waßmann <LW@KARO-electronics.de>
Date:   Thu May 29 17:54:52 2008 +0200

    [CPUFREQ] fix double unlock of cpu_policy_rwsem in drivers/cpufreq/cpufreq.c
    
    In drivers/cpufreq/cpufreq.c the function cpufreq_add_dev() takes the
    error exit 'err_out_unregister' from different places once with the
    'cpu_policy_rwsem' lock held, once with the lock released:
    |		if (ret)
    |			goto err_out_unregister;
    |	}
    |
    |	policy->governor = NULL; /* to assure that the starting sequence is
    |				  * run in cpufreq_set_policy */
    |
    |	/* set default policy */
    |	ret = __cpufreq_set_policy(policy, &new_policy);
    |	policy->user_policy.policy = policy->policy;
    |	policy->user_policy.governor = policy->governor;
    |
    |	unlock_policy_rwsem_write(cpu);
    |
    |	if (ret) {
    |		dprintk("setting policy failed\n");
    |		goto err_out_unregister;
    |	}
    
    This leads to the following error message in case of a failing
    __cpufreq_set_policy() call:
    =====================================
    [ BUG: bad unlock balance detected! ]
    -------------------------------------
    swapper/1 is trying to release lock (&per_cpu(cpu_policy_rwsem, cpu)) at:
    [<c01b4564>] unlock_policy_rwsem_write+0x30/0x40
    but there are no more locks to release!
    
    other info that might help us debug this:
    1 lock held by swapper/1:
     #0:  (sysdev_drivers_lock){--..}, at: [<c018fd18>] sysdev_driver_register+0x74/0x130
    
    stack backtrace:
    [<c002f588>] (dump_stack+0x0/0x14) from [<c00692fc>] (print_unlock_inbalance_bug+0xc8/0x104)
    [<c0069234>] (print_unlock_inbalance_bug+0x0/0x104) from [<c006b7ac>] (lock_release_non_nested+0xc4/0x19c)
     r6:00000028 r5:c3c1ab80 r4:c01b4564
    [<c006b6e8>] (lock_release_non_nested+0x0/0x19c) from [<c006b9e0>] (lock_release+0x15c/0x18c)
     r8:60000013 r7:00000001 r6:c01b4564 r5:c0541bb4 r4:c3c1ab80
    [<c006b884>] (lock_release+0x0/0x18c) from [<c0061ba0>] (up_write+0x24/0x30)
     r8:c0541b80 r7:00000000 r6:ffffffea r5:c3c34828 r4:c0541b8c
    [<c0061b7c>] (up_write+0x0/0x30) from [<c01b4564>] (unlock_policy_rwsem_write+0x30/0x40)
     r4:c3c34884
    [<c01b4534>] (unlock_policy_rwsem_write+0x0/0x40) from [<c01b4c40>] (cpufreq_add_dev+0x324/0x398)
    [<c01b491c>] (cpufreq_add_dev+0x0/0x398) from [<c018fd64>] (sysdev_driver_register+0xc0/0x130)
    [<c018fca4>] (sysdev_driver_register+0x0/0x130) from [<c01b3574>] (cpufreq_register_driver+0xbc/0x174)
    
    Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
    Signed-off-by: Dave Jones <davej@redhat.com>

commit 6715930654e06c4d2e66e718ea159079f71838f4
Merge: ea3f01f... e490517...
Author: Ingo Molnar <mingo@elte.hu>
Date:   Thu May 29 16:05:05 2008 +0200

    Merge commit 'linus/master' into sched-fixes-for-linus

commit ea3f01f8afd3bc5daff915cc4ea5cc5ea9e7d427
Author: Ingo Molnar <mingo@elte.hu>
Date:   Thu May 29 14:32:23 2008 +0200

    sched: re-tune NUMA topologies
    
    improve the sysbench ramp-up phase and its peak throughput on
    a 16way NUMA box, by turning on WAKE_AFFINE:
    
                 tip/sched   tip/sched+wake-affine
    -------------------------------------------------
        1:             700              830    +15.65%
        2:            1465             1391    -5.28%
        4:            3017             3105    +2.81%
        8:            5100             6021    +15.30%
       16:           10725            10745    +0.19%
       32:           10135            10150    +0.16%
       64:            9338             9240    -1.06%
      128:            8599             8252    -4.21%
      256:            8475             8144    -4.07%
    -------------------------------------------------
      SUM:           57558            57882    +0.56%
    
    this change also improves lat_ctx from 6.69 usecs to 1.11 usec:
    
      $ ./lat_ctx -s 0 2
      "size=0k ovr=1.19
      2 1.11
    
      $ ./lat_ctx -s 0 2
      "size=0k ovr=1.22
      2 6.69
    
    in sysbench it's an overall win with some weakness at the lots-of-clients
    side. That happens because we now under-balance this workload
    a bit. To counter that effect, turn on NEWIDLE:
    
                  wake-idle          wake-idle+newidle
     -------------------------------------------------
         1:             830              834    +0.43%
         2:            1391             1401    +0.65%
         4:            3105             3091    -0.43%
         8:            6021             6046    +0.42%
        16:           10745            10736    -0.08%
        32:           10150            10206    +0.55%
        64:            9240             9533    +3.08%
       128:            8252             8355    +1.24%
       256:            8144             8384    +2.87%
     -------------------------------------------------
       SUM:           57882            58591    +1.21%
    
    as a bonus this not only improves the many-clients case but
    also improves the (more important) rampup phase.
    
    sysbench is a workload that quickly breaks down if the
    scheduler over-balances, so since it showed an improvement
    under NEWIDLE this change is definitely good.

commit 12293bf91126ad253a25e2840b307fdc7c2754c3
Author: Alexey Dobriyan <adobriyan@parallels.com>
Date:   Thu May 29 03:19:37 2008 -0700

    netfilter: nf_conntrack_expect: fix error path unwind in nf_conntrack_expect_init()
    
    Signed-off-by: Alexey Dobriyan <adobriyan@parallels.com>
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit b3137bc8e77962a8e3b4dfdc1bcfd38e437bd278
Author: Mike Galbraith <efault@gmx.de>
Date:   Thu May 29 11:11:41 2008 +0200

    sched: stop wake_affine from causing serious imbalance
    
    Prevent short-running wakers of short-running threads from overloading a single
    cpu via wakeup affinity, and wire up disconnected debug option.
    
    Signed-off-by: Mike Galbraith <efault@gmx.de>
    Signed-off-by: Peter Zijlstra <peterz@infradead.org>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit a381759d6ad5c5dea5a981918e0b4493e9b66ac7
Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date:   Thu May 29 10:07:15 2008 +0200

    sched: fix sched_clock_cpu()
    
    Make sched_clock_cpu() return 0 before it has been initialized and avoid
    corrupting its state due to doing so.
    
    This fixes the weird printk timestamp jump reported.
    
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>

commit 6363ca57c76b7b83639ca8c83fc285fa26a7880e
Author: Ingo Molnar <mingo@elte.hu>
Date:   Thu May 29 11:28:57 2008 +0200

    revert ("sched: fair-group: SMP-nice for group scheduling")
    
    Yanmin Zhang reported:
    
    Comparing with 2.6.25, volanoMark has big regression with kernel 2.6.26-rc1.
    It's about 50% on my 8-core stoakley, 16-core tigerton, and Itanium Montecito.
    
    With bisect, I located the following patch:
    
    | 18d95a2832c1392a2d63227a7a6d433cb9f2037e is first bad commit
    | commit 18d95a2832c1392a2d63227a7a6d433cb9f2037e
    | Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
    | Date:   Sat Apr 19 19:45:00 2008 +0200
    |
    |     sched: fair-group: SMP-nice for group scheduling
    
    Revert it so that we get v2.6.25 behavior.
    
    Bisected-by: Yanmin Zhang <yanmin_zhang@linux.intel.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 4285f594f84d1f0641fc962d00e6638dec4a19c4
Author: Ingo Molnar <mingo@elte.hu>
Date:   Fri May 16 17:47:14 2008 +0200

    sched: cleanup
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit c6fba5451a84143f34056a465e72ba187fcc651c
Author: Adrian Bunk <bunk@kernel.org>
Date:   Wed May 14 16:22:59 2008 -0700

    show_schedstat(): fix memleak
    
    The Coverity checker spotted a memleak introduced by commit
    39106dcf85285e78f3b290022122c76f851379b8 (cpumask: use new cpus_scnprintf
    function).
    
    It seems the kfree() got lost between v2 and v3 of this patch...
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Cc: Mike Travis <travis@sgi.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 3f33a7ce9567ded582af1ab71f9802165fe12f09
Author: Roel Kluin <roel.kluin@gmail.com>
Date:   Tue May 13 23:44:11 2008 +0200

    sched: unite unlikely pairs in rt_policy() and schedule_debug()
    
    Removes obfuscation and may improve assembly.
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit f9305d4a0968201b2818dbed0dc8cb0d4ee7aeb3
Author: Ingo Molnar <mingo@elte.hu>
Date:   Thu May 29 11:23:17 2008 +0200

    revert ("sched: fair: weight calculations")
    
    Yanmin Zhang reported:
    
    Comparing with kernel 2.6.25, sysbench+mysql(oltp, readonly) has many
    regressions with 2.6.26-rc1:
    
     1) 8-core stoakley: 28%;
     2) 16-core tigerton: 20%;
     3) Itanium Montvale: 50%.
    
    Bisect located this patch:
    
    | 8f1bc385cfbab474db6c27b5af1e439614f3025c is first bad commit
    | commit 8f1bc385cfbab474db6c27b5af1e439614f3025c
    | Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
    | Date:   Sat Apr 19 19:45:00 2008 +0200
    |
    |     sched: fair: weight calculations
    
    Revert it to the 2.6.25 state.
    
    Bisected-by: Yanmin Zhang <yanmin_zhang@linux.intel.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 8c3a01d0c259ec8b283c52dbeadda0122582a68b
Merge: 4c8411f... c97c23e...
Author: David S. Miller <davem@davemloft.net>
Date:   Thu May 29 01:49:04 2008 -0700

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

commit 4c8411f8c115def968820a4df6658ccfd55d7f1a
Author: Arjan van de Ven <arjan@linux.intel.com>
Date:   Thu May 29 01:32:47 2008 -0700

    bluetooth: fix locking bug in the rfcomm socket cleanup handling
    
    in net/bluetooth/rfcomm/sock.c, rfcomm_sk_state_change() does the
    following operation:
    
            if (parent && sock_flag(sk, SOCK_ZAPPED)) {
                    /* We have to drop DLC lock here, otherwise
                     * rfcomm_sock_destruct() will dead lock. */
                    rfcomm_dlc_unlock(d);
                    rfcomm_sock_kill(sk);
                    rfcomm_dlc_lock(d);
            }
    }
    
    which is fine, since rfcomm_sock_kill() will call sk_free() which will call
    rfcomm_sock_destruct() which takes the rfcomm_dlc_lock()... so far so good.
    
    HOWEVER, this assumes that the rfcomm_sk_state_change() function always gets
    called with the rfcomm_dlc_lock() taken. This is the case for all but one
    case, and in that case where we don't have the lock, we do a double unlock
    followed by an attempt to take the lock, which due to underflow isn't
    going anywhere fast.
    
    This patch fixes this by moving the stragling case inside the lock, like
    the other usages of the same call are doing in this code.
    
    This was found with the help of the www.kerneloops.org project, where this
    deadlock was observed 51 times at this point in time:
    http://www.kerneloops.org/search.php?search=rfcomm_sock_destruct
    
    Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
    Acked-by: Marcel Holtmann <marcel@holtmann.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit c97c23e38625f59e3e9869664eeeb0cab1822948
Author: Senthil Balasubramanian <senthilkumar@atheros.com>
Date:   Wed May 28 23:15:32 2008 +0530

    mac80211: fix alignment issue with compare_ether_addr()
    
    This addresses an alignment issue with compare_ether_addr().
    The addresses passed to compare_ether_addr should be two bytes aligned.
    It may function properly in x86 platform. However may not work properly
    on IA-64 or ARM processor.
    
    This also fixes a typo in mlme.c where the sk_buff struct name is incorect.
    Though sizeof() works for any incorrect structure pointer name as its just
    a pointer length that we want, lets just fix it.
    
    Signed-off-by: Senthil Balasubramanian <senthilkumar@atheros.com>
    Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 70d251b24c44ab2fcba1807a5206e844cf10eb38
Author: Senthil Balasubramanian <senthilkumar@atheros.com>
Date:   Wed May 28 20:08:12 2008 +0530

    mac80211: Fix for NULL pointer dereference in sta_info_get()
    
    This addresses a NULL pointer dereference in sta_info_get().
    TID and sta_info are extracted in ADDBA Timer expiry function
    through the timer handler's argument.
    
    The problem is extracging the TID (which was stored in
    timer_to_tid[] array of type "u8") through "int *" typecast which
    may also yield unwanted bytes for the MSB of TID that results
    in incorrect sta_info and ieee80211_local pointers.
    
    ieee80211_local pointer is NULL as illustrated below, it crashes in
    sta_info_get(). The problem started when extracting ieee80211_local
    pointer out of sta_info iteself and eventually crashed in
    stat_info_get().
    
    The proper way to fix is to change the data type of TID to u8
    instead of u16. However changing all the occurences requires
    some prototype changes as well. We should fix this in upcoming
    patches.
    
    Signed-off-by: Senthil Balasubramanian <senthilkumar@atheros.com>
    Signed-off-by: Luis Rodriguez <lrodriguez@atheros.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit f6d97104890203ba9c2cf8e34894c4c8e64cb880
Author: Yi Zhu <yi.zhu@intel.com>
Date:   Tue May 27 17:50:50 2008 +0300

    mac80211: fix a typo in ieee80211_handle_filtered_frame comment
    
    fix a typo in ieee80211_handle_filtered_frame comment
    
    Signed-off-by: Yi Zhu <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit a7624837261b55259d4a88309fd88529643fbb80
Author: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Date:   Tue May 27 11:15:08 2008 +0300

    rndis_wlan: add missing range check for power_output modparam
    
    Range check for power_output were missing.
    
    Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 135a5484c3e0c6710035630b630cef3c856b78e2
Author: Guy Cohen <guy.cohen@intel.com>
Date:   Tue May 27 11:29:35 2008 +0800

    iwlwifi: fix rate scale TLC column selection bug
    
    This patch fixes a case that a wrong maximal rate is selected when
    searching for better configurations.
    
    Signed-off-by: Guy Cohen <guy.cohen@intel.com>
    Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 47cfd463962ab0748ecbad761ff6ef2916b54aac
Author: Guy Cohen <guy.cohen@intel.com>
Date:   Tue May 27 11:29:34 2008 +0800

    iwlwifi: fix exit from stay_in_table state
    
    When exiting from stay in table state (e.g. timer expiration),
    all the statistics are reset and the RS flow should not continue
    but only after enough statistics are collected again.
    
    Signed-off-by: Guy Cohen <guy.cohen@intel.com>
    Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 4364623cb79d02945ace7a4faa1f11e617dde198
Author: Scott Ashcroft <scott.ashcroft@talk21.com>
Date:   Tue May 27 00:06:15 2008 +0300

    rndis_wlan: Make connections to TKIP PSK networks work
    
    This patch allows the rndis_wlan driver to connect to TKIP PSK
    networks.  It uses the ASSOCIATION_INFORMATION RNDIS call to pull back
    the IEs and sends them back to userspace using wireless events. Tested
    on a few wireless networks I have access to. Based on the similar
    code in ndiswrapper.
    
    Signed-off-by: Scott Ashcroft <scott.ashcroft@talk21.com>
    [edit: cleanups]
    Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit d4231ca3e162387a2b6964dacaa83604e065c4e9
Author: Abhijeet Kolekar <abhijeet.kolekar@intel.com>
Date:   Fri May 23 10:15:26 2008 -0700

    mac80211 : Fixes the status message for iwconfig
    
    iwconfig was showing incorrect status messages when disassociated.
    Patch fixes this by always checking for association status in
    ioctl calls for getting ap address.
    
    Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar@intel.com>
    Acked-by: Dan Williams <dcbw@redhat.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 633257d3db547e7553500f05e0aa2692c876d7a5
Author: Ivo van Doorn <ivdoorn@gmail.com>
Date:   Fri May 23 18:14:02 2008 +0200

    rt2x00: Use atomic interface iteration in irq context
    
    rt2x00lib_beacondone() is called from interrupt context,
    this means we cannot use the mac80211 interface iterator
    that uses the rtnl lock (since that uses a mutex which can sleep).
    Instead we should use the atomic mac80211 interface iterator.
    
    Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit f06a0f486dc8bbe8808f46b81fbfd73241529fae
Author: Ivo van Doorn <ivdoorn@gmail.com>
Date:   Fri May 23 18:13:56 2008 +0200

    rt2x00: Reset antenna RSSI after switch
    
    When the antenna configuration has changed we should reset
    the antenna RSSI value. Otherwise the value will be influenced
    by the previous configuration quality which in turn will affect
    the antenna diversity.
    
    Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 2088d4174e4292aef892bb7095fc3c3ea5bd117c
Author: Ivo van Doorn <ivdoorn@gmail.com>
Date:   Fri May 23 18:13:49 2008 +0200

    rt2x00: Don't count retries as failure
    
    Link quality estimation became quite low for all rt2x00 drivers
    because the number of retries it took to send the frame were
    counted as failure.
    This does not correspond to the legacy driver link quality calculation,
    by not counting it we will send somewhat more optimistic values to
    mac80211.
    
    Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 0f3e63a55b1a7b695a79bf3eec2ff5ab6b336037
Author: Ivo van Doorn <ivdoorn@gmail.com>
Date:   Fri May 23 18:13:41 2008 +0200

    rt2x00: Fix memleak in tx() path
    
    When the tx() handler runs while the device has disapeared,
    we did return NETDEV_TX_OK but didn't free the skb.
    
    Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 9381be059bf5831d259e8735005cfa35b7488543
Author: Tomas Winkler <tomas.winkler@intel.com>
Date:   Fri May 23 01:36:36 2008 +0300

    mac80211: reorder channel and freq reporting in wext scan report
    
    This patch switch order of channel and freq (SIOCGIWFREQ) reports
    in scan results in order to overcome wpa_supplicant inability
    to handle channel numbers in 5.2Ghz band.
    Wext reporting channel number is ambiguous as channels 7-12 (802.11j)
    exist on both bands.
    
    Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
    Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
    Acked-by: Dan Williams <dcbw@redhat.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 3bf0a32e22fedc0b46443699db2d61ac2a883ac4
Author: Michael Buesch <mb@bu3sch.de>
Date:   Thu May 22 16:32:16 2008 +0200

    b43: Fix controller restart crash
    
    This fixes a kernel crash on rmmod, in the case where the controller
    was restarted before doing the rmmod.
    
    Signed-off-by: Michael Buesch <mb@bu3sch.de>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 167ad6f7a2b2ae58dfaa46620b9b3212594f38e6
Author: Tomas Winkler <tomas.winkler@intel.com>
Date:   Wed May 21 18:17:05 2008 +0300

    mac80211: fix ieee80211_rx_bss_put/get imbalance
    
    This patch fixes iee80211_rx_bss_put/get imbalance
    introduced by 'mac80211: enable IBSS merging' patch.
    
    Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 679fda1aa49fddf938bb699df7867c01988371ab
Author: Nicolas Kaiser <nikai@nikai.net>
Date:   Tue May 20 18:42:54 2008 +0200

    net/mac80211: always true conditionals
    
    Correct always true conditionals.
    
    Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 6b4bec010d888c5b8c731aa596635cd83dd3416c
Author: Michael Buesch <mb@bu3sch.de>
Date:   Tue May 20 12:16:28 2008 +0200

    b43: Upload both beacon templates on initial load
    
    This updates the beacon template code to upload both templates,
    if we never uploaded one before.
    
    Signed-off-by: Michael Buesch <mb@bu3sch.de>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit bc1b1fb2753873314ad1bf56bc7d5b8dd447cd2a
Author: Andrea Merello <andrea.merello@gmail.com>
Date:   Sat May 10 13:34:16 2008 +0200

    rtl8180: fix wrong parameter in grf5101_rf_set_channel
    
    The grf5101 RF code needs to invoke grf5101_write_phy_antenna every time the
    channel is being switch.
    
    This should be done passing the channel number to that function.
    Incorrectly we were passing the same value that is written on the
    channel RF register.
    This may cause problems when operating on ch 14.
    
    This patch fixes it.
    
    Thanks to Alessandro Di Marco who found this issue!
    
    Signed-off-by: Andrea Merello <andreamrl@tiscali.it>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 0a0ab41e833c8184c6d4ab663f137d5bbd50e049
Author: Andrea Merello <andrea.merello@gmail.com>
Date:   Sat May 10 13:32:34 2008 +0200

    rtl8180: fix wrong parameter in max2820_rf_set_channel
    
    The max2820 RF code needs to invoke max2820_write_phy_antenna every time the
    channel is being switch.
    
    This should be done passing the channel number to that function.
    Incorrectly we were passing the same value that is written on the
    channel RF register.
    This may cause problems when operating on ch 14.
    
    This patch fixes it.
    
    Thanks to Alessandro Di Marco who found this issue!
    
    Signed-off-by: Andrea Merello <andreamrl@tiscali.it>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 0823b2c3c10a4db21cd39a8c72cda96b4dd6d914
Author: Andrea Merello <andreamrl@tiscali.it>
Date:   Sat May 10 13:30:12 2008 +0200

    rtl8180: fix wrong parameter in sa2400_rf_set_channel
    
    The sa2400 RF code needs to invoke sa2400_write_phy_antenna every time the
    channel is being switch.
    
    This should be done passing the channel number to that function.
    Incorrectly we were passing the same value that is written on the
    channel RF register.
    This may cause problems when operating on ch 14.
    
    This patch fixes it.
    
    Thanks to Alessandro Di Marco who found this issue!
    
    Signed-off-by: Andrea Merello <andreamrl@tiscali.it>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 6f6c218f68e632e4596cae6e6d43658d26a5e0fe
Author: John W. Linville <linville@tuxdriver.com>
Date:   Tue May 27 17:01:55 2008 -0400

    rtl8180: avoid NULL dereference in max2820_rf_set_channel
    
    The static function max2820_rf_set_channel is called with conf == NULL
    within its compilation unit.  Originally this defaulted to b/g channel
    1, but "cfg80211 API for channels/bitrates, mac80211 and driver
    conversion" (commit 8318d78a44d49ac1edf2bdec7299de3617c4232e) mistakenly
    dropped this check.  This patch minimally restores the expected
    behavior.
    
    Reported-by: Colin Lai <colin_sh@163.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 3897b82c3586e774260d6bca56cc1efca79cd335
Merge: 0a2ce2f... 4dcc29e...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed May 28 12:58:12 2008 -0700

    Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
      [IA64] Workaround for RSE issue

commit 471637a575329f9250e7e4099e84084820a35e11
Author: Antonio Ospite <ospite@studenti.unina.it>
Date:   Wed May 28 14:35:52 2008 -0400

    Input: pxa27x_keypad - miscellaneous fixes
    
    1. Set input bits for direct keys codes
    2. Set input bits for rotary encoder codes only if rotary
       encoder is enabled
    3. Enable EV_REL only if rotary encoder is enabled and rel_codes
       are set up
    
    Signed-off-by: Antonio Ospite <ao2@openezx.org>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit 0a2ce2ffc358da96792d514c1024b72c52be9cc1
Author: David Howells <dhowells@redhat.com>
Date:   Wed May 28 16:49:01 2008 +0100

    Fix FRV minimum slab/kmalloc alignment
    
    > +#define	ARCH_KMALLOC_MINALIGN		(sizeof(long) * 2)
    > +#define	ARCH_SLAB_MINALIGN		(sizeof(long) * 2)
    
    This doesn't work if SLAB is selected and slab debugging is enabled as
    these are passed to the preprocessor, and the preprocessor doesn't
    understand sizeof.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit b4412323cc954bd0a2144b1c2ed573dd2eddb32c
Merge: dc1d60a... d6de8be...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed May 28 08:00:51 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
    
    * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
      cfq-iosched: fix RCU problem in cfq_cic_lookup()
      block: make blktrace use per-cpu buffers for message notes
      Added in elevator switch message to blktrace stream
      Added in MESSAGE notes for blktraces
      block: reorder cfq_queue to save space on 64bit builds
      block: Move the second call to get_request to the end of the loop
      splice: handle try_to_release_page() failure
      splice: fix sendfile() issue with relay

commit dc1d60a014aa9614518f9856ff661716d0969ffd
Author: David Howells <dhowells@redhat.com>
Date:   Wed May 28 15:36:34 2008 +0100

    FRV: Specify the minimum slab/kmalloc alignment
    
    Specify the minimum slab/kmalloc alignment to be 8 bytes.  This fixes a
    crash when SLOB is selected as the memory allocator.  The FRV arch needs
    this so that it can use the load- and store-double instructions without
    faulting.  By default SLOB sets the minimum to be 4 bytes.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 5e55843bb8ed1ec7d134a759c53e34beb1618952
Author: Vegard Nossum <vegard.nossum@gmail.com>
Date:   Wed May 28 13:55:24 2008 +0100

    MN10300: Fix typo in header guard
    
    Fix a typo in the header guard of asm/ipc.h.
    
    Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit d6de8be711b28049a5cb93c954722c311c7d3f7f
Author: Jens Axboe <jens.axboe@oracle.com>
Date:   Wed May 28 14:46:59 2008 +0200

    cfq-iosched: fix RCU problem in cfq_cic_lookup()
    
    cfq_cic_lookup() needs to properly protect ioc->ioc_data before
    dereferencing it and also exclude updaters of ioc->ioc_data as well.
    
    Also add a number of comments documenting why the existing RCU usage
    is OK.
    
    Thanks a lot to "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> for
    review and comments!
    
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit 64565911cdb57c2f512a9715b985b5617402cc67
Author: Jens Axboe <jens.axboe@oracle.com>
Date:   Wed May 28 14:45:33 2008 +0200

    block: make blktrace use per-cpu buffers for message notes
    
    Currently it uses a single static char array, but that risks
    being corrupted when multiple users issue message notes at the
    same time. Make the buffers dynamically allocated when the trace
    is setup and make them per-cpu instead.
    
    The default max message size of 1k is also very large, the
    interface is mainly for small text notes. So shrink it to 128 bytes.
    
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit 4722dc52a891ab6cb2d637ddb87233e0ce277827
Author: Alan D. Brunelle <Alan.Brunelle@hp.com>
Date:   Tue May 27 14:55:00 2008 +0200

    Added in elevator switch message to blktrace stream
    
    Signed-off-by: Alan D. Brunelle <alan.brunelle@hp.com>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit 9d5f09a424a67ddb959829894efb4c71cbf6d600
Author: Alan D. Brunelle <Alan.Brunelle@hp.com>
Date:   Tue May 27 14:54:41 2008 +0200

    Added in MESSAGE notes for blktraces
    
    Allows messages to be inserted into blktrace streams.
    
    Signed-off-by: Alan D. Brunelle <alan.brunelle@hp.com>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit be754d2c2161c0cce11d62727016985ecb76831b
Author: Richard Kennedy <richard@rsk.demon.co.uk>
Date:   Fri May 23 06:52:00 2008 +0200

    block: reorder cfq_queue to save space on 64bit builds
    
    saves 8 bytes of padding & increases objects/slab from 30 to 32 on my
    AMD64 config
    
    Signed-off-by: Richard Kennedy <richard@rsk.demon.co.uk>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit 05caf8dbc1880415df3378cfd114d832c9618b60
Author: Zhang, Yanmin <yanmin_zhang@linux.intel.com>
Date:   Thu May 22 15:13:29 2008 +0200

    block: Move the second call to get_request to the end of the loop
    
    In function get_request_wait, the second call to get_request could be
    moved to the end of the while loop, because if the first call to
    get_request fails, the second call will fail without sleep.
    
    Signed-off-by: Zhang Yanmin <yanmin.zhang@intel.com>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit ca39d651d17df49b6d11f851d56c0ce0ce01ea1a
Author: Jens Axboe <jens.axboe@oracle.com>
Date:   Tue May 20 21:27:41 2008 +0200

    splice: handle try_to_release_page() failure
    
    splice currently assumes that try_to_release_page() always suceeds,
    but it can return failure. If it does, we cannot steal the page.
    
    Acked-by: Mingming Cao <cmm@us.ibm.com
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit a82c53a0e3f57f02782330372b7adad67b417645
Author: Tom Zanussi <zanussi@comcast.net>
Date:   Fri May 9 13:28:36 2008 +0200

    splice: fix sendfile() issue with relay
    
    Splice isn't always incrementing the ppos correctly, which broke
    relay splice.
    
    Signed-off-by: Tom Zanussi <zanussi@comcast.net>
    Tested-by: Dan Williams <dan.j.williams@intel.com>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit 57f5b1590f2d801a3a7f072e2c65f14d4545852c
Author: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date:   Wed May 28 00:54:01 2008 -0400

    Input: atkbd - mark keyboard as disabled when suspending/unloading
    
    This will shut off garbage that may come from KBD port during resume.
    
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit 1ec7d99c16e69a9ed8ffeaa6c1846025b84bebad
Merge: 3dbfd08... 9e4f2e8...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue May 27 18:47:59 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:
      pciehp: add message about pciehp_slot_with_bus option
      pci hotplug core: add check of duplicate slot name
      pciehp: move msleep after power off
      pciehp: poll cmd completion if hotplug interrupt is disabled
      pciehp: fix slow probing
      pciehp: fix NULL dereference in interrupt handler
      shpchp: add message about shpchp_slot_with_bus option
      PCI: don't enable ASPM on devices with mixed PCIe/PCI functions

commit 9e4f2e8d4ddb04ad16a3828cd9a369a5a5287009
Author: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Date:   Tue May 27 19:07:33 2008 +0900

    pciehp: add message about pciehp_slot_with_bus option
    
    Some (broken?) platform assign the same slot name to multiple hotplug
    slots. On such system, slot initialization would fail because of name
    collision. The pciehp driver already have a "slot_with_bus" module
    option which adds the bus number into the slot name. This patch adds
    the message about this module option that will be displayed when slot
    name collision is detected.
    
    Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
    Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit a86161b3134465f072d965ca7508ec9c1e2e52c7
Author: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Date:   Tue May 27 19:07:01 2008 +0900

    pci hotplug core: add check of duplicate slot name
    
    Fix the following errors reported by Jan C. Nordholz in
    http://bugzilla.kernel.org/show_bug.cgi?id=10751.
    
    kobject_add_internal failed for 2 with -EEXIST, don't try to register things with the same name in the same directory.
    Pid: 1, comm: swapper Tainted: G        W 2.6.26-rc3 #1
     [<c0266980>] kobject_add_internal+0x140/0x190
     [<c0266afd>] kobject_init_and_add+0x2d/0x40
     [<c027bc91>] pci_hp_register+0x81/0x2f0
     [<c027fd07>] pciehp_probe+0x1a7/0x470
     [<c01b3b84>] sysfs_add_one+0x44/0xa0
     [<c01b3c1f>] sysfs_addrm_start+0x3f/0xb0
     [<c01b497a>] sysfs_create_link+0x8a/0xf0
     [<c0279570>] pcie_port_probe_service+0x50/0x80
     [<c02e0545>] driver_sysfs_add+0x55/0x70
     [<c02e0662>] driver_probe_device+0x82/0x180
     [<c02e07cc>] __driver_attach+0x6c/0x70
     [<c02dfe0a>] bus_for_each_dev+0x3a/0x60
     [<c05db2d0>] pcied_init+0x0/0x80
     [<c02e04e6>] driver_attach+0x16/0x20
     [<c02e0760>] __driver_attach+0x0/0x70
     [<c02e0341>] bus_add_driver+0x1a1/0x220
     [<c05db2d0>] pcied_init+0x0/0x80
     [<c02e09cd>] driver_register+0x4d/0x120
     [<c05db050>] ibm_acpiphp_init+0x0/0x190
     [<c0125aab>] printk+0x1b/0x20
     [<c05db2d0>] pcied_init+0x0/0x80
     [<c05db2de>] pcied_init+0xe/0x80
     [<c05c751a>] kernel_init+0x10a/0x300
     [<c0120138>] schedule_tail+0x18/0x50
     [<c0103b9a>] ret_from_fork+0x6/0x1c
     [<c05c7410>] kernel_init+0x0/0x300
     [<c05c7410>] kernel_init+0x0/0x300
     [<c010485b>] kernel_thread_helper+0x7/0x1c
     =======================
    pci_hotplug: Unable to register kobject '2'<3>pciehp: pci_hp_register failed with error -22
    
    Slot with the same name can be registered multiple times if shpchp or
    pciehp driver is loaded after acpiphp is loaded because ACPI based
    hotplug driver and Native OS hotplug driver trying to handle the same
    physical slot. In this case, current pci_hotplug core will call
    kobject_init_and_add() muliple time with the same name. This is the
    cause of this problem. To fix this problem, this patch adds the check
    into pci_hp_register() to see if the slot with the same name.
    
    Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
    Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit 0711c70ec0e9d2c002b1e9b5fb9f21e49d77f4fd
Author: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Date:   Tue May 27 19:06:22 2008 +0900

    pciehp: move msleep after power off
    
    According to the PCI Express specification, we must wait for at least
    1 second after turning power off before taking any action that relies
    on power having been removed from the slot/adapter. For this, current
    pciehp wait for 1 second after issuing the power off command in
    hpc_power_off_slot() function. But waiting for 1 second in
    hpc_power_off_slot() can make pciehp probing slow-down because pciehp
    probe code calls hpc_power_off_slot() if the slot is not occupied just
    in case. We don't need to wait for 1 second at the pciehp probe time
    because there is no action on that empty slot. So move 1 second wait
    from hpc_power_off_slot() to the caller of hpc_power_off_slot().
    
    Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
    Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit 6592e02ae4bd7b277230aa0c5821588a13b9d8e3
Author: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Date:   Tue May 27 19:05:26 2008 +0900

    pciehp: poll cmd completion if hotplug interrupt is disabled
    
    Fix improper long wait for command completion in pciehp probing.
    
    As described in PCI Express specification, software notification is
    not generated if the command that occurs as a result of a write to the
    Slot Control register that disables software notification of command
    completed events. Since pciehp driver doesn't take it into account,
    such command is issued in pciehp probing, and it causes improper long
    wait for command completion.
    
    This patch changes the pciehp driver to take such command into
    account.
    
    Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
    Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit 5808639bfa98d69f77a481d759570d85f164fea0
Author: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Date:   Tue May 27 19:04:30 2008 +0900

    pciehp: fix slow probing
    
    Fix the "pciehp probing slow" problem reported from Jan C. Nordholz in
    http://bugzilla.kernel.org/show_bug.cgi?id=10751.
    
    The command completed bit in Slot Status register applies only to
    commands issued to control the attention indicator, power indicator,
    power controller, or electromechanical interlock. However, writes to
    other parts of the Slot Control register would end up writing to the
    control fields. Hence, any write to Slot Control register is
    considered as a command. However, if the controller doesn't support
    any of attention indicator, power indicator, power controller and
    electromechanical interlock, command completed bit would not set in
    writing to Slot Control register. In this case, we should not wait for
    command completed bit set, otherwise all commands would be considered
    not completed in timeout seconds (1 sec.).
    
    The cause of the problem is pciehp driver didn't take this situation
    into account. This patch changes pciehp to take it into account. This
    patch also add the check for "No Command Completed Support" bit in
    Slot Capability register. If it is set, we should not wait for command
    completed bit set as well.
    
    This problem seems to be revealed by the commit
    c27fb883dffe11aa4cb35ecea1fa1832ba45d4da that fixed the bug that
    pciehp did not wait for command completed properly (pciehp just
    ignored the command completion event).
    
    Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
    Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit dbd79aed1aea2bece0bf43cc2ff3b2f9baf48a08
Author: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Date:   Tue May 27 19:03:16 2008 +0900

    pciehp: fix NULL dereference in interrupt handler
    
    Fix the following NULL dereference problem reported from Pierre Ossman
    and Ingo Molnar.
    
    pciehp: HPC vendor_id 8086 device_id 27d0 ss_vid 0 ss_did 0
    pciehp: pciehp_find_slot: slot (device=0x0) not found
    BUG: unable to handle kernel NULL pointer dereference at 0000000000000070
    IP: [<ffffffff80494a8b>] pciehp_handle_presence_change+0x7e/0x113
    PGD 0
    Oops: 0000 [1]
    CPU 0
    Modules linked in:
    Pid: 1, comm: swapper Tainted: G        W 2.6.26-rc3-sched-devel.git-00001-g2b99b26-dirty #170
    RIP: 0010:[<ffffffff80494a8b>]  [<ffffffff80494a8b>] pciehp_handle_presence_change+0x7e/0x113
    RSP: 0000:ffff81003f83fbb0  EFLAGS: 00010046
    RAX: 0000000000000039 RBX: 0000000000000000 RCX: 0000000000000000
    RDX: 0000000000000000 RSI: 0000000000000001 RDI: 0000000000000046
    RBP: ffff81003f83fbd0 R08: 0000000000000001 R09: ffffffff80245103
    R10: 0000000000000020 R11: 0000000000000000 R12: ffff81003ea53a30
    R13: 0000000000000000 R14: 0000000000000011 R15: ffffffff80495926
    FS:  0000000000000000(0000) GS:ffffffff80be7400(0000) knlGS:0000000000000000
    CS:  0010 DS: 0018 ES: 0018 CR0: 000000008005003b
    CR2: 0000000000000070 CR3: 0000000000201000 CR4: 00000000000006a0
    DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
    DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
    Process swapper (pid: 1, threadinfo ffff81003f83e000, task ffff81003f840000)
    Stack:  0000000000000008 ffff81003f83fbf6 ffff81003ea53a30 0000000000000008
     ffff81003f83fc10 ffffffff80495ab4 0000000000000011 0000000000000002
     0000000000000202 0000000000000202 00000000fffffff4 ffff81003ea53a30
    Call Trace:
     [<ffffffff80495ab4>] pcie_isr+0x18e/0x1bc
     [<ffffffff80260831>] request_irq+0x106/0x12f
     [<ffffffff80495fb6>] pcie_init+0x15e/0x6cc
     [<ffffffff804933a3>] pciehp_probe+0x64/0x541
     [<ffffffff8048f4e7>] pcie_port_probe_service+0x4c/0x76
     [<ffffffff8054af70>] driver_probe_device+0xd4/0x1f0
     [<ffffffff8054b108>] __driver_attach+0x7c/0x7e
     [<ffffffff8054b08c>] ? __driver_attach+0x0/0x7e
     [<ffffffff8054a4b6>] bus_for_each_dev+0x53/0x7d
     [<ffffffff8054ad3c>] driver_attach+0x1c/0x1e
     [<ffffffff8054a9c2>] bus_add_driver+0xdd/0x25b
     [<ffffffff80c09d3d>] ? pcied_init+0x0/0x8b
     [<ffffffff8054b288>] driver_register+0x5f/0x13e
     [<ffffffff80c09d3d>] ? pcied_init+0x0/0x8b
     [<ffffffff8048f441>] pcie_port_service_register+0x47/0x49
     [<ffffffff80c09d52>] pcied_init+0x15/0x8b
     [<ffffffff80bf3938>] kernel_init+0x75/0x243
     [<ffffffff808639d2>] ? _spin_unlock_irq+0x2b/0x3a
     [<ffffffff80228d1f>] ? finish_task_switch+0x57/0x9a
     [<ffffffff8020c258>] child_rip+0xa/0x12
     [<ffffffff8020bcec>] ? restore_args+0x0/0x30
     [<ffffffff80bf38c3>] ? kernel_init+0x0/0x243
     [<ffffffff8020c24e>] ? child_rip+0x0/0x12
    
    Code: 83 80 00 00 00 48 39 f0 75 e1 0f b6 c9 48 c7 c2 00 0e 8d 80 48 c7 c6 8a 60 a6 80 48 c7 c7 10 db a8 80 31 c0 e8 3f 8d d9 ff 31 db <48> 8b 43 70 48 8d 75 ef 48 89 df ff 50 30 80 7d ef 00 74 37 48
    RIP  [<ffffffff80494a8b>] pciehp_handle_presence_change+0x7e/0x113
     RSP <ffff81003f83fbb0>
    CR2: 0000000000000070
    Kernel panic - not syncing: Fatal exception
    
    The situation under which it occurs is hw and timing related: it appears
    to happen on a system that has PCI hotplug hardware but with no active
    hotplug cards, and another interrupt in the same (shared) IRQ line
    arrives too early, before the hotplug-slot entry has been set up - as
    triggered by CONFIG_DEBUG_SHIRQ=y:
    
    This patch contains the following two fixes.
    
    (1) Clear all events bits in Slot Status register to prevent the pciehp
        driver from detecting the spurious events that would have been occur
        before pciehp loading.
    
    (2) Add check whether slot initialization had been already done.
    
    This is short term fix. We need more structural fixes to install
    interrupt handler after slot initialization is done.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
    Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit b3bd307c628af2f0a581c42d5d7e4bcdbbf64b6a
Author: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Date:   Tue May 27 19:08:23 2008 +0900

    shpchp: add message about shpchp_slot_with_bus option
    
    Some (broken?) platform assign the same slot name to multiple hotplug
    slots. On such system, slot initialization would fail because of name
    collision. The shpchp driver already have a "slot_with_bus" module
    option which adds the bus number into the slot name. This patch adds
    the message about this module option that will be displayed when slot
    name collision is detected.
    
    Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
    Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit 732bee4c859012edf05f3e09b53b68fc332a369d
Author: Olof Johansson <olof@lixom.net>
Date:   Tue May 27 16:11:13 2008 -0500

    [POWERPC] pasemi: update pasemi_defconfig, enable electra_cf
    
    Refresh pasemi_defconfig and enable ELECTRA_CF=y.
    
    Signed-off-by: Olof Johansson <olof@lixom.net>

commit c433a1b6426880d3e23267938c3542706f3d03a6
Author: Olof Johansson <olof@lixom.net>
Date:   Tue May 27 16:07:26 2008 -0500

    electra_cf: Add MODULE_DEVICE_TABLE()
    
    Add a module device table to electra_cf so that modules can be
    auto-probed/loaded.
    
    Signed-off-by: Olof Johansson <olof@lixom.net>

commit 4dcc29e1574d88f4465ba865ed82800032f76418
Author: Tony Luck <tony.luck@intel.com>
Date:   Tue May 27 13:23:16 2008 -0700

    [IA64] Workaround for RSE issue
    
    Problem: An application violating the architectural rules regarding
    operation dependencies and having specific Register Stack Engine (RSE)
    state at the time of the violation, may result in an illegal operation
    fault and invalid RSE state.  Such faults may initiate a cascade of
    repeated illegal operation faults within OS interruption handlers.
    The specific behavior is OS dependent.
    
    Implication: An application causing an illegal operation fault with
    specific RSE state may result in a series of illegal operation faults
    and an eventual OS stack overflow condition.
    
    Workaround: OS interruption handlers that switch to kernel backing
    store implement a check for invalid RSE state to avoid the series
    of illegal operation faults.
    
    The core of the workaround is the RSE_WORKAROUND code sequence
    inserted into each invocation of the SAVE_MIN_WITH_COVER and
    SAVE_MIN_WITH_COVER_R19 macros.  This sequence includes hard-coded
    constants that depend on the number of stacked physical registers
    being 96.  The rest of this patch consists of code to disable this
    workaround should this not be the case (with the presumption that
    if a future Itanium processor increases the number of registers, it
    would also remove the need for this patch).
    
    Move the start of the RBS up to a mod32 boundary to avoid some
    corner cases.
    
    The dispatch_illegal_op_fault code outgrew the spot it was
    squatting in when built with this patch and CONFIG_VIRT_CPU_ACCOUNTING=y
    Move it out to the end of the ivt.
    
    Signed-off-by: Tony Luck <tony.luck@intel.com>

commit 3dbfd0801bbbaf2800d7497d83d743a614430e82
Merge: edb2301... f04d264...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue May 27 08:27:20 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
      avr32: Fix cpufreq oops when ondemand governor is default
      avr32: Update defconfigs
      avr32: export strnlen_user
      avr32: export copy_page

commit edb2301f2903e96beadc333f9584222c05858518
Author: David Woodhouse <dwmw2@infradead.org>
Date:   Tue May 27 06:31:43 2008 +0100

    ck804rom: fix driver_data in probe table.
    
    There's a reason why using C99 initialisers even in the supposedly
    trivial structs is a good idea.
    
    Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
    Signed-off-by: David Woodhouse <dwmw2@infradead.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 825de27d9e40b3117b29a79d412b7a4b78c5d815
Author: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Date:   Tue May 27 06:33:54 2008 -0700

    dccp ccid-3: Fix "t_ipi explosion" bug
    
    The identification of this bug is thanks to Cheng Wei and Tomasz
    Grobelny.
    
    To avoid divide-by-zero, the implementation previously ignored RTTs
    smaller than 4 microseconds when performing integer division RTT/4.
    
    When the RTT reached a value less than 4 microseconds (as observed on
    loopback), this prevented the Window Counter CCVal value from
    advancing. As a result, the receiver stopped sending feedback. This in
    turn caused non-ending expiries of the nofeedback timer at the sender,
    so that the sending rate was progressively reduced until reaching the
    minimum of one packet per 64 seconds.
    
    The patch fixes this bug by handling integer division more
    intelligently. Due to consistent use of dccp_sample_rtt(),
    divide-by-zero-RTT is avoided.
    
    Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 6079a463cf95fafcc704a4e5e92a4da12444bd3c
Author: Wei Yongjun <yjwei@cn.fujitsu.com>
Date:   Tue May 27 06:22:38 2008 -0700

    dccp: Fix to handle short sequence numbers packet correctly
    
    RFC4340 said:
      8.5.  Pseudocode
           ...
           If P.type is not Data, Ack, or DataAck and P.X == 0 (the packet
                 has short sequence numbers), drop packet and return
    
    But DCCP has some mistake to handle short sequence numbers packet, now
    it drop packet only if P.type is Data, Ack, or DataAck and P.X == 0.
    
    Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
    Acked-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
    Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit f04d264afc51acdffeba9cdf3baf04116687680c
Author: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Date:   Tue May 27 09:37:42 2008 +0200

    avr32: Fix cpufreq oops when ondemand governor is default
    
    Move the AP7 cpufreq init to late_initcall() so that we don't try to
    bring up cpufreq until the governor is ready. x86 also uses
    late_initcall() for this.
    
    Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>

commit 87a54a28970fb6a91de3993120eccc01a0ece732
Author: Huang Weiyi <weiyi.huang@gmail.com>
Date:   Tue May 27 01:38:45 2008 -0400

    Input: apanel - remove duplicate include
    
    Remove duplicate include file <linux/module.h>.
    
    Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit 43f83a8f9963a11a9c3f41beecc363da21ae3602
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date:   Tue May 27 01:37:26 2008 -0400

    Input: wm9713 - support five wire panels
    
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit 5de4cd431db749bdca58ec88862462729f6159b2
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date:   Tue May 27 01:37:19 2008 -0400

    Input: wm97xx-core - fix race on PHY init
    
    The chip phy_init() function must be called before the dig_enable() function
    but dig_enable() is called when the device is opened and we only call
    phy_init() after having reigstered the device, meaning the two can race.
    Fix this by doing the phy_init() before we register the input device.
    
    Thanks to Rodolfo Giometti <giometti@enneenne.com> for the report.
    
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit ef9db4929a4d9559abf1812fd89cc3b09c56b49b
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date:   Tue May 27 01:37:08 2008 -0400

    Input: wm97xx-core - fix driver name
    
    Fix driver name - thanks to Guennadi Liakhovetski <g.liakhovetski@gmx.de> for
    reporting this.
    
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit 6b32ca39d70f5d92f4d450dc54966f20e8b5c1f6
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date:   Tue May 27 01:36:47 2008 -0400

    Input: wm97xx-core - report a phys for WM97xx touchscreens
    
    phys is displayed in diagnostic output like that from evbug so ensure
    that it is set to something.
    
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit d35895db7aadc24086b6002101154eec478e9dd6
Author: Bruno Prémont <bonbons@linux-vserver.org>
Date:   Tue May 27 01:36:04 2008 -0400

    Input: i8042 - make sure Dritek quirk is invoked at resume
    
    Also do not fail i8042 entire initialization if enabling dritek extension
    fails.
    
    Signed-off-by: Bruno Prémont <bonbons@linux-vserver.org>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit d56acacdcd370c0077821a012607876cb11b1b3b
Author: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Date:   Mon May 26 13:25:05 2008 +0200

    avr32: Update defconfigs
    
    Just provide reasonable defaults for the new stuff. Tickless and
    hrtimers are turned on for all boards except ATSTK1004.
    
    Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>

commit 01575995de4289aa73aa7cb22cf8fe0461093589
Author: Adrian Bunk <bunk@kernel.org>
Date:   Thu May 22 01:01:38 2008 +0300

    avr32: export strnlen_user
    
    This patch fixes the following build error:
    
    <--  snip  -->
    
    ...
      MODPOST 1327 modules
    ERROR: "strnlen_user" [drivers/input/misc/uinput.ko] undefined!
    ...
    make[2]: *** [__modpost] Error 1
    
    <--  snip  -->
    
    Reported-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>

commit a0ed3d8d94b6a28c886cf9c023693afa3bb773f2
Author: Adrian Bunk <bunk@kernel.org>
Date:   Mon May 5 21:29:57 2008 +0300

    avr32: export copy_page
    
    This patch fixes the following build error:
    
    <--  snip  -->
    
    ...
      MODPOST 61 modules
    ERROR: "copy_page" [fs/fuse/fuse.ko] undefined!
    ...
    make[2]: *** [__modpost] Error 1
    
    <--  snip  -->
    
    Also add an empty line since *_page aren't "String functions".
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>

commit ddc9753fcddfe5f9885dc133824962c047252b43
Author: Shaohua Li <shaohua.li@intel.com>
Date:   Wed May 21 16:58:40 2008 +0800

    PCI: don't enable ASPM on devices with mixed PCIe/PCI functions
    
    The Slot 03:00.* of JMicron controller has two functions, but one is
    PCIE endpoint the other isn't PCIE device, very strange. PCIE spec
    defines all functions should have the same config for ASPM, so disable
    ASPM for the whole slot in this case.
    
    Signed-off-by: Shaohua Li <shaohua.li@intel.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit 65e660aa3f76b120c2fe69bf07e1b416dae404a7
Author: Bruno Prémont <bonbons@linux-vserver.org>
Date:   Tue May 20 13:47:28 2008 -0400

    Input: i8042 - add Dritek quirk for Acer TravelMate 660
    
    The Acer TravelMate 660 series also requires the Dritek quirk to enable the
    extra scancodes.
    
    Signed-off-by: Bruno Prémont <bonbons@linux-vserver.org>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit ca56d9aaf2a135e0eb528df427f7dda15d077b11
Author: Bryan Wu <cooloney@kernel.org>
Date:   Tue May 20 16:45:29 2008 +0800

    Blackfin arch: Fix typo. it should be _outsw_8
    
    Signed-off-by: Bryan Wu <cooloney@kernel.org>

commit f086f23435bf42f700296f1be3878f6aa6e9b7dd
Author: Michael Hennerich <michael.hennerich@analog.com>
Date:   Tue May 20 16:42:39 2008 +0800

    Blackfin arch: Cleanup no functional changes
    
    Singed-off-by: Michael Hennerich <michael.hennerich@analog.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>