development kernel tree: Changes to 'mokopatches-tracking'

git at git.openmoko.org git at git.openmoko.org
Thu Jun 5 13:25:51 CEST 2008


Rebased ref, commits from common ancestor:
commit f245a98f6de14c5ad016faea5d89060e67e4fc8b
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:44 2008 +0100

    glamo-cmdqueue-bandaid.patch
    [ Stop kernel from hanging every once in a while during Glamo
      initialization. ]
    
    debug-glamo-fb-cmdqueue-wait-timeout.patch
    
    From: warmcat <andy at warmcat.com>

commit e95c93f717d7e792d3e999b65c980b498e52f6b4
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:43 2008 +0100

    gta02-sound-bandaid.patch
    http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=1172
    
    This patch seems to alleviate the symptoms but doesn't cure them.
    Keep it to keep development going, until we have a proper solution.

commit 1024d45d3a128878970c7ecab03f59a041f60693
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:42 2008 +0100

    suspend-prelim1.patch

commit 5f1d4cac64160d04ba0deb5880703156280fbe5a
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:42 2008 +0100

    gta01-dehang-printk.patch
    This is a temporary work-around Mike Westerhof for this bug:
    http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=788
    
    See also
    http://lists.openmoko.org/pipermail/openmoko-kernel/2008-February/000804.html
    
    (It's the 2nd option.)
    
    We may settle on a different solution in the future, depending on
    feedback from upstream.

commit 5d3bfc75fe83d64c357bf9f119ade53b0cbb65af
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:42 2008 +0100

    fix-pcf50633-LOWBAT-kill-init.patch

commit eb40aad5224333158c22226102dd08f8c63bdcb7
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:42 2008 +0100

    fix-pcf50606-LOWBAT-kill-init.patch

commit 757bb6d4ffaef4710314595474a88d91814598ac
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:42 2008 +0100

    fix-hwecc-2410.patch
    S3C24xx ECC mis-calculates the bit to flip:
    http://lists.infradead.org/pipermail/linux-mtd/2007-October/019586.html
    If the error couldn't be corrected, we returned "no problem" :-(
    http://lists.infradead.org/pipermail/linux-mtd/2007-October/019615.html
    
    Signed-off-by: Werner Almesberger <werner at openmoko.org>

commit 554759548898b7ef6e14ef1d463287451a62f1a6
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:42 2008 +0100

    atheros_2_0_sdio_stack.patch

commit da50a6920b0a4ed72aed078d9945429c3efff62a
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:42 2008 +0100

    atheros_2_0_hcd.patch

commit 18271554f9b54eac616985afbacdcb020c6856e9
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:41 2008 +0100

    atheros_2_0_function.patch

commit 5acef164071d2bbe7a11f2b1bb6f5c3157590002
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:41 2008 +0100

    pnp_fixes.patch

commit 409174f06c3eb0d07ea5190d446b03955b86d2a5
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:41 2008 +0100

    s3c2410-usb-switch.patch

commit 02bef060f133b4e94796f32b5e2aabb8b50bcb89
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:41 2008 +0100

    fix-EVIOCGRAB-semantics.patch

commit 391da85b0f020b41f95459ad1e2a88c070bf5185
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:41 2008 +0100

    bq27000-battery-driver.patch

commit 25f3f90b233ef7b309fa7979c52aea3d5d8a5fe9
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:41 2008 +0100

    fiq-hdq.patch

commit 4aed962e0a98b2f3cdc360f613549b2dee07b1b1
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:41 2008 +0100

    introduce-fiq-migrate-vibrator-gta02-only.patch
    
    On GTA02 we use FIQ to manage the vibrator IO now.  That
    is necessary because we stole timer3 from doing hw pwm
    for vibrator.  This keeps the same UI in /sys but does
    "bitbang pwm" on the same vibrator GPIO
    
    From: Andy Green <andy at openmoko.com>
    Signed-off-by: Andy Green <andy at openmoko.com>

commit bbe9b74d8408b0e09e36fd1498387602a72fc2c1
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:41 2008 +0100

    introduce-fiq-use-timer3-as-source.patch
    
    This makes the FIQ stuff specific to one of the timers on the
    s3c244x and adds the platform stuff for fiq in the gta02 init
    
    Currently one sysfs node is exposed, a count of FIQ events
    
    cat /sys/devices/platform/sc32440_fiq.0/fiq/count
    
    From: Andy Green <andy at openmoko.com>
    Signed-off-by: Andy Green <andy at openmoko.com>

commit 40e14dcb6d357c099fa658cc13cb3dc38eedd0bb
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:40 2008 +0100

    introduce-fiq-basis.patch
    Adds a C-based FIQ ISR which is very convenient (and unusual --
    normally you have to do FIQ ISR in assembler only).
    Based on my article:
    
    http://warmcat.com/_wp/2007/09/17/at91rm9200-fiq-faq-and-simple-example-code-patch/
    
    Implemented as a platform device and driver.
    
    Suspend / resume is tested and works.
    
    Signed-off-by: Andy Green <andy at warmcat.com>

commit 156bed35c97edd3dd92d2714efd5ec46febed9f3
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:40 2008 +0100

    fail-unless-uimage.patch
    Fail the build noisily if "mkimage" can't be found, e.g., if we forgot to add
    the u-boot directory to PATH.

commit 20affa1dd26d42a9a6fa3396a4a388ec56f47293
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:40 2008 +0100

    s3c2410-qt2410-buttons.patch

commit 42daff009f6805384de8708bed3bfb0234f537ea
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:40 2008 +0100

    qt2410-cs8900.patch

commit a84c873b6ab1879dac47e2f25277c974d1016620
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:40 2008 +0100

    s3c2440-nand-disable-hwecc.patch
    Disable the hardware ECC checking on S3C2440 based platforms (HXD8, SMDK2440,
    GTA02) for the time being, since our u-boot doesn't yet support it for 2k page
    size NAND

commit 4e3066f41c8c34475e9d999be762931424ded735
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:40 2008 +0100

    input-nots-mousedev.patch
    This patch disables the reporting of touchscreen-like devices via
    /dev/input/mice.  In the Neo1973 (much like other handheld devices),
    we need this to distinguish between the touchscreen (which uses tslib)
    and optional additional usb/bluetooth mice that might be attached.
    
    Signed-off-by: Harald Welte <laforge at openmoko.org>

commit 1646be4673a4a3a0c2b38d01f69f9b7c0a2927f9
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:40 2008 +0100

    s3c2410_serial-nodebug.patch

commit 8945f13ec649703315b1a2e504e0b8b3001f4e28
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:40 2008 +0100

    pm-debug_less_verbose.patch

commit 683b479223c8116f573e87df6c63a4710aa9edac
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:40 2008 +0100

    config-nr-tty-devices.patch

commit f7b97dbfed4f8d6eeaeee402aa36442069dc890a
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:39 2008 +0100

    openmoko-logo.patch

commit f3d6392ac6b8b32ee7a9253c6d805d4488a0b8e5
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:39 2008 +0100

    gta02-bt-fixes.patch
    Modify GTA02 power manager for bluetooth.
    
    1. Default power value isn't correct. Now we set pcf50633 LDO4 to 3.2 voltage.
    
    2. Separate GTA01 and GTA02 source code.
    
    3. Add pcf50633 API for enable register.

commit 0d0a0797a2caa4af21869fffab04bfe223dcd736
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:39 2008 +0100

    pcf506xx.patch
    Moved shared PMU code from pcf50606.h and pcf50633.h (which prevented inclusion
    of both at the same time) to pcf506xx.h
    
    - include/linux/pcf50606.h (struct pmu_voltage_rail, enum pmu_event, pmu_cb):
      moved to pcf506xx.h
    - include/linux/pcf50633.h (struct pmu_voltage_rail, enum pmu_event, pmu_cb):
      moved to pcf506xx.h
    
    Signed off-by: Werner Almesberger <werner at openmoko.org>

commit 15685169d944cc3ffe5f6d565a7b3cd187c2747a
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:39 2008 +0100

    gta02-acc.patch

commit 63f727d09a81a574ffe7c656b85e8a2c452b9396
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:39 2008 +0100

    gta02-leds.patch

commit 2c269c49595a0e9a7355c7528ec94aaa728a1f37
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:39 2008 +0100

    lis302dl.patch
    This is a Linux driver for the STmicro LIS302DL 3-axis accelerometer.
    
    Signed-off-by: Harald Welte <laforge at openmoko.org>

commit fa45a9f719c78be17bc08dd3767538e9ae2c1760
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:39 2008 +0100

    gta02-sound.patch

commit fdf726e7bb8a324cf12635a203c8c9b30226b6bf
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:39 2008 +0100

    gta02-power_control.patch

commit 8db6a4f75673aa958a16b377f476059ac3f8f6f3
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:38 2008 +0100

    gta02-core.patch

commit 9c012ba456068d3b246286eae63a8afe75fbf5d8
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:38 2008 +0100

    glamo-mmc.patch

commit 1c5af0005ca880af63d4ff34f5132d3dde0f797c
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:38 2008 +0100

    smedia-glamo.patch
    [ FIXME:
     include/asm-arm/arch-s3c2410/irqs.h shouldn't contain device-specific
     changes. ]
    
    This is a Linux kernel driver for the Smedia Glamo336x / Glamo337x
    multi-function peripheral device.
    
    Signed-off-by: Harald Welte <laforge at openmoko.org>

commit c6f74144f11444c4399afba6e7f27b537210f5b0
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:37 2008 +0100

    pcf50633-suspend-hacks.patch

commit 43dc1011ceec883eae1175bb44df15787e8fefa1
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:37 2008 +0100

    pcf50633.patch

commit 562bba00ffc5519e2882db0a026bc461cac15f5d
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:37 2008 +0100

    s3c2442b-cpuid.patch
    Add the Samsung S3C2442B CPU idcode to the samsung s3c24xx platform code
    and fix a Kconfig typo related tot the 2442.

commit b345f2b04cb444576a5329ef09b393766d401ebb
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:37 2008 +0100

    s3c2410_udc-2440_dual_packet-workaround.patch
    This is a patch that seems to make the USB hangs on the S3C2440 go away. At
    least a good amount of ping torture didn't make them come back so far.
    
    The issue is that, if there are several back-to-back packets,
    sometimes no interrupt is generated for one of them. This
    seems to be caused by the mysterious dual packet mode, which
    the USB hardware enters automatically if the endpoint size is
    half that of the FIFO. (On the 2440, this is the normal
    situation for bulk data endpoints.)
    
    There is also a timing factor in this. I think what happens is
    that the USB hardware automatically sends an acknowledgement
    if there is only one packet in the FIFO (the FIFO has space
    for two). If another packet arrives before the host has
    retrieved and acknowledged the previous one, no interrupt is
    generated for that second one.
    
    However, there may be an indication. There is one undocumented
    bit (none of the 244x manuals document it), OUT_CRS1_REG[1],
    that seems to be set suspiciously often when this condition
    occurs. There is also CLR_DATA_TOGGLE, OUT_CRS1_REG[7], which
    may have a function related to this. (The Samsung manual is
    rather terse on that, as usual.)
    
    This needs to be examined further. For now, the patch seems to do the
    trick.
    
    Note that this is not a clean solution by any means, because we
    might potentially get stuck in that interrupt for quite a while.

commit f68bdcfb727c4e385681c506f2ae375715032ce7
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:37 2008 +0100

    s3c24xx-nand-largepage.patch
    MTD: S3C24XX large page NAND support
    
    This adds support for using large page NAND devices
    with the S3C24XX NAND controller. This also adds the
    file Documentation/arm/Samsung-S3C24XX/NAND.txt to
    describe the differences.
    
    Signed-off-by: Ben Dooks <ben-linux at fluff.org>

commit 3e72c7726398248f8d80b9af140ba67e1eca1cd6
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:37 2008 +0100

    s3c_mci-gta01.patch

commit 832e6a664f85fd2212407c06bc38e46282e8699c
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:37 2008 +0100

    s3c_mci.patch
    This is a MMC/SD driver for the Samsung S3C24xx SD/MMC controller, originally
    developed years ago by Thomas Kleffel <tk at maintech.de>.
    
    Due to time restraints, he had no time to further maintain the driver and
    follow the mainline Linux changes in the SD/MMC stack.
    
    With his authorization, I have taken over the task of making it compliant to
    the current mainline SD/MMC API and take care of the mainline kernel merge.
    
    After a potential kernel inclusion, we would co-maintain the driver.
    
    Acked-by: Thomas Kleffel <tk at maintech.de>
    Signed-off-by: Harald Welte <laforge at gnumonks.org>

commit f31e566dc23e9796c4ee430da3732a462feb03eb
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:37 2008 +0100

    g_ether-vendor_product.patch
    Use FIC's own USB Vendor ID rather than NetChip's
    
    Yes, we could solve this by some modprobe.conf parameters, but I'd like to
    rather not rely on this.

commit ddf4d69f1ec5b130a9ad45a5f028f833698f0b10
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:36 2008 +0100

    g_ether-highpower.patch

commit 96fba2922d5d8391a8f0aa989f888ad5cc708458
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:36 2008 +0100

    i2c-permit_invalid_addrs.patch
    We need this stupid workaround since our amplifier chip uses a 'reserved' I2C
    address
    
    Signed-off-by: Harald Welte <laforge at openmoko.org>

commit c424b3f471494f332f99db67f04e10bd051f0f2b
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:36 2008 +0100

    s3c2410_ts-gta01.patch

commit 267e34d069254b1396b5dc6704141265310d80af
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:36 2008 +0100

    s3c2410_touchscreen.patch

commit 5368dc57e78734bc9d327ff3ebe7346f4987f8a1
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:35 2008 +0100

    gta01-backlight.patch
    This is a backlight driver for the FIC/OpenMoko Neo1973 GTA01 GSM Phone
    
    Signed-off-by: Harald Welte <laforge at openmoko.org>

commit 17b57ff4642e5aca6355c634e05a002c4fc30ab7
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:34 2008 +0100

    gta01-vibrator.patch
    This patch adds driver support for the vibator device of the FIC/OpenMoko
    Neo1973 GSM phone. The driver uses the existing LED class driver framework,
    since there's a lot of similarity between the LED and the vibrator function.
    
    Signed-off-by: Harald Welte <laforge at openmoko.org>

commit 0c4245e8cbc8b810246f5d48cda568b2ffb4ba50
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:34 2008 +0100

    s3c2410-pwm.patch
    This patch adds a PWM api abstraction for the S3C2410 SoC
    
    Signed-off-by: Javi Roman <javiroman at kernel-labs.org>
    Signed-off-by: Harald Welte <laforge at openmoko.org>

commit fd03f185b5d9407c73a810df61ec651419ed58a3
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:34 2008 +0100

    gta01-power_control.patch
    [PATCH] Neo1973 GPS / GSM / Bluetooth power control via sysfs
    
    Signed-off-by: Harald Welte <laforge at openmoko.org>

commit cfb949a76afa1c34c05544b550e64c8469874c5c
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:33 2008 +0100

    gta01-inputdevice.patch
    This provides support for the GTA01 keyboard
    
    Signed-off-by: Harald Welte <laforge at openmoko.org>

commit fb57a5cdc06e4cdf115e1cc55dedbe2bb7ef97a2
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:32 2008 +0100

    gta01-jbt6k74.patch
    This driver adds support for the SPI-based control interface of the LCM (LCD
    Panel) found on the FIC GTA01 hardware.
    
    The specific panel in this hardware is a TPO TD028TTEC1, but the driver should
    be able to drive any other diplay based on the JBT6K74-AS controller ASIC.
    
    Signed-off-by: Harald Welte <laforge at openmoko.org>

commit 6ccf015cfa139e5e695348393493d284235d88cf
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:32 2008 +0100

    gta01-core.patch
    This patch adds support for the FIC Neo1973 GTA01 machine type to the ARM port
    of the Linux kernel.
    
    Signed-off-by: Harald Welte <laforge at openmoko.org>

commit ac361f43594cf1d16245a8daa10beb76d76ed5df
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:32 2008 +0100

    gta01-pcf50606.patch
    This is a NXP PCF50606 power management unit driver.
    
    The PCF50606 is used in the FIC/OpenMoko Neo1973 GTA01 GSM phone.
    
    Signed-off-by: Harald Welte <laforge at openmoko.org>

commit 61d6d208631e63127502178413b1baab2261263a
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:32 2008 +0100

    s3c2410-bbt.patch
    [PATCH] Add Kconfig option to enable NAND bad-block-table support for s3c2410
    
    This patch adds a new CONFIG_MTD_NAND_S3C2410_BBT which, if enabled,
    asks the mtd NAND core to use a bad-block table.
    
    Signed-off-by: Harald Welte <laforge at openmoko.org>

commit 39b7c53d0c691ec0bee80157f8d4686c40e9402b
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:32 2008 +0100

    resume-timers-wq.patch
    The initialization of clocks uses mutexes, but we execute the resume in
    an interrupt context. We therefore have to hand this task to a non-interrupt.
    
    Adapted from a patch by Andy Green.

commit 59bb316ae49d08aa8b3e6c642b6bc9652986a362
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:32 2008 +0100

    fix-i2c-s3c2410-resume-race.patch
    fix-i2c-s3c2410-resume-race.patch
    
    There is a nasty race between i2c-s3c2410 resume and resume of I2C
    driver and the client drivers -- the watchdog device actually gets to
    use the dead I2C bus before it is reinitialized by the I2C driver
    resume!  This patch makes sure any customers get turned away until
    the shopkeeper has woken up.
    
    Signed-off-by: Andy Green <andy at openmoko.com>

commit 0f1ca5ede4fda9103f56ed646052053574a3babf
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:32 2008 +0100

    gta01-no_nand_partitions.patch
    [PATCH] support mtd NAND commandline partitions for S3C2410
    
    This patch adds support for the mtd NAND core standard method of passing
    partition table information from the bootloader into the kernel by using
    the kernel commandline.
    
    The board specific code can still manually override and provide a fixed
    partition table, so this patch will behave backwards compatible.
    
    Signed-off-by: Harald Welte <laforge at openmoko.org>
    Acked-byt: Ben Dooks <ben-linux at fluff.org>

commit 3f21a11e5a80ee8a28301171d78e7764452f21fd
Author: mokopatches <mokopatches at openmoko.org>
Date:   Thu Jun 5 10:36:32 2008 +0100

    explicitly-link-notes-section.patch
    
    Since 2.6.23 kbuild produces a 3GB arch/arm/boot/Image because it includes a
    .note.gnu.build-id section at address 0 which is followed by 3GB of 0x00.
    The --build-id option is set in the toplevel Makefile.
    This patch explicitly puts the notes section after the TEXT section.

commit 53c8ba95402be65d412a806cda3430f0e72cd107
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Jun 4 20:10:44 2008 -0700

    Linux 2.6.26-rc5

commit 3e387fcdc485d94fe2c4b52e7c30c0c4cd1fe364
Merge: 9489a0625854cd7482bb0e8b37de4406cdcd49e0 24b95685ffcdb3dc28f64b9e8af6ea3e8360fbc5
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Jun 4 17:39:33 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: (56 commits)
      l2tp: Fix possible oops if transmitting or receiving when tunnel goes down
      tcp: Fix for race due to temporary drop of the socket lock in skb_splice_bits.
      tcp: Increment OUTRSTS in tcp_send_active_reset()
      raw: Raw socket leak.
      lt2p: Fix possible WARN_ON from socket code when UDP socket is closed
      USB ID for Philips CPWUA054/00 Wireless USB Adapter 11g
      ssb: Fix context assertion in ssb_pcicore_dev_irqvecs_enable
      libertas: fix command size for CMD_802_11_SUBSCRIBE_EVENT
      ipw2200: expire and use oldest BSS on adhoc create
      airo warning fix
      b43legacy: Fix controller restart crash
      sctp: Fix ECN markings for IPv6
      sctp: Flush the queue only once during fast retransmit.
      sctp: Start T3-RTX timer when fast retransmitting lowest TSN
      sctp: Correctly implement Fast Recovery cwnd manipulations.
      sctp: Move sctp_v4_dst_saddr out of loop
      sctp: retran_path update bug fix
      tcp: fix skb vs fack_count out-of-sync condition
      sunhme: Cleanup use of deprecated calls to save_and_cli and restore_flags.
      xfrm: xfrm_algo: correct usage of RIPEMD-160
      ...

commit 9489a0625854cd7482bb0e8b37de4406cdcd49e0
Merge: edeb280e49d38a5330db25463ef45f5466b0058a 399dc43bc29fe1ac19340c56c0df84aa0ea53c85
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Jun 4 17:38:44 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc: switch /proc/led to seq_file
      sparc64: IO accessors fix

commit 24b95685ffcdb3dc28f64b9e8af6ea3e8360fbc5
Author: James Chapman <jchapman at katalix.com>
Date:   Wed Jun 4 15:54:07 2008 -0700

    l2tp: Fix possible oops if transmitting or receiving when tunnel goes down
    
    Some problems have been experienced in the field which cause an oops
    in the pppol2tp driver if L2TP tunnels fail while passing data.
    
    The pppol2tp driver uses private data that is referenced via the
    sk->sk_user_data of its UDP and PPPoL2TP sockets. This patch makes
    sure that the driver uses sock_hold() when it holds a reference to the
    sk pointer. This affects its sendmsg(), recvmsg(), getname(),
    [gs]etsockopt() and ioctl() handlers.
    
    Tested by ISP where problem was seen. System has been up 10 days with
    no oops since running this patch. Without the patch, an oops would
    occur every 1-2 days.
    
    Signed-off-by: James Chapman <jchapman at katalix.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 293ad60401da621b8b329abbe8c388edb25f658a
Author: Octavian Purdila <opurdila at ixiacom.com>
Date:   Wed Jun 4 15:45:58 2008 -0700

    tcp: Fix for race due to temporary drop of the socket lock in skb_splice_bits.
    
    skb_splice_bits temporary drops the socket lock while iterating over
    the socket queue in order to break a reverse locking condition which
    happens with sendfile. This, however, opens a window of opportunity
    for tcp_collapse() to aggregate skbs and thus potentially free the
    current skb used in skb_splice_bits and tcp_read_sock.
    
    This patch fixes the problem by (re-)getting the same "logical skb"
    after the lock has been temporary dropped.
    
    Based on idea and initial patch from Evgeniy Polyakov.
    
    Signed-off-by: Octavian Purdila <opurdila at ixiacom.com>
    Acked-by: Evgeniy Polyakov <johnpol at 2ka.mipt.ru>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 26af65cbeb2467a486ae4fc7242c94e470c67c50
Author: Sridhar Samudrala <sri at us.ibm.com>
Date:   Wed Jun 4 15:19:35 2008 -0700

    tcp: Increment OUTRSTS in tcp_send_active_reset()
    
    TCP "resets sent" counter is not incremented when a TCP Reset is
    sent via tcp_send_active_reset().
    
    Signed-off-by: Sridhar Samudrala <sri at us.ibm.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 22dd485022f3d0b162ceb5e67d85de7c3806aa20
Author: Denis V. Lunev <den at openvz.org>
Date:   Wed Jun 4 15:16:12 2008 -0700

    raw: Raw socket leak.
    
    The program below just leaks the raw kernel socket
    
    int main() {
            int fd = socket(PF_INET, SOCK_RAW, IPPROTO_UDP);
            struct sockaddr_in addr;
    
            memset(&addr, 0, sizeof(addr));
            inet_aton("127.0.0.1", &addr.sin_addr);
            addr.sin_family = AF_INET;
            addr.sin_port = htons(2048);
            sendto(fd,  "a", 1, MSG_MORE, &addr, sizeof(addr));
            return 0;
    }
    
    Corked packet is allocated via sock_wmalloc which holds the owner socket,
    so one should uncork it and flush all pending data on close. Do this in the
    same way as in UDP.
    
    Signed-off-by: Denis V. Lunev <den at openvz.org>
    Acked-by: Alexey Kuznetsov <kuznet at ms2.inr.ac.ru>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 199f7d24ae59894243687a234a909f44a8724506
Author: James Chapman <jchapman at katalix.com>
Date:   Wed Jun 4 15:07:32 2008 -0700

    lt2p: Fix possible WARN_ON from socket code when UDP socket is closed
    
    If an L2TP daemon closes a tunnel socket while packets are queued in
    the tunnel's reorder queue, a kernel warning is logged because the
    socket is closed while skbs are still referencing it. The fix is to
    purge the queue in the socket's release handler.
    
    WARNING: at include/net/sock.h:351 udp_lib_unhash+0x41/0x68()
    Pid: 12998, comm: openl2tpd Not tainted 2.6.25 #8
     [<c0423c58>] warn_on_slowpath+0x41/0x51
     [<c05d33a7>] udp_lib_unhash+0x41/0x68
     [<c059424d>] sk_common_release+0x23/0x90
     [<c05d16be>] udp_lib_close+0x8/0xa
     [<c05d8684>] inet_release+0x42/0x48
     [<c0592599>] sock_release+0x14/0x60
     [<c059299f>] sock_close+0x29/0x30
     [<c046ef52>] __fput+0xad/0x15b
     [<c046f1d9>] fput+0x17/0x19
     [<c046c8c4>] filp_close+0x50/0x5a
     [<c046da06>] sys_close+0x69/0x9f
     [<c04048ce>] syscall_call+0x7/0xb
    
    Signed-off-by: James Chapman <jchapman at katalix.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit b4496d44c6bd8b2da8d370ef49c4b008ce82370b
Merge: b9031d9d87b24e24cd32ea15b5f4220a1e8da909 4546002c813568829b70d00fab752de3999c3f1a
Author: David S. Miller <davem at davemloft.net>
Date:   Wed Jun 4 14:58:13 2008 -0700

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

commit 4546002c813568829b70d00fab752de3999c3f1a
Author: Felix Homann <fexpop at onlinehome.de>
Date:   Thu May 29 00:36:45 2008 -0700

    USB ID for Philips CPWUA054/00 Wireless USB Adapter 11g
    
    Enable the Philips CPWUA054/00 in p54usb.
    
    Cc: Jeff Garzik <jeff at garzik.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit a3bafeedfff2ac5fa0a316bea4570e27900b6fcc
Author: Michael Buesch <mb at bu3sch.de>
Date:   Mon Jun 2 16:15:23 2008 +0200

    ssb: Fix context assertion in ssb_pcicore_dev_irqvecs_enable
    
    This fixes a context assertion in ssb that makes b44 print
    out warnings on resume.
    
    This fixes the following kernel oops:
    http://www.kerneloops.org/oops.php?number=12732
    http://www.kerneloops.org/oops.php?number=11410
    
    Signed-off-by: Michael Buesch <mb at bu3sch.de>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit a75eda43dc4a64d0bd0502da546871c01f70e899
Author: Holger Schurig <hs4233 at mail.mn-solutions.de>
Date:   Fri May 30 14:53:22 2008 +0200

    libertas: fix command size for CMD_802_11_SUBSCRIBE_EVENT
    
    The size was two small by two bytes.
    
    Signed-off-by: Holger Schurig
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit a6d4eae80157830af9c9d80de2daf6611696a34e
Author: Dan Williams <dcbw at redhat.com>
Date:   Thu May 29 14:38:28 2008 -0400

    ipw2200: expire and use oldest BSS on adhoc create
    
    If there are no networks on the free list, expire the oldest one when
    creating a new adhoc network.  Because ipw2200 and the ieee80211 stack
    don't actually cull old networks and place them back on the free list
    unless they are needed for new probe responses, over time the free list
    would become empty and creating an adhoc network would fail due to the !
    list_empty(...) check.
    
    Signed-off-by: Dan Williams <dcbw at redhat.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit b212f3378a9cfca4da52d7c7e6f79ead8ec287fc
Author: Andrew Morton <akpm at linux-foundation.org>
Date:   Wed May 28 12:40:39 2008 -0700

    airo warning fix
    
    WARNING: space prohibited between function name and open parenthesis '('
    #22: FILE: drivers/net/wireless/airo.c:2907:
    +	while ((IN4500 (ai, COMMAND) & COMMAND_BUSY) && (delay < 10000)) {
    
    total: 0 errors, 1 warnings, 8 lines checked
    
    ./patches/wireless-airo-waitbusy-wont-delay.patch has style problems, please review.  If any of these errors
    are false positives report them to the maintainer, see
    CHECKPATCH in MAINTAINERS.
    
    Please run checkpatch prior to sending patches
    
    Cc: Dan Williams <dcbw at redhat.com>
    Cc: Roel Kluin <roel.kluin at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 48e6c51bd326ce9faf07fbdf84d361c9755b7035
Author: Michael Buesch <mb at bu3sch.de>
Date:   Thu May 22 17:06:36 2008 +0200

    b43legacy: 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 at bu3sch.de>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit b9031d9d87b24e24cd32ea15b5f4220a1e8da909
Author: Vlad Yasevich <vladislav.yasevich at hp.com>
Date:   Wed Jun 4 12:40:15 2008 -0700

    sctp: Fix ECN markings for IPv6
    
    Commit e9df2e8fd8fbc95c57dbd1d33dada66c4627b44c ("[IPV6]: Use
    appropriate sock tclass setting for routing lookup.") also changed the
    way that ECN capable transports mark this capability in IPv6.  As a
    result, SCTP was not marking ECN capablity because the traffic class
    was never set.  This patch brings back the markings for IPv6 traffic.
    
    Signed-off-by: Vlad Yasevich <vladislav.yasevich at hp.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 8b750ce54bd8ab5f75d519ee450e1b0c5226ebe9
Author: Vlad Yasevich <vladislav.yasevich at hp.com>
Date:   Wed Jun 4 12:39:36 2008 -0700

    sctp: Flush the queue only once during fast retransmit.
    
    When fast retransmit is triggered by a sack, we should flush the queue
    only once so that only 1 retransmit happens.  Also, since we could
    potentially have non-fast-rtx chunks on the retransmit queue, we need
    make sure any chunks eligable for fast retransmit are sent first
    during fast retransmission.
    
    Signed-off-by: Vlad Yasevich <vladislav.yasevich at hp.com>
    Tested-by: Wei Yongjun <yjwei at cn.fujitsu.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 62aeaff5ccd96462b7077046357a6d7886175a57
Author: Vlad Yasevich <vladislav.yasevich at hp.com>
Date:   Wed Jun 4 12:39:11 2008 -0700

    sctp: Start T3-RTX timer when fast retransmitting lowest TSN
    
    When we are trying to fast retransmit the lowest outstanding TSN, we
    need to restart the T3-RTX timer, so that subsequent timeouts will
    correctly tag all the packets necessary for retransmissions.
    
    Signed-off-by: Vlad Yasevich <vladislav.yasevich at hp.com>
    Tested-by: Wei Yongjun <yjwei at cn.fujitsu.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit a6465234814efda9ed1dccdba852953f7508e827
Author: Vlad Yasevich <vladislav.yasevich at hp.com>
Date:   Wed Jun 4 12:38:43 2008 -0700

    sctp: Correctly implement Fast Recovery cwnd manipulations.
    
    Correctly keep track of Fast Recovery state and do not reduce
    congestion window multiple times during sucht state.
    
    Signed-off-by: Vlad Yasevich <vladislav.yasevich at hp.com>
    Tested-by: Wei Yongjun <yjwei at cn.fujitsu.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 159c6bea37c54dfae44409467e0f17600722d541
Author: Gui Jianfeng <guijianfeng at cn.fujitsu.com>
Date:   Wed Jun 4 12:38:07 2008 -0700

    sctp: Move sctp_v4_dst_saddr out of loop
    
    There's no need to execute sctp_v4_dst_saddr() for each
    iteration, just move it out of loop.
    
    Signed-off-by: Gui Jianfeng <guijianfeng at cn.fujitsu.com>
    Signed-off-by: Vlad Yasevich <vladislav.yasevich at hp.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 4141ddc02a92a6e3e5793601554c6033e83c25b9
Author: Gui Jianfeng <guijianfeng at cn.fujitsu.com>
Date:   Wed Jun 4 12:37:33 2008 -0700

    sctp: retran_path update bug fix
    
    If the current retran_path is the only active one, it should
    update it to the the next inactive one.
    
    Signed-off-by: Gui Jianfeng <guijianfeng at cn.fujitsu.com>
    Signed-off-by: Vlad Yasevich <vladislav.yasevich at hp.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit aed5a833fb18123d7cfc6ce3810ab97efd4869b3
Merge: a6604471db5e7a33474a7f16c64d6b118fae3e74 9596cc826e2e52bfc318ca37a6c52fe3d72990a3
Author: David S. Miller <davem at davemloft.net>
Date:   Wed Jun 4 12:10:21 2008 -0700

    Merge branch 'net-2.6-misc-20080605a' of git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-fix

commit a6604471db5e7a33474a7f16c64d6b118fae3e74
Author: Ilpo Järvinen <ilpo.jarvinen at helsinki.fi>
Date:   Wed Jun 4 12:07:44 2008 -0700

    tcp: fix skb vs fack_count out-of-sync condition
    
    This bug is able to corrupt fackets_out in very rare cases.
    In order for this to cause corruption:
      1) DSACK in the middle of previous SACK block must be generated.
      2) In order to take that particular branch, part or all of the
         DSACKed segment must already be SACKed so that we have that
         in cache in the first place.
      3) The new info must be top enough so that fackets_out will be
         updated on this iteration.
    ...then fack_count is updated while skb wasn't, then we walk again
    that particular segment thus updating fack_count twice for
    a single skb and finally that value is assigned to fackets_out
    by tcp_sacktag_one.
    
    It is safe to call tcp_sacktag_one just once for a segment (at
    DSACK), no need to call again for plain SACK.
    
    Potential problem of the miscount are limited to premature entry
    to recovery and to inflated reordering metric (which could even
    cancel each other out in the most the luckiest scenarios :-)).
    Both are quite insignificant in worst case too and there exists
    also code to reset them (fackets_out once sacked_out becomes zero
    and reordering metric on RTO).
    
    This has been reported by a number of people, because it occurred
    quite rarely, it has been very evasive. Andy Furniss was able to
    get it to occur couple of times so that a bit more info was
    collected about the problem using a debug patch, though it still
    required lot of checking around. Thanks also to others who have
    tried to help here.
    
    This is listed as Bugzilla #10346. The bug was introduced by
    me in commit 68f8353b48 ([TCP]: Rewrite SACK block processing &
    sack_recv_cache use), I probably thought back then that there's
    need to scan that entry twice or didn't dare to make it go
    through it just once there. Going through twice would have
    required restoring fack_count after the walk but as noted above,
    I chose to drop the additional walk step altogether here.
    
    Signed-off-by: Ilpo Järvinen <ilpo.jarvinen at helsinki.fi>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit c03e05d81d70879273488206bfcb1805ebca9612
Author: Mark Asselstine <mark.asselstine at windriver.com>
Date:   Wed Jun 4 12:06:28 2008 -0700

    sunhme: Cleanup use of deprecated calls to save_and_cli and restore_flags.
    
    Make use of local_irq_save and local_irq_restore rather then the
    deprecated save_and_cli and restore_flags calls.
    
    Signed-off-by: Mark Asselstine <mark.asselstine at windriver.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit a13366c632132bb9f8f2950a79773d8f68f4871e
Author: Adrian-Ken Rueegsegger <rueegsegger at swiss-it.ch>
Date:   Wed Jun 4 12:04:55 2008 -0700

    xfrm: xfrm_algo: correct usage of RIPEMD-160
    
    This patch fixes the usage of RIPEMD-160 in xfrm_algo which in turn
    allows hmac(rmd160) to be used as authentication mechanism in IPsec
    ESP and AH (see RFC 2857).
    
    Signed-off-by: Adrian-Ken Rueegsegger <rueegsegger at swiss-it.ch>
    Acked-by: Herbert Xu <herbert at gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 9596cc826e2e52bfc318ca37a6c52fe3d72990a3
Author: Denis V. Lunev <den at openvz.org>
Date:   Wed Jun 4 15:49:08 2008 +0400

    [IPV6]: Do not change protocol for UDPv6 sockets with pending sent data.
    
    Signed-off-by: Denis V. Lunev <den at openvz.org>
    Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

commit 36d926b94a9908937593e5669162305a071b9cc3
Author: Denis V. Lunev <den at openvz.org>
Date:   Wed Jun 4 15:49:07 2008 +0400

    [IPV6]: inet_sk(sk)->cork.opt leak
    
    IPv6 UDP sockets wth IPv4 mapped address use udp_sendmsg to send the data
    actually. In this case ip_flush_pending_frames should be called instead
    of ip6_flush_pending_frames.
    
    Signed-off-by: Denis V. Lunev <den at openvz.org>
    Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

commit 49d074f4009a7b5ce9c17b040f978abcb4d7f6f6
Author: Denis V. Lunev <den at openvz.org>
Date:   Wed Jun 4 15:49:06 2008 +0400

    [IPV6]: Do not change protocol for raw IPv6 sockets.
    
    It is not allowed to change underlying protocol for
       int fd = socket(PF_INET6, SOCK_RAW, IPPROTO_UDP);
    
    Signed-off-by: Denis V. Lunev <den at openvz.org>
    Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

commit 91e1908f569dd96a25a3947de8771e6cc93999dd
Author: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date:   Wed Jun 4 13:02:49 2008 +0900

    [IPV6] NETNS: Handle ancillary data in appropriate namespace.
    
    Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

commit 187e38384c4abfbbb1b880fab234d16c2df23a25
Author: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date:   Wed Jun 4 13:01:37 2008 +0900

    [IPV6]: Check outgoing interface even if source address is unspecified.
    
    The outgoing interface index (ipi6_ifindex) in IPV6_PKTINFO
    ancillary data, is not checked if the source address (ipi6_addr)
    is unspecified.  If the ipi6_ifindex is the not-exist interface,
    it should be fail.
    
    Based on patch from Shan Wei <shanwei at cn.fujitsu.com> and
    Brian Haley <brian.haley at hp.com>.
    
    Signed-off-by: Shan Wei <shanwei at cn.fujitsu.com>
    Signed-off-by: Brian Haley <brian.haley at hp.com>
    Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

commit 95b496b66615d8c43f77702049b1bd01e2f06595
Author: Yang Hongyang <yanghy at cn.fujitsu.com>
Date:   Wed May 28 16:27:28 2008 +0800

    [IPV6]: Fix the data length of get destination options with short length
    
     If get destination options with length which is not enough for that
    option,getsockopt() will still return the real length of the option,
    which is larger then the buffer space.
     This is because ipv6_getsockopt_sticky() returns the real length of
    the option.
    
    This patch fix this problem.
    
    Signed-off-by: Yang Hongyang <yanghy at cn.fujitsu.com>
    Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

commit 05335c2220c4911b69cb1bdd79e603ab08088372
Author: Yang Hongyang <yanghy at cn.fujitsu.com>
Date:   Wed May 28 16:23:47 2008 +0800

    [IPV6]: Fix the return value of get destination options with NULL data pointer
    
    If we pass NULL data buffer to getsockopt(), it will return 0,
    and the option length is set to -EFAULT:
        getsockopt(sk, IPPROTO_IPV6, IPV6_DSTOPTS, NULL, &len);
    
    This is because ipv6_getsockopt_sticky() will return -EFAULT or
    -EINVAL if some error occur.
    
    This patch fix this problem.
    
    Signed-off-by: Yang Hongyang <yanghy at cn.fujitsu.com>
    Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

commit 4bed72e4f5502ea3322f0a00794815fa58951abe
Author: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date:   Tue May 27 17:37:49 2008 +0900

    [IPV6] ADDRCONF: Allow longer lifetime on 64bit archs.
    
    - Allow longer lifetimes (>= 0x7fffffff/HZ) on 64bit archs
      by using unsigned long.
    - Shadow this arithmetic overflow workaround by introducing
      helper functions: addrconf_timeout_fixup() and
      addrconf_finite_timeout().
    
    Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

commit baa2bfb8aef24bb7fe1875b256918724b3884662
Author: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date:   Fri May 30 11:35:03 2008 +0900

    [IPV4] TUNNEL4: Fix incoming packet length check for inter-protocol tunnel.
    
    Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

commit 82836372311a5cbf9cc5f4f47f9b56cb9edfe90d
Author: Colin <colins at sjtu.edu.cn>
Date:   Tue May 27 00:04:43 2008 +0800

    [IPV6] TUNNEL6: Fix incoming packet length check for inter-protocol tunnel.
    
    I discover a strange behavior in [ipv4 in ipv6] tunnel. When IPv6 tunnel
    payload is less than 40(0x28), packet can be sent to network, received in
    physical interface, but not seen in IP tunnel interface. No counter increase
    in tunnel interface.
    
    Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

commit 24ef0da7b864435f221f668bc8a324160d063e78
Author: Thomas Graf <tgraf at suug.ch>
Date:   Wed May 28 16:54:22 2008 +0200

    [IPV6] ADDRCONF: Check range of prefix length
    
    As of now, the prefix length is not vaildated when adding or deleting
    addresses. The value is passed directly into the inet6_ifaddr structure
    and later passed on to memcmp() as length indicator which relies on
    the value never to exceed 128 (bits).
    
    Due to the missing check, the currently code allows for any 8 bit
    value to be passed on as prefix length while using the netlink
    interface, and any 32 bit value while using the ioctl interface.
    
    [Use unsigned int instead to generate better code - yoshfuji]
    
    Signed-off-by: Thomas Graf <tgraf at suug.ch>
    Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

commit a3c960899e042bc1c2b730a2115fa32da7802039
Author: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date:   Wed Jun 4 01:30:25 2008 +0900

    [IPV6] UDP: Possible dst leak in udpv6_sendmsg.
    
    ip6_sk_dst_lookup returns held dst entry. It should be released
    on all paths beyond this point. Add missed release when up->pending
    is set.
    
    Bug report and initial patch by Denis V. Lunev <den at openvz.org>.
    
    Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
    Acked-by: Denis V. Lunev <den at openvz.org>

commit e51171019bb0e1f9fb57c25bd2e38ce652eaea27
Author: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date:   Thu May 29 19:55:05 2008 +0900

    [SCTP]: Fix NULL dereference of asoc.
    
    Commit 7cbca67c073263c179f605bdbbdc565ab29d801d ("[IPV6]: Support
    Source Address Selection API (RFC5014)") introduced NULL dereference
    of asoc to sctp_v6_get_saddr in net/sctp/ipv6.c.
    Pointed out by Johann Felix Soden <johfel at users.sourceforge.net>.
    
    Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

commit 8b91ac09732895f928ed6107bda5318cf260520b
Merge: 8aca6cb1179ed9bef9351028c8d8af852903eae2 56997fa838e333cea33ab641d4aeedd23aef0eb1
Author: David S. Miller <davem at davemloft.net>
Date:   Wed Jun 4 11:50:00 2008 -0700

    Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

commit 8aca6cb1179ed9bef9351028c8d8af852903eae2
Author: Ilpo Järvinen <ilpo.jarvinen at helsinki.fi>
Date:   Wed Jun 4 11:34:22 2008 -0700

    tcp: Fix inconsistency source (CA_Open only when !tcp_left_out(tp))
    
    It is possible that this skip path causes TCP to end up into an
    invalid state where ca_state was left to CA_Open while some
    segments already came into sacked_out. If next valid ACK doesn't
    contain new SACK information TCP fails to enter into
    tcp_fastretrans_alert(). Thus at least high_seq is set
    incorrectly to a too high seqno because some new data segments
    could be sent in between (and also, limited transmit is not
    being correctly invoked there). Reordering in both directions
    can easily cause this situation to occur.
    
    I guess we would want to use tcp_moderate_cwnd(tp) there as well
    as it may be possible to use this to trigger oversized burst to
    network by sending an old ACK with huge amount of SACK info, but
    I'm a bit unsure about its effects (mainly to FlightSize), so to
    be on the safe side I just currently fixed it minimally to keep
    TCP's state consistent (obviously, such nasty ACKs have been
    possible this far). Though it seems that FlightSize is already
    underestimated by some amount, so probably on the long term we
    might want to trigger recovery there too, if appropriate, to make
    FlightSize calculation to resemble reality at the time when the
    losses where discovered (but such change scares me too much now
    and requires some more thinking anyway how to do that as it
    likely involves some code shuffling).
    
    This bug was found by Brian Vowell while running my TCP debug
    patch to find cause of another TCP issue (fackets_out
    miscount).
    
    Signed-off-by: Ilpo Järvinen <ilpo.jarvinen at helsinki.fi>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit edeb280e49d38a5330db25463ef45f5466b0058a
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Jun 4 10:35:03 2008 -0700

    Fix uart_set_ldisc() function type
    
    Commit 64e9159f5d2c4edf5fa6425031e556f8fddaf7e6 ("serial_core:
    uart_set_ldisc infrastructure") introduced the ability for low-level
    serial drivers to be informed when the tty ldisc changes.
    
    However, the actual tty-layer function that does this callback for
    serial devices was declared with the wrong type, having a spurious and
    unused 'ldisc' argument.
    
    This fixed the resulting compiler warning by just removing it.
    
    Acked-by: Blithering Idiot <alan at redhat.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit b9c698964614f71b9c8afeca163a945b4c2e2d20
Author: Jarek Poplawski <jarkao2 at gmail.com>
Date:   Wed Jun 4 09:58:27 2008 -0700

    netfilter: nf_conntrack_ipv6: fix inconsistent lock state in nf_ct_frag6_gather()
    
    [   63.531438] =================================
    [   63.531520] [ INFO: inconsistent lock state ]
    [   63.531520] 2.6.26-rc4 #7
    [   63.531520] ---------------------------------
    [   63.531520] inconsistent {softirq-on-W} -> {in-softirq-W} usage.
    [   63.531520] tcpsic6/3864 [HC0[0]:SC1[1]:HE1:SE0] takes:
    [   63.531520]  (&q->lock#2){-+..}, at: [<c07175b0>] ipv6_frag_rcv+0xd0/0xbd0
    [   63.531520] {softirq-on-W} state was registered at:
    [   63.531520]   [<c0143bba>] __lock_acquire+0x3aa/0x1080
    [   63.531520]   [<c0144906>] lock_acquire+0x76/0xa0
    [   63.531520]   [<c07a8f0b>] _spin_lock+0x2b/0x40
    [   63.531520]   [<c0727636>] nf_ct_frag6_gather+0x3f6/0x910
     ...
    
    According to this and another similar lockdep report inet_fragment
    locks are taken from nf_ct_frag6_gather() with softirqs enabled, but
    these locks are mainly used in softirq context, so disabling BHs is
    necessary.
    
    Reported-and-tested-by: Eric Sesterhenn <snakebyte at gmx.de>
    Signed-off-by: Jarek Poplawski <jarkao2 at gmail.com>
    Signed-off-by: Patrick McHardy <kaber at trash.net>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit d2ee3f2c4b1db1320c1efb4dcaceeaf6c7e6c2d3
Author: Dong Wei <dwei.zh at gmail.com>
Date:   Wed Jun 4 09:57:51 2008 -0700

    netfilter: xt_connlimit: fix accouning when receive RST packet in ESTABLISHED state
    
    In xt_connlimit match module, the counter of an IP is decreased when
    the TCP packet is go through the chain with ip_conntrack state TW.
    Well, it's very natural that the server and client close the socket
    with FIN packet. But when the client/server close the socket with RST
    packet(using so_linger), the counter for this connection still exsit.
    The following patch can fix it which is based on linux-2.6.25.4
    
    Signed-off-by: Dong Wei <dwei.zh at gmail.com>
    Acked-by: Jan Engelhardt <jengelh at medozas.de>
    Signed-off-by: Patrick McHardy <kaber at trash.net>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit d389c7d8988aecfdc06d9e9f9769af09e6592082
Merge: 4ded383569d6316d68d2aed298f8eb8d7bca37af 378bd6a5211f05d6d8eb3e78a92e2a197e456e4e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Jun 4 09:43:58 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      [ALSA] hda - COMPAL IFL90/JFL-92 laptop quirk
      [ALSA] hda - Fix resume of auto-config mode with Realtek codecs
      [ALSA] hda - Fix model for LG LS75 laptop
      [ALSA] hda - Fix mic input on HP2133
      [ALSA] ac97 - Fix ASUS A9T laptop output

commit 4ded383569d6316d68d2aed298f8eb8d7bca37af
Merge: e97dcb0eadbb821eccd549d4987b653cf61e2374 870568b39064cab2dd971fe57969916036982862
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Jun 4 09:15:51 2008 -0700

    Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip:
      x86, fpu: fix CONFIG_PREEMPT=y corruption of application's FPU stack
      suspend-vs-iommu: prevent suspend if we could not resume
      x86: section mismatch fix
      x86: fix Xorg crash with xf86MapVidMem error
      x86: fix pointer type warning in arch/x86/mm/init_64.c:early_memtest
      x86: fix bad pmd ffff810000207xxx(9090909090909090)
      x86: ioremap fix failing nesting check
      x86: fix broken math-emu with lazy allocation of fpu area
      x86: enable preemption in delay
      x86: disable preemption in native_smp_prepare_cpus
      x86: fix APIC warning on 32bit v2

commit e97dcb0eadbb821eccd549d4987b653cf61e2374
Author: Casey Schaufler <casey at schaufler-ca.com>
Date:   Mon Jun 2 10:04:32 2008 -0700

    Smack: fuse mount hang fix
    
    The d_instantiate hook for Smack can hang on the root inode of a
    filesystem if the file system code has not really done all the set-up.
    Fuse is known to encounter this problem.
    
    This change detects an attempt to instantiate a root inode and addresses
    it early in the processing, before any attempt is made to do something
    that might hang.
    
    Signed-off-by: Casey Schaufler <casey at schaufler-ca.com>
    Tested-by: Luiz Fernando N. Capitulino <lcapitulino at mandriva.com.br>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 246dd412d31e4f5de1d43aa6422a325b785f36e4
Merge: 2d9b57fbec9fde4deea3686f3927204efa218c7f a57c1bade5a0ee5cd8b74502db9cbebb7f5780b2
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Jun 4 08:36:56 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:
      libata-sff: Fix oops reported in kerneloops.org for pnp devices with no ctl
      libata: kill unused constants
      sata_mv: PHY_MODE4 cleanups
      [libata] ata_piix: more acer short cable quirks
      [libata] ACPI: Properly handle bay devices in dock stations

commit 2d9b57fbec9fde4deea3686f3927204efa218c7f
Merge: df6ab559bb1be44a78584e78ae7ad82d4e9e4f51 28d7647de2ee075aaed5ca835f445e885884f163
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Jun 4 08:36:09 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
      [SCSI] qla2xxx: Update version number to 8.02.01-k4.
      [SCSI] qla2xxx: Correct handling of AENs postings for vports.
      [SCSI] qla2xxx: Revert "qla2xxx: Use proper HA during asynchronous event handling."
      [SCSI] ibmvscsi: Non SCSI error status fixup
      [SCSI] fusion mpt: fix target missing after resetting external raid
      [SCSI] fix intermittent oops in scsi_bus_uevent
      [SCSI] qla2xxx: Update version number to 8.02.01-k3.
      [SCSI] qla2xxx: Revert "qla2xxx: Validate mid-layer 'underflow' during check-condition handling."
      [SCSI] qla2xxx: Disable local-interrupts while polling for RISC status.
      [SCSI] qla2xxx: Extend the 'fw_dump' SYSFS node the ability to initiate a firmware dump.
      [SCSI] qla2xxx: Don't depend on mailbox return values while enabling FCE tracing.
      [SCSI] qla2xxx: Convert vport_sem to a mutex
      [SCSI] qla2xxx: firmware semaphore to mutex
      [SCSI] qla2xxx: Correct locking within MSI-X interrupt handlers.
      [SCSI] qla2xxx: Display driver version at module init-time.
      [SCSI] qla2xxx: Return correct port_type to FC-transport for Vports.

commit df6ab559bb1be44a78584e78ae7ad82d4e9e4f51
Merge: 3b5b60b821e0e97531df9b0ba295283ab5a8859a 39eb41ef0732a02acb3babe5ba1df92d76b9fb8f
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Jun 4 08:35:44 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.26
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.26:
      sh: Add defconfig for RSK7203.
      sh: Update SE7206 defconfig.
      sh: Disable 4KSTACKS on nommu.
      sh: fix miscompilation of ip_fast_csum with gcc >= 4.3
      sh: module.c use kernel unaligned helpers
      sh/kernel/cpu/irq/intc-sh5.c build fix

commit 3b5b60b821e0e97531df9b0ba295283ab5a8859a
Merge: d430a227d272fa514bade388bf511dba4ec2962a b33cb815b565a94c654a0fe8e62e36f5b4053888
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Jun 4 08:08:27 2008 -0700

    Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
      kgdbts: Use HW breakpoints with CONFIG_DEBUG_RODATA
      kgdb: use common ascii helpers and put_unaligned_be32 helper

commit d430a227d272fa514bade388bf511dba4ec2962a
Author: Al Viro <viro at ftp.linux.org.uk>
Date:   Mon Jun 2 10:59:02 2008 +0100

    bogus format in ip6mr
    
    ptrdiff_t is %t..., not %Z...
    
    Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit c409d52bd1f16b37d35a50162cbf6401011f1135
Author: Al Viro <viro at ftp.linux.org.uk>
Date:   Mon Jun 2 10:59:02 2008 +0100

    celleb_scc_pciex endianness misannotations
    
    Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 9307245765108a7ec827ef936560f333447c45ef
Author: Al Viro <viro at ftp.linux.org.uk>
Date:   Mon Jun 2 10:59:02 2008 +0100

    mpc52xx_gpio iomem annotations
    
    Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 1a79d1c37178935a3092f73c8832933e9fed1f66
Author: Al Viro <viro at ftp.linux.org.uk>
Date:   Mon Jun 2 10:59:02 2008 +0100

    s2io iomem annotations
    
    Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 1d92cfd54a51ff1b9593019fdde56793b66ba6a9
Author: Al Viro <viro at ftp.linux.org.uk>
Date:   Mon Jun 2 10:59:02 2008 +0100

    cifs endianness fixes
    
    __le16 fields used as host-endian.
    
    Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
    Acked-by: Steve French <smfrench at gmail.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 6399e7acbf9193c7d48827329ca592a1c8dc9e69
Author: Al Viro <viro at ftp.linux.org.uk>
Date:   Mon Jun 2 10:59:02 2008 +0100

    isp1760-if iomem annotations
    
    Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit fa4144b758d58341d4e082ac2af259e97fbcbeee
Author: Al Viro <viro at ftp.linux.org.uk>
Date:   Mon Jun 2 10:59:02 2008 +0100

    cdc-wdm endianness fixes
    
    * wMaxPacketSize is le16; copying it to a field of local structure and then
      using that field as host-endian (size of object to be allocated) is broken.
    * bMaxPacketSize0 is 8-bit; feeding it to le16_to_cpu() is bogus and since the
      result is used as host-endian, it's not even misspelled cpu_to_le16().
    
    Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 76e6f2526ff69eba466f583d94beb7cf6b0bddd6
Author: Al Viro <viro at ftp.linux.org.uk>
Date:   Mon Jun 2 10:59:02 2008 +0100

    usb/c67x00 endianness annotations
    
    Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit a064d5bdd0c9602e4cd930ad949392640b37dda7
Author: Al Viro <viro at ftp.linux.org.uk>
Date:   Mon Jun 2 10:59:02 2008 +0100

    ibmaem endianness annotations
    
    Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 870568b39064cab2dd971fe57969916036982862
Author: Suresh Siddha <suresh.b.siddha at intel.com>
Date:   Mon Jun 2 15:57:27 2008 -0700

    x86, fpu: fix CONFIG_PREEMPT=y corruption of application's FPU stack
    
    Jürgen Mell reported an FPU state corruption bug under CONFIG_PREEMPT,
    and bisected it to commit v2.6.19-1363-gacc2076, "i386: add sleazy FPU
    optimization".
    
    Add tsk_used_math() checks to prevent calling math_state_restore()
    which can sleep in the case of !tsk_used_math(). This prevents
    making a blocking call in __switch_to().
    
    Apparently "fpu_counter > 5" check is not enough, as in some signal handling
    and fork/exec scenarios, fpu_counter > 5 and !tsk_used_math() is possible.
    
    It's a side effect though. This is the failing scenario:
    
    process 'A' in save_i387_ia32() just after clear_used_math()
    
    Got an interrupt and pre-empted out.
    
    At the next context switch to process 'A' again, kernel tries to restore
    the math state proactively and sees a fpu_counter > 0 and !tsk_used_math()
    
    This results in init_fpu() during the __switch_to()'s math_state_restore()
    
    And resulting in fpu corruption which will be saved/restored
    (save_i387_fxsave and restore_i387_fxsave) during the remaining
    part of the signal handling after the context switch.
    
    Bisected-by: Jürgen Mell <j.mell at t-online.de>
    Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
    Tested-by: Jürgen Mell <j.mell at t-online.de>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
    Cc: stable at kernel.org

commit cd76374e9de4501acc74f833dc6cb5e7a5dca115
Author: Pavel Machek <pavel at suse.cz>
Date:   Thu May 29 00:30:21 2008 -0700

    suspend-vs-iommu: prevent suspend if we could not resume
    
    iommu/gart support misses suspend/resume code, which can do bad stuff,
    including memory corruption on resume.  Prevent system suspend in case we
    would be unable to resume.
    
    Signed-off-by: Pavel Machek <pavel at suse.cz>
    Tested-by: Patrick <ragamuffin at datacomm.ch>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit be524fb96081e9e511d993ebf39b05a32b19476e
Author: Andrew Morton <akpm at linux-foundation.org>
Date:   Thu May 29 00:01:28 2008 -0700

    x86: section mismatch fix
    
    Fix this:
    
     WARNING: vmlinux.o(.text+0x114bb): Section mismatch in reference from
     the function nopat() to the function .cpuinit.text:pat_disable()
     The function nopat() references
     the function __cpuinit pat_disable().
     This is often because nopat lacks a __cpuinit
     annotation or the annotation of pat_disable is wrong.
    
    Reported-by: "Fabio Comolli" <fabio.comolli at gmail.com>
    Cc: Sam Ravnborg <sam at ravnborg.org>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 282c454cd3a7041f59a37112bb2f82263bc38f6c
Author: Venki Pallipadi <venkatesh.pallipadi at intel.com>
Date:   Thu May 29 12:01:44 2008 -0700

    x86: fix Xorg crash with xf86MapVidMem error
    
    Clarify the usage of mtrr_lookup() in PAT code, and to make PAT code
    resilient to mtrr lookup problems.
    
    Specifically, pat_x_mtrr_type() is restructured to highlight, under what
    conditions we look for mtrr hint. pat_x_mtrr_type() uses a default type
    when there are any errors in mtrr lookup (still maintaining the pat
    consistency). And, reserve_memtype() highlights its usage ot mtrr_lookup
    for request type of '-1' and also defaults in a sane way on any mtrr
    lookup failure.
    
    pat.c looks at mtrr type of a range to get a hint on what mapping type
    to request when user/API: (1) hasn't specified any type (/dev/mem
    mapping) and we do not want to take performance hit by always mapping
    UC_MINUS. This will be the case for /dev/mem mappings used to map BIOS
    area or ACPI region which are WB'able. In this case, as long as MTRR is
    not WB, PAT will request UC_MINUS for such mappings.
    
    (2) user/API requests WB mapping while in reality MTRR may have UC or
    WC. In this case, PAT can map as WB (without checking MTRR) and still
    effective type will be UC or WC. But, a subsequent request to map same
    region as UC or WC may fail, as the region will get trackked as WB in
    PAT list. Looking at MTRR hint helps us to track based on effective type
    rather than what user requested. Again, here mtrr_lookup is only used as
    hint and we fallback to WB mapping (as requested by user) as default.
    
    In both cases, after using the mtrr hint, we still go through the
    memtype list to make sure there are no inconsistencies among multiple
    users.
    
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
    Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
    Tested-by: Rufus & Azrael <rufus-azrael at numericable.fr>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 511631011d39706ac81ee5e4c9084d61e5b4fd34
Author: Kevin Winchester <kjwinchester at gmail.com>
Date:   Thu May 29 21:14:35 2008 -0300

    x86: fix pointer type warning in arch/x86/mm/init_64.c:early_memtest
    
    Changed the call to find_e820_area_size to pass u64 instead of unsigned long.
    
    Signed-off-by: Kevin Winchester <kjwinchester at gmail.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 2884f110d5409714f3a04eeb6d2ecd77da66b242
Author: Hugh Dickins <hugh at veritas.com>
Date:   Wed May 28 19:36:07 2008 +0100

    x86: fix bad pmd ffff810000207xxx(9090909090909090)
    
    OGAWA Hirofumi and Fede have reported rare pmd_ERROR messages:
    mm/memory.c:127: bad pmd ffff810000207xxx(9090909090909090).
    
    Initialization's cleanup_highmap was leaving alignment filler
    behind in the pmd for MODULES_VADDR: when vmalloc's guard page
    would occupy a new page table, it's not allocated, and then
    module unload's vfree hits the bad 9090 pmd entry left over.
    
    Signed-off-by: Hugh Dickins <hugh at veritas.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 226e9a93a253b7d8811b5ed9ac671c6c5a728022
Author: Ingo Molnar <mingo at elte.hu>
Date:   Tue May 27 09:56:49 2008 +0200

    x86: ioremap fix failing nesting check
    
    Mika Kukkonen noticed that the nesting check in early_iounmap() is not
    actually done.
    
    Reported-by: Mika Kukkonen <mikukkon at srv1-m700-lanp.koti>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Cc: torvalds at linux-foundation.org
    Cc: arjan at linux.intel.com
    Cc: mikukkon at iki.fi
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit e8a496ac8cd00cabbdaa373db4818a9ad19a1c5a
Author: Suresh Siddha <suresh.b.siddha at intel.com>
Date:   Fri May 23 16:26:37 2008 -0700

    x86: fix broken math-emu with lazy allocation of fpu area
    
    Fix the math emulation that got broken with the recent lazy allocation of FPU
    area. init_fpu() need to be added for the math-emulation path aswell
    for the FPU area allocation.
    
    math emulation enabled kernel booted fine with this, in the presence
    of "no387 nofxsr" boot param.
    
    Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
    Cc: hpa at zytor.com
    Cc: mingo at elte.hu
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit 5c1ea08215f1f830dfaf4819a5f22efca41c3832
Author: Steven Rostedt <rostedt at goodmis.org>
Date:   Sun May 25 11:13:32 2008 -0400

    x86: enable preemption in delay
    
    The RT team has been searching for a nasty latency. This latency shows
    up out of the blue and has been seen to be as big as 5ms!
    
    Using ftrace I found the cause of the latency.
    
       pcscd-2995  3dNh1 52360300us : irq_exit (smp_apic_timer_interrupt)
       pcscd-2995  3dN.2 52360301us : idle_cpu (irq_exit)
       pcscd-2995  3dN.2 52360301us : rcu_irq_exit (irq_exit)
       pcscd-2995  3dN.1 52360771us : smp_apic_timer_interrupt (apic_timer_interrupt
    )
       pcscd-2995  3dN.1 52360771us : exit_idle (smp_apic_timer_interrupt)
    
    Here's an example of a 400 us latency. pcscd took a timer interrupt and
    returned with "need resched" enabled, but did not reschedule until after
    the next interrupt came in at 52360771us 400us later!
    
    At first I thought we somehow missed a preemption check in entry.S. But
    I also noticed that this always seemed to happen during a __delay call.
    
       pcscd-2995  3dN.2 52360836us : rcu_irq_exit (irq_exit)
       pcscd-2995  3.N.. 52361265us : preempt_schedule (__delay)
    
    Looking at the x86 delay, I found my problem.
    
    In git commit 35d5d08a085c56f153458c3f5d8ce24123617faf, Andrew Morton
    placed preempt_disable around the entire delay due to TSC's not working
    nicely on SMP.  Unfortunately for those that care about latencies this
    is devastating! Especially when we have callers to mdelay(8).
    
    Here I enable preemption during the loop and account for anytime the task
    migrates to a new CPU. The delay asked for may be extended a bit by
    the migration, but delay only guarantees that it will delay for that minimum
    time. Delaying longer should not be an issue.
    
    [
      Thanks to Thomas Gleixner for spotting that cpu wasn't updated,
        and to place the rep_nop between preempt_enabled/disable.
    ]
    
    Signed-off-by: Steven Rostedt <srostedt at redhat.com>
    Cc: akpm at osdl.org
    Cc: Clark Williams <clark.williams at gmail.com>
    Cc: Peter Zijlstra <peterz at infradead.org>
    Cc: "Luis Claudio R. Goncalves" <lclaudio at uudg.org>
    Cc: Gregory Haskins <ghaskins at novell.com>
    Cc: Linus Torvalds <torvalds at linux-foundation.org>
    Cc: Andi Kleen <andi-suse at firstfloor.org>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit deef325086c3897393b8f7d6bccd03405244fe18
Author: Ingo Molnar <mingo at elte.hu>
Date:   Mon May 12 15:44:38 2008 +0200

    x86: disable preemption in native_smp_prepare_cpus
    
    Priit Laes reported the following warning:
    
    Call Trace:
     [<ffffffff8022f1e1>] warn_on_slowpath+0x51/0x63
     [<ffffffff80282e48>] sys_ioctl+0x2d/0x5d
     [<ffffffff805185ff>] _spin_lock+0xe/0x24
     [<ffffffff80227459>] task_rq_lock+0x3d/0x73
     [<ffffffff805133c3>] set_cpu_sibling_map+0x336/0x350
     [<ffffffff8021c1b8>] read_apic_id+0x30/0x62
     [<ffffffff806d921d>] verify_local_APIC+0x90/0x138
     [<ffffffff806d84b5>] native_smp_prepare_cpus+0x1f9/0x305
     [<ffffffff806ce7b1>] kernel_init+0x59/0x2d9
     [<ffffffff80518a26>] _spin_unlock_irq+0x11/0x2b
     [<ffffffff8020bf48>] child_rip+0xa/0x12
     [<ffffffff806ce758>] kernel_init+0x0/0x2d9
     [<ffffffff8020bf3e>] child_rip+0x0/0x12
    
    fix this by generally disabling preemption in native_smp_prepare_cpus().
    
    Reported-and-bisected-by: Priit Laes <plaes at plaes.org>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit fb3bbd6a663fe972611676381adc4c60ddfe61ac
Author: Yinghai Lu <yhlu.kernel at gmail.com>
Date:   Thu May 22 18:22:30 2008 -0700

    x86: fix APIC warning on 32bit v2
    
    for http://bugzilla.kernel.org/show_bug.cgi?id=10613
    
    BIOS bug, APIC version is 0 for CPU#0! fixing up to 0x10. (tell your hw vendor)
    
    v2: fix 64 bit compilation
    
    Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
    Cc: Andrew Morton <akpm at linux-foundation.org>
    Cc: "Rafael J. Wysocki" <rjw at sisk.pl>
    Cc: Gabriel C <nix.or.die at googlemail.com>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit a57c1bade5a0ee5cd8b74502db9cbebb7f5780b2
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Thu May 29 22:10:58 2008 +0100

    libata-sff: Fix oops reported in kerneloops.org for pnp devices with no ctl
    
    - Make ata_sff_altstatus private so nobody uses it by mistake
    - Drop the 400nS delay from it
    
    Add
    
    ata_sff_irq_status	-	encapsulates the IRQ check logic
    
    This function keeps the existing behaviour for altstatus using devices. I
    actually suspect the logic was wrong before the changes but -rc isn't the
    time to play with that
    
    ata_sff_sync		-	ensure writes hit the device
    
    Really we want an io* operation for 'is posted' eg ioisposted(ioaddr) so
    that we can fix the nasty delay this causes on most systems.
    
    - ata_sff_pause		-	400nS delay
    
    Ensure the command hit the device and delay 400nS
    
    - ata_sff_dma_pause
    
    Ensure the I/O hit the device and enforce an HDMA1:0 transition delay.
    Requires altstatus register exists, BUG if not so we don't risk
    corruption in MWDMA modes. (UDMA the checksum will save your backside in
    theory)
    
    The only other complication then is devices with their own handlers.
    rb532 can use dma_pause but scc needs to access its own altstatus
    register for internal errata workarounds so directly call the drivers own
    altstatus function.
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 4f0ebe3cc57f18ba26317b56b80b108c2848b1de
Author: Tejun Heo <htejun at gmail.com>
Date:   Tue May 20 02:17:50 2008 +0900

    libata: kill unused constants
    
    Kill a few unused constants.
    
    Signed-off-by: Tejun Heo <htejun at gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit ba069e376cc0801cd28352ca5986ce20413acb21
Author: Mark Lord <liml at rtr.ca>
Date:   Sat May 31 16:46:34 2008 -0400

    sata_mv: PHY_MODE4 cleanups
    
    The handling for PHY_MODE4 was originally just cloned from the
    Marvell proprietary driver (with their blessing).
    But we can do better than that.
    
    Tidy things up with some judicious mask definitions, to improve maintainability.
    
    Signed-off-by: Mark Lord <mlord at pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit e1fefea9cc4bc231b5c23fe19e3682fe061dc097
Author: Colin Ian King <colin.king at canonical.com>
Date:   Tue Jun 3 18:59:02 2008 +0200

    [libata] ata_piix: more acer short cable quirks
    
    Add ICH6 on ACER Aspire 1694WLMi to list of laptops that use short cables
    rather than 80 wire
    
    OriginalAuthor: Tiago Sousa
    OriginalLocation: http://launchpadlibrarian.net/11627664/new.ich_laptop.short.cables.diff
    Bug: #187121
    
    Signed-off-by: Colin Ian King <colin.king at canonical.com>
    Signed-off-by: maximilian attems <max at stro.at>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 664d080c41463570b95717b5ad86e79dc1be0877
Author: Holger Macht <hmacht at suse.de>
Date:   Tue Jun 3 20:27:59 2008 +0200

    [libata] ACPI: Properly handle bay devices in dock stations
    
    * Differentiate between bay devices in dock stations and others:
    
     - When an ACPI_NOTIFY_EJECT_REQUEST appears, just signal uevent to
       userspace (that is when the optional eject button on a bay device is
       pressed/pulled) giving the possibility to unmount file systems and to
       clean up. Also, only send uevent in case we get an EJECT_REQUEST
       without doing anything else. In other cases, you'll get an add/remove
       event because libata attaches/detaches the device.
    
     - In case of a dock event, which in turn signals an
       ACPI_NOTIFY_EJECT_REQUEST, immediately detach the device, because it
       may already have been gone
    
    * In case of an ACPI_NOTIFY_DEVICE/BUS_CHECK, evaluate _STA to check if
      the device has been plugged or unplugged. If plugged, hotplug it, if
      unplugged, just signal event to userspace
      (initial patch by Matthew Garrett <mjg59 at srcf.ucam.org>)
    
    * Call ACPI _EJ0 for detached devices
    
    Signed-off-by: Holger Macht <hmacht at suse.de>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 378bd6a5211f05d6d8eb3e78a92e2a197e456e4e
Author: Tony Vroon <tony at linx.net>
Date:   Wed Jun 4 12:08:30 2008 +0200

    [ALSA] hda - COMPAL IFL90/JFL-92 laptop quirk
    
    Use quirk table to assign ALC268_TOSHIBA to COMPAL IFL90/JFL-92 laptops.
    No analog output on autoprobe.
    
    Signed-off-by: Tony Vroon <tony at linx.net>
    Tested-by: Guri <gurashka at gmail.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit ab32cd793dca21eec846a8204390d9594ed994d5
Author: Thomas Graf <tgraf at suug.ch>
Date:   Tue Jun 3 16:37:33 2008 -0700

    route: Remove unused ifa_anycast field
    
    The field was supposed to allow the creation of an anycast route by
    assigning an anycast address to an address prefix. It was never
    implemented so this field is unused and serves no purpose. Remove it.
    
    Signed-off-by: Thomas Graf <tgraf at suug.ch>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit bc3ed28caaef55e7e3a9316464256353c5f9b1df
Author: Thomas Graf <tgraf at suug.ch>
Date:   Tue Jun 3 16:36:54 2008 -0700

    netlink: Improve returned error codes
    
    Make nlmsg_trim(), nlmsg_cancel(), genlmsg_cancel(), and
    nla_nest_cancel() void functions.
    
    Return -EMSGSIZE instead of -1 if the provided message buffer is not
    big enough.
    
    Signed-off-by: Thomas Graf <tgraf at suug.ch>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 1f9d11c7c99da706e33646c3a9080dd5a8ef9a0b
Author: Thomas Graf <tgraf at suug.ch>
Date:   Tue Jun 3 16:36:27 2008 -0700

    route: Mark unused routing attributes as such
    
    Also removes an unused policy entry for an attribute which is
    only used in kernel->user direction.
    
    Signed-off-by: Thomas Graf <tgraf at suug.ch>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 51b77cae0d5aa8e1546fca855dcfe48ddfadfa9c
Author: Thomas Graf <tgraf at suug.ch>
Date:   Tue Jun 3 16:36:01 2008 -0700

    route: Mark unused route cache flags as such.
    
    Also removes an obsolete check for the unused flag RTCF_MASQ.
    
    Signed-off-by: Thomas Graf <tgraf at suug.ch>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 7557af25155a82ac2dad73eec6b0166868bf8ea2
Author: Brice Goglin <Brice.Goglin at inria.fr>
Date:   Tue Jun 3 16:07:45 2008 -0700

    net_dma: remove duplicate assignment in dma_skb_copy_datagram_iovec
    
    No need to compute copy twice in the frags loop in
    dma_skb_copy_datagram_iovec().
    
    Signed-off-by: Brice Goglin <Brice.Goglin at inria.fr>
    Acked-by: Shannon Nelson <shannon.nelson at intel.com>
    Signed-off-by: Maciej Sosnowski <maciej.sosnowski at intel.com>
    Signed-off-by: Dan Williams <dan.j.williams at intel.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit b9f5f52cca3e94f1e7509f366aa250ebbe1ed0b5
Author: Stephen Hemminger <shemminger at vyatta.com>
Date:   Tue Jun 3 16:03:15 2008 -0700

    net: neighbour table ABI problem
    
    The neighbor table time of last use information is returned in the
    incorrect unit. Kernel to user space ABI's need to use USER_HZ (or
    milliseconds), otherwise the application has to try and discover the
    real system HZ value which is problematic.  Linux has standardized on
    keeping USER_HZ consistent (100hz) even when kernel is running
    internally at some other value.
    
    This change is small, but it breaks the ABI for older version of
    iproute2 utilities.  But these utilities are already broken since they
    are looking at the psched_hz values which are completely different. So
    let's just go ahead and fix both kernel and user space. Older
    utilities will just print wrong values.
    
    Signed-off-by: Stephen Hemminger <shemminger at vyatta.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 57c511d8d47caeeae375cb8106662c0bd6a7e7e0
Author: Adrian Bunk <bunk at kernel.org>
Date:   Tue Jun 3 16:00:01 2008 -0700

    bridge: update URL
    
    This patch updates the URL of the bridge homepage.
    
    Signed-off-by: Adrian Bunk <bunk at kernel.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 399dc43bc29fe1ac19340c56c0df84aa0ea53c85
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date:   Tue Jun 3 15:21:21 2008 -0700

    sparc: switch /proc/led to seq_file
    
    Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 9ecad877948deb2871d29e03786a7d7911687009
Author: Pavel Emelyanov <xemul at openvz.org>
Date:   Tue Jun 3 15:18:36 2008 -0700

    irda: Sock leak on error path in irda_create.
    
    Bad type/protocol specified result in sk leak.
    
    Fix is simple - release the sk if bad values are given,
    but to make it possible just to call sk_free(), I move
    some sk initialization a bit lower.
    
    Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 7dccf1f4e1696c79bff064c3770867cc53cbc71c
Author: Jarek Poplawski <jarkao2 at gmail.com>
Date:   Tue Jun 3 14:53:46 2008 -0700

    ax25: Fix NULL pointer dereference and lockup.
    
    From: Jarek Poplawski <jarkao2 at gmail.com>
    
    There is only one function in AX25 calling skb_append(), and it really
    looks suspicious: appends skb after previously enqueued one, but in
    the meantime this previous skb could be removed from the queue.
    
    This patch Fixes it the simple way, so this is not fully compatible with
    the current method, but testing hasn't shown any problems.
    
    Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 537d59af73d894750cff14f90fe2b6d77fbab15b
Author: Dave Young <hidave.darkstar at gmail.com>
Date:   Sun Jun 1 23:50:52 2008 -0700

    bluetooth: rfcomm_dev_state_change deadlock fix
    
    There's logic in __rfcomm_dlc_close:
    	rfcomm_dlc_lock(d);
    	d->state = BT_CLOSED;
    	d->state_changed(d, err);
    	rfcomm_dlc_unlock(d);
    
    In rfcomm_dev_state_change, it's possible that rfcomm_dev_put try to
    take the dlc lock, then we will deadlock.
    
    Here fixed it by unlock dlc before rfcomm_dev_get in
    rfcomm_dev_state_change.
    
    why not unlock just before rfcomm_dev_put? it's because there's
    another problem.  rfcomm_dev_get/rfcomm_dev_del will take
    rfcomm_dev_lock, but in rfcomm_dev_add the lock order is :
    rfcomm_dev_lock --> dlc lock
    
    so I unlock dlc before the taken of rfcomm_dev_lock.
    
    Actually it's a regression caused by commit
    1905f6c736cb618e07eca0c96e60e3c024023428 ("bluetooth :
    __rfcomm_dlc_close lock fix"), the dlc state_change could be two
    callbacks : rfcomm_sk_state_change and rfcomm_dev_state_change. I
    missed the rfcomm_sk_state_change that time.
    
    Thanks Arjan van de Ven <arjan at linux.intel.com> for the effort in
    commit 4c8411f8c115def968820a4df6658ccfd55d7f1a ("bluetooth: fix
    locking bug in the rfcomm socket cleanup handling") but he missed the
    rfcomm_dev_state_change lock issue.
    
    Signed-off-by: Dave Young <hidave.darkstar at gmail.com>
    Acked-by: Marcel Holtmann <marcel at holtmann.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 64e9159f5d2c4edf5fa6425031e556f8fddaf7e6
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Tue Jun 3 15:18:54 2008 +0100

    serial_core: uart_set_ldisc infrastructure
    
    The tty layer provides a callback that is used when the line discipline
    is changed. Some hardware uses this to configure hardware specific
    features such as IrDA mode on serial ports. Unfortunately the serial
    layer does not provide this feature or pass it down to drivers.
    
    Blackfin used to hack around this by rewriting the tty ops, but those are
    now properly shared and const so the hack fails. Instead provide the
    proper operations.
    
    This change plus a follow up from the Blackfin guys is needed to avoid
    blackfin losing features in this release.
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 07bc76dfa19b10017b518dd9aa1b2719e8c863de
Author: Takashi Iwai <tiwai at suse.de>
Date:   Tue Jun 3 14:46:34 2008 +0200

    [ALSA] hda - Fix resume of auto-config mode with Realtek codecs
    
    The auto-config mode of Realtek ALC codecs has a bug since 2.6.25
    that it cannot resume properly.  The problem was the wrong assignment
    of init_hook that overrides the whole initialization.
    
    Relevant bug reports:
    	http://bugzilla.kernel.org/show_bug.cgi?id=10662
    	https://bugzilla.novell.com/show_bug.cgi?id=385473
    
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 39eb41ef0732a02acb3babe5ba1df92d76b9fb8f
Author: Paul Mundt <lethal at linux-sh.org>
Date:   Tue Jun 3 20:30:10 2008 +0900

    sh: Add defconfig for RSK7203.
    
    RSK7203 is supportable through the generic machvec, so we add a defconfig
    for those bits. This gets updated with more complete board support later.
    
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit f8cc3566d2e26ba1d9afd063ff5be40014e2e269
Author: Paul Mundt <lethal at linux-sh.org>
Date:   Tue Jun 3 20:29:55 2008 +0900

    sh: Update SE7206 defconfig.
    
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit 4b34fe156455d26ee6ed67b61539f136bf4e439c
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date:   Mon Jun 2 16:42:49 2008 -0600

    PNP: mark resources that conflict with PCI devices "disabled"
    
    Both the PNP/PCI conflict detection quirk and the PNP system
    driver must use the same mechanism to mark resources as disabled.
    
    I think it's best to keep the resource and to keep the type bit
    (IORESOURCE_MEM, etc), so that we match the list from firmware
    as closely as possible.
    
    Fixes this regression from 2.6.25: http://lkml.org/lkml/2008/6/1/82
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
    Tested-by: Avuton Olrich <avuton at gmail.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit c3b25b32e8bef526cca748e1ba023c6bdd705a99
Merge: 28928b2f1d769abdc173c96e2632d30cbde9ec4a c4913c7b71abc79b008a3c118628cfb59bdb0efc
Author: Linus Torvalds <torvalds at 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: 63e14626eddb534ab429e9c2b95d3f7038b596b6 0f475b2abed6cbccee1da20a0bef2895eb2a0edd
Author: Linus Torvalds <torvalds at 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 at 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 at ru.mvista.com>
    Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit b09916e4f07de1cb2259cb01ec31e6ce535471bc
Merge: 00e98a9992641a14ace0bbc2dfcbc4e856ac3fd3 96d97f262aa6120f8dd8e8e9c7a0b0677de7e29e
Author: Linus Torvalds <torvalds at 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: f365ad5fc001cbd02968a376e0aecffe52ce79e1 a4ed1e41a734d77c9a83a88a8736e19b68e6a2a0
Author: Linus Torvalds <torvalds at 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: 61ac7bf538db2044d0238fcd87b3d9df59294bf2 9c8b28c2ef532c2cf32b59aaa0bc07eb3b866ef7
Author: Linus Torvalds <torvalds at 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 at 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 at gmail.com>
    Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>

commit 1f8404ea5fd8c408d0a7c12a88091dffb7b6768b
Author: Paul Mundt <lethal at linux-sh.org>
Date:   Mon Jun 2 13:48:59 2008 +0900

    sh: Disable 4KSTACKS on nommu.
    
    4k stacks on nommu ends up blowing up with all sorts of interesting
    slab corruption. Disable this by default unless BROKEN is also
    enabled.
    
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit d02d6be5d52a98be32c93d2ea7a0068991774a20
Author: Paul Mundt <lethal at linux-sh.org>
Date:   Mon Jun 2 12:40:14 2008 +0900

    sh: fix miscompilation of ip_fast_csum with gcc >= 4.3
    
    As noted by Matthew Wilcox:
    
        Kyle McMartin just tracked down a bug on parisc to a missing
        "memory" clobber in the inline assembly implementation of
        ip_fast_csum.  The FRV, SH and Xtensa ports are also missing a
        memory clobber, so I thought it would be polite to let you know.
    
        The bug manifests as dropped network packets (obviously they have
        the wrong checksum).  It started appearing for parisc with GCC 4.3.
    
        The GCC manual says:
    
         If your assembler instructions access memory in an unpredictable
         fashion, add `memory' to the list of clobbered registers.  This
         will cause GCC to not keep memory values cached in registers
         across the assembler instruction and not optimize stores or loads
         to that memory.
    
        I see that FRV has a 400 byte memory output which may prevent this
        problem from appearing, but SH and Xtensa have nothing to prevent
        this bug.  Hope this saves you a few days of debugging.
    
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit 1f9d29493992ddd6af6b3e313a603770f29c0408
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Wed May 28 16:38:17 2008 -0700

    sh: module.c use kernel unaligned helpers
    
    Replace the COPY_UNALIGNED_WORD helper.
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit 2beb0e2893b900fa5fb07ccf73a976c06a93b764
Author: Adrian Bunk <bunk at kernel.org>
Date:   Fri May 30 01:04:49 2008 +0300

    sh/kernel/cpu/irq/intc-sh5.c build fix
    
    This patch fixes the following build error caused by
    commit a1dc4b59fa4af97ae68ee214d4d72bbd7c7ec1dc
    (sh: intc_sh5 depends on cayman board for IRQ priority table.):
    
    <--  snip  -->
    
    ...
      CC      arch/sh/kernel/cpu/irq/intc-sh5.o
    /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/sh/kernel/cpu/irq/intc-sh5.c: In function 'plat_irq_setup':
    /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/sh/kernel/cpu/irq/intc-sh5.c:257: error: expected declaration or statement at end of input
    make[4]: *** [arch/sh/kernel/cpu/irq/intc-sh5.o] Error 1
    
    <--  snip  -->
    
    Reported-by: Adrian Bunk <bunk at kernel.org>
    Signed-off-by: Adrian Bunk <bunk at kernel.org>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit 96d97f262aa6120f8dd8e8e9c7a0b0677de7e29e
Author: Sam Ravnborg <sam at 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 at ravnborg.org>
    Cc: Tvrtko <tvrtko.ursulin at sophos.com>
    Cc: Andrea Arcangeli <andrea at qumranet.com>
    Cc: "Rafael J. Wysocki" <rjw at sisk.pl>

commit a4ed1e41a734d77c9a83a88a8736e19b68e6a2a0
Author: Bryan Wu <cooloney at 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 at hvsistemas.es>
    Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
    Cc: Russell King <rmk+lkml at arm.linux.org.uk>
    Signed-off-by: Bryan Wu <cooloney at kernel.org>

commit a70ce072b3883e431575449f3e294c27235590e5
Author: Mike Frysinger <vapier.adi at 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 at gmail.com>
    Signed-off-by: Bryan Wu <cooloney at kernel.org>

commit b06dcee9c8d24ef903dc0d192af22b8e179eef4b
Author: Michael Hennerich <michael.hennerich at 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 at analog.com>
    Signed-off-by: Bryan Wu <cooloney at kernel.org>

commit 2eb74ae20e65e71c2d5bf7b8ad7d0ac5d5acf55f
Author: Bryan Wu <cooloney at 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 at kernel.org>

commit 9c8b28c2ef532c2cf32b59aaa0bc07eb3b866ef7
Author: Timur Tabi <timur at 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 at freescale.com>
    Signed-off-by: Paul Mackerras <paulus at samba.org>

commit 6907fa26d8934904a4c2594034c1affd8d717cae
Author: Tony Breeds <tony at 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 at bakeyournoodle.com>
    Signed-off-by: Paul Mackerras <paulus at samba.org>

commit cfab3bdf8292edec19492c89520b1ad11279a648
Author: Benjamin Herrenschmidt <benh at 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 at kernel.crashing.org>
    Signed-off-by: Paul Mackerras <paulus at samba.org>

commit 56997fa838e333cea33ab641d4aeedd23aef0eb1
Author: Grant Grundler <grundler at parisc-linux.org>
Date:   Mon May 12 00:37:51 2008 -0600

    [netdrvr] tulip: oops in tulip_interrupt when hibernating with swsusp/suspend2
    
    The following patch is seems to fix the tulip suspend/resume panic:
    	http://bugzilla.kernel.org/show_bug.cgi?id=8952#c46
    
    My attempts at a cleaner patch failed and Pavel thinks this is OK.
    
    Original from:  kernelbugs at tap.homeip.net
    Signed-off-by: Grant Grundler <grundler at parisc-linux.org>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit aefdbf1a3b832a580a50cf3d1dcbb717be7cbdbe
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date:   Fri May 23 02:00:25 2008 +0400

    atl1: fix 4G memory corruption bug
    
    When using 4+ GB RAM and SWIOTLB is active, the driver corrupts
    memory by writing an skb after the relevant DMA page has been
    unmapped.  Although this doesn't happen when *not* using bounce
    buffers, clearing the pointer to the DMA page after unmapping
    it fixes the problem.
    
    http://marc.info/?t=120861317000005&r=2&w=2
    
    Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
    Signed-off-by: Jay Cliburn <jacliburn at bellsouth.net>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 08722bc4a066705e3f5fb4a5a87ce717fe9f896e
Author: Li Yang <leoli at freescale.com>
Date:   Fri May 23 18:11:27 2008 +0800

    ucc_geth_ethtool: Add a missing HW stats counter
    
    Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund at transmode.se>
    Signed-off-by: Li Yang <leoli at freescale.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 25f03dcf63d233c13970751253b62a678bd85ccc
Author: Joakim Tjernlund <Joakim.Tjernlund at transmode.se>
Date:   Fri May 23 18:11:26 2008 +0800

    ucc_geth_ethtool: Fix typo
    
    Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund at transmode.se>
    Signed-off-by: Li Yang <leoli at freescale.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 11a3a1546d0adc36485c2ad4af7ab950712df6ff
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Mon May 26 17:48:13 2008 +1000

    virtio: fix delayed xmit of packet and freeing of old packets.
    
    Because we cache the last failed-to-xmit packet, if there are no
    packets queued behind that one we may never send it (reproduced here
    as TCP stalls, "cured" by an outgoing ping).
    
    Cc: Mark McLoughlin <markmc at redhat.com>
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 7eb2e25112bf920bb0a4d1cca445f3d96874c25f
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Mon May 26 17:42:42 2008 +1000

    virtio: fix virtio_net xmit of freed skb bug
    
    If we fail to transmit a packet, we assume the queue is full and put
    the skb into last_xmit_skb.  However, if more space frees up before we
    xmit it, we loop, and the result can be transmitting the same skb twice.
    
    Fix is simple: set skb to NULL if we've used it in some way, and check
    before sending.
    
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit d399cf8c04c595d738d82d02ae2755b902a51571
Author: Brice Goglin <brice at myri.com>
Date:   Wed May 28 09:10:01 2008 +0200

    myri10ge: update driver version
    
    Update myri10ge version to 1.3.99-1.347.
    
    Signed-off-by: Brice Goglin <brice at myri.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 6f94f709b5b1d3a9b5f1ff7d4f3534de6cde3ff6
Author: Cesar Eduardo Barros <cesarb at cesarb.net>
Date:   Thu May 29 21:58:36 2008 -0300

    sc92031: remove bogus unlikely()
    
    Commit 5a0a92e67b5009a71e011658da04fb92dad8961f mentions len < ETH_ZLEN
    is true for ARP packets. This obviously is not unlikely.
    
    Signed-off-by: Cesar Eduardo Barros <cesarb at cesarb.net>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 17a9440f7deb781935c76e2e55d376a35611a6f9
Author: Wang Chen <wangchen at cn.fujitsu.com>
Date:   Fri May 30 11:18:55 2008 +0800

    [netdrvr] CS89X0: Add cleanup for dma after fail
    
    After request_dma() succeeding, any error path should do free_dma().
    
    Signed-off-by: Wang Chen <wangchen at cn.fujitsu.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit b055629eaef7758b35dc91c76cf4f158025562bf
Author: Ben Hutchings <bhutchings at solarflare.com>
Date:   Fri May 30 22:18:35 2008 +0100

    [netdrvr] sfc: Report XAUI link down at default log level
    
    This is normal when the external link is down so don't report it as an error.
    
    Signed-off-by: Ben Hutchings <bhutchings at solarflare.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 61ac7bf538db2044d0238fcd87b3d9df59294bf2
Merge: 14d03fd98e076c6e60e1085a962410dc4d70ab59 3072c379bccfa2844e33103ed9ff530780e660ea
Author: Linus Torvalds <torvalds at 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 at 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 at oracle.com>
    Signed-off-by: Mark Fasheh <mfasheh at suse.com>

commit 959040c37a8cae8117907d4aed87f1b01ff1ea19
Author: Sunil Mushran <sunil.mushran at 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 at oracle.com>
    Signed-off-by: Mark Fasheh <mfasheh at suse.com>

commit 271d772d02507c7541d5e6b4938ed2380e59a39a
Author: Sunil Mushran <sunil.mushran at 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 at oracle.com>
    Signed-off-by: Mark Fasheh <mfasheh at suse.com>

commit a12630b186d56a77d17c9b34c82b88dda4337ed7
Author: Joel Becker <joel.becker at 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 at oracle.com>
    Signed-off-by: Mark Fasheh <mfasheh at suse.com>

commit 14d03fd98e076c6e60e1085a962410dc4d70ab59
Author: Linus Torvalds <torvalds at 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 at linux-foundation.org>

commit 28d7647de2ee075aaed5ca835f445e885884f163
Author: Andrew Vasquez <andrew.vasquez at qlogic.com>
Date:   Mon May 19 14:25:41 2008 -0700

    [SCSI] qla2xxx: Update version number to 8.02.01-k4.
    
    Signed-off-by: Andrew Vasquez <andrew.vasquez at qlogic.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit 08b95a12cd956e98b4a1ad5b638935dcb6c88c67
Author: Seokmann Ju <seokmann.ju at qlogic.com>
Date:   Mon May 19 14:25:40 2008 -0700

    [SCSI] qla2xxx: Correct handling of AENs postings for vports.
    
    Initialize all proper structure members in order to support
    work-list vport processing.  This code also properly acquires the
    correct (physical hardware_lock) lock during work submission.
    
    Signed-off-by: Seokmann Ju <seokmann.ju at qlogic.com>
    Signed-off-by: Andrew Vasquez <andrew.vasquez at qlogic.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit 3c39740073b20d4cbb0e3567225500e96acf383c
Author: Seokmann Ju <seokmann.ju at qlogic.com>
Date:   Mon May 19 14:25:39 2008 -0700

    [SCSI] qla2xxx: Revert "qla2xxx: Use proper HA during asynchronous event handling."
    
    This reverts commit bd2a1846b2313e32d0270151a31a6b8335384a20.
    The original (prior to the reverted commit) code was correct.
    Additionally, the vp_idx should be checked during MBA_PORT_UPDATE
    in order for proper handling to take place for a given vport.
    
    Signed-off-by: Seokmann Ju <seokmann.ju at qlogic.com>
    Signed-off-by: Andrew Vasquez <andrew.vasquez at qlogic.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit ab8cd81830fef799177740d5ab709c0341e9ba5c
Merge: f8356ed00ebcdc2f209504c02b4ab8ba9a8a7ebe 20887611523e749d99cc7d64ff6c97d27529fbae
Author: Linus Torvalds <torvalds at 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: 7536d7be7b718f8c5834cbcb7601816562e1b805 a9b841e1a336822a25899ec8cdf70a55a6696ae7
Author: Linus Torvalds <torvalds at 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: 57f50ca127a3189566af0d6378394c75a26f0f7e 5adad0133907790c50283bf03271d920d6897043
Author: Linus Torvalds <torvalds at 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 at elte.hu>
Date:   Fri May 30 17:02:50 2008 +0200

    drivers/watchdog/geodewdt.c: build fix
    
    * Wim Van Sebroeck <wim at iguana.be> wrote:
    
    > Author: Jordan Crouse <jordan.crouse at 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 at elte.hu>
    Acked-by: Jordan Crouse <jordan.crouse at amd.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit a9b841e1a336822a25899ec8cdf70a55a6696ae7
Author: Benjamin Herrenschmidt <benh at 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 at kernel.crashing.org>
    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>

commit 3072c379bccfa2844e33103ed9ff530780e660ea
Author: peerchen <peerchen at 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 at gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 034d8e8f273fcb02bebd6a62d8023ffa409fe92f
Author: Ashish Kalra <ashish.kalra at 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 at freescale.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 19ef9d5e45ce805700f34c248a71a511877b8a5d
Author: Tejun Heo <htejun at 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 at gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit ec2a20e61974f7c9ebe6dd99ac479ec309a750bc
Author: Randy Dunlap <randy.dunlap at 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 at oracle.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 2da676594a73825f10d2a99358cc7465119684f9
Author: Pradeep Singh Rautela <rautelap at 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 at gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 23cf296e3b047da46112eb6b4dc89917c93c8f19
Author: Tejun Heo <htejun at 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 at gmail.com>
    Cc: MATSUBAYASHI 'Shaolin' Kohji <shaolin at rhythmaning.org>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 0388a8c0d54aa039758a8eca68d82325a563f8db
Author: Mark Lord <liml at 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 at pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit b406c7a6655da7a2fcd9f72e41262f93ff707748
Author: Mark Lord <liml at 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 at pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 5cf73bfb061552aa18d816d2859409be9ace5306
Author: Mark Lord <liml at 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 at pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 8c30a8b9b574cf6c51e207464b852a6f559da153
Author: Mark Lord <liml at 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 at pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 1f39847255a02c69190ae30c33b8ccf4c10840df
Author: Mark Lord <liml at 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 at pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 79d06432a27601f096e08716fee3f0a7d3b68d5f
Author: Takashi Iwai <tiwai at suse.de>
Date:   Fri May 30 16:54:49 2008 +0200

    [ALSA] hda - Fix model for LG LS75 laptop
    
    Set the proper model for LG LS75 with CM9880 codec.
    See ALSA bug#2105:
    	https://bugtrack.alsa-project.org/alsa-bug/view.php?id=2105
    
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 1beee8dc8cf58e3f605bd7b34d7a39939be7d8d2
Merge: 9db8ee3d96e98705ba4e9260815ca326b0d07741 3446b9d57edd0b96a89715fef222879e4919a115
Author: Linus Torvalds <torvalds at 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: e3aa51fecdc941c859ed0515084323d3f997aa4a 0066ed55a9a061ed64bbc09c16f45daf0b976ac5
Author: Linus Torvalds <torvalds at 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 at 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 at gmail.com>
    Acked-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 5adad0133907790c50283bf03271d920d6897043
Author: Henrique de Moraes Holschuh <hmh at 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 at hmh.eng.br>
    Signed-off-by: Dmitry Torokhov <dtor at mail.ru>

commit 501a5250589be41c4c060afa855bc60b4539a340
Author: Dmitry Torokhov <dmitry.torokhov at 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 at diku.dk>
    Signed-off-by: Dmitry Torokhov <dtor at mail.ru>

commit 269ef19caa16650bf3a68fd33a6cb800683419dd
Author: Takashi Iwai <tiwai at suse.de>
Date:   Fri May 30 15:32:15 2008 +0200

    [ALSA] hda - Fix mic input on HP2133
    
    The mic pins are wrongly assigned on AD1884A mobile model.
    The mic handling is fixed for the automatic mic selection, too.
    
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit e48d6d97bb6bd8c008045ea0522ea8278fdccc55
Author: Takashi Iwai <tiwai at suse.de>
Date:   Thu May 29 08:16:56 2008 +0200

    [ALSA] ac97 - Fix ASUS A9T laptop output
    
    ASUS A9T laptop uses line-out pin as the real front-output while
    other devices use it as the surround.
    
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 3446b9d57edd0b96a89715fef222879e4919a115
Author: Arnaldo Carvalho de Melo <acme at 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 at gmail.com>
    Tested-by: Dmitry Petukhov <dmgenp at gmail.com>
    Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit fbaa20f66a8283359523dfe961ebe66f0b8fac59
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date:   Fri May 30 02:01:28 2008 -0700

    sparc64: IO accessors fix
    
    From: Benjamin Herrenschmidt <benh at kernel.crashing.org>
    
    I added a full memory clobber on all asm accessors except the _raw
    ones.
    
    Signed-off-by: David S. Miller <davem at davemloft.net>

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

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

commit 209fb9090f4ca5874289c9ca82991393f85c1eff
Author: Martin Schwidefsky <schwidefsky at 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 at de.ibm.com>

commit 4657fb8a98a4e02981a574492bbe470c147b6657
Author: Martin Schwidefsky <schwidefsky at 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 at de.ibm.com>

commit 54ad64129cc166b9eec7151f3f9fc83589e33555
Author: Martin Schwidefsky <schwidefsky at 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 at de.ibm.com>

commit c80ee724966a8ce9a68020d9095233fb1c6f57e8
Author: Stefan Haberland <stefan.haberland at 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 at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit d4820e44b0ae6830b1d634e6d0a425d839388c06
Author: Heiko Carstens <heiko.carstens at 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 at de.ibm.com>
    Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit c1bb7f31eaef6ed6b9f895b99d9ea12e6b853606
Author: Heiko Carstens <heiko.carstens at 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 at saeurebad.de>
    Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit 1760537b69123905bf4f4b56f5746ae4547e9694
Author: Gerald Schaefer <gerald.schaefer at 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 at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit 67060d9c1f5d91c917cc51bed464cb5638eaddbc
Author: Heiko Carstens <heiko.carstens at 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 at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit bebd9a455b2593ba6543b961bc82c43350c2d8d9
Author: Christian Borntraeger <borntraeger at 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 at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit f71ad62a264a89cb1952df0c92b167005de8d1b0
Author: Michael Holzheu <holzheu at 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 at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit 97195d6b411fec8e33aa55b6a7c3dde7984d65ca
Author: Hans-Joachim Picht <hans at 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 at linux.vnet.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit 20887611523e749d99cc7d64ff6c97d27529fbae
Author: Rusty Russell <rusty at 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 at rustcorp.com.au>

commit b4f68be6c5d507afdcd74f5be3df0b1209cda503
Author: Rusty Russell <rusty at 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 at rustcorp.com.au>

commit 7757f09c70af87887dfc195e6d6ddd54f5cc7c39
Author: Christian Borntraeger <borntraeger at 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 at de.ibm.com>
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>

commit 7f31fe05000af54e1af81f65a96cab90db8d7ed8
Author: Christian Borntraeger <borntraeger at 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 at de.ibm.com>
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>

commit 52a3a05f3ab82655ffa4c9bf6835565c98a3c2e5
Author: Christian Borntraeger <borntraeger at 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 at de.ibm.com>
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>

commit f7f510ec195781c857ab76366a3e1c59e1caae42
Author: Rusty Russell <rusty at 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 at de.ibm.com>
    
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>

commit 3ef536095446552823fc488fec1c5451aab1260d
Author: Christian Borntraeger <borntraeger at 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 at de.ibm.com>
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>

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

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

commit b769f579081943f14e0ff03b7b0bd3a11cf14625
Author: Rusty Russell <rusty at 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 at rustcorp.com.au>
    Cc: Christian Borntraeger <borntraeger at de.ibm.com>
    Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
    Cc: Carsten Otte <cotte at de.ibm.com>
    Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
    Cc: Chris Lalancette <clalance at redhat.com>
    Cc: Anthony Liguori <anthony at codemonkey.ws>

commit 5610bd1524332fe7d651eb56cc780e32763a2ac3
Author: Rusty Russell <rusty at 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 at rustcorp.com.au>
    Cc: Christian Borntraeger <borntraeger at de.ibm.com>
    Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
    Cc: Carsten Otte <cotte at de.ibm.com>
    Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
    Cc: Chris Lalancette <clalance at redhat.com>
    Cc: Anthony Liguori <anthony at codemonkey.ws>

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

    virtio: bus_id for devices should contain 'virtio'
    
    Chris Lalancette <clalance at 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 at rustcorp.com.au>
    Cc: Christian Borntraeger <borntraeger at de.ibm.com>
    Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
    Cc: Carsten Otte <cotte at de.ibm.com>
    Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
    Cc: Chris Lalancette <clalance at redhat.com>
    Cc: Anthony Liguori <anthony at codemonkey.ws>

commit ac9d463afb1ca2434335351f3b7d9e4c8f8470e9
Author: Chris Lalancette <clalance at 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 at redhat.com>
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au> (moved del_gendisk up)

commit e27810f11340987df123a99eb9ae14c054a55639
Author: Rusty Russell <rusty at 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 at rustcorp.com.au>

commit 916941b2bfd9c4a8b66855f198ae16c3f51ef570
Merge: fbf4d7ffda0398e8b20aa8b34ca751bf946699ef 413c239fad68258157f903b3ffd9bfcc53f5e34b
Author: Linus Torvalds <torvalds at 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: 4bd27972e2c35b1e9e672ff05e0a781644f9c905 bb7e6984ecaebe6989d0e781e303469255871432
Author: Linus Torvalds <torvalds at 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 at 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 at vrfy.org>
    Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit bb7e6984ecaebe6989d0e781e303469255871432
Author: Greg Kroah-Hartman <gregkh at 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 at suse.de>

commit 185e3dead35dacb79c8cca1073fd67a26d09a0d7
Author: Li Yang <leoli at 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 at freescale.com>
    Cc: Eugene T. Bordenkircher <Eugene_Bordenkircher at selinc.com>
    Acked-by: David Brownell <dbrownell at users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit a7f3872c43b8001f01000f79583d422c6995f98d
Author: Michael Karcher <kernel at 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 at mkarcher.dialup.fu-berlin.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 4be2fa186d54758296d30c565d7b5111dd45b000
Author: Steve Murphy <steve at 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 at gnusis.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 598eff6d2f3b8805232edc5f4a6b0c1e698dc482
Author: René Rebe <rene at 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 at exactcode.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 2a8bc9e7cfb1761a62ea897b407ea13ec887fd0c
Author: Javier Smaldone <javier at 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 at smaldone.com.ar>
    Signed-off-by: Phil Dibowitz <phil at ipom.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit c5f23b0e08d84f4efc20dece04d7b6796dcc6774
Author: Phil Dibowitz <phil at 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 at ballbreaker.dk>.
    
    Signed-off-by: Phil Dibowitz <phil at ipom.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit c7257bd2ecb7b4cc42f9f152c7c059258d434169
Author: Alan Stern <stern at 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 at rowland.harvard.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit fa38dfcc56b5f6cce787f9aaa5d1830509213802
Author: Alan Stern <stern at 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 at rowland.harvard.edu>
    Cc: David Brownell <david-b at pacbell.net>
    Cc: Leonid <leonidv11 at gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit b40e43fcc532fa44a375a37d592e32cd0d50fe7a
Author: Alan Stern <stern at 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 at rowland.harvard.edu>
    Acked-by: David Brownell <dbrownell at users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit d1f114d12bb4db3147e1b1342ae31083c5a79c84
Author: Alan Stern <stern at 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 at rowland.harvard.edu>
    Acked-by: David Brownell <dbrownell at users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 3a31155cfff0935e4b178f3dca733d2d60d2eb8d
Author: Alan Stern <stern at 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 at rowland.harvard.edu>
    CC: David Brownell <david-b at pacbell.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit a8e5177583e975fc1f7c621c93956f494df9b979
Author: Alan Stern <stern at 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 at rowland.harvard.edu>
    Acked-by: David Brownell <dbrownell at users.sourceforge.net>

commit 217a9081d8e69026186067711131b77f0ce219ed
Author: Alan Stern <stern at 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 at rowland.harvard.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit e16362a0c8d90e9adbfe477acbe32b021823fb22
Author: Alan Stern <stern at 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 at rowland.harvard.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 62d104d0deeabd4148e49eba729d963e740e205f
Author: Matthew Garrett <mjg59 at 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 at redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit ebb3770c01a8afd049e3e91b0a026dcdfcb2da9f
Author: Ray Molenkamp <rmolenkamp at 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 at matrixorbital.ca>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 4bd27972e2c35b1e9e672ff05e0a781644f9c905
Merge: a7f75d3bed2871655d9806c62a5d6f46552b9a4a dca026139317dcbc642a30320d551f559692182f
Author: Linus Torvalds <torvalds at 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: 3897b82c3586e774260d6bca56cc1efca79cd335 6715930654e06c4d2e66e718ea159079f71838f4
Author: Linus Torvalds <torvalds at 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 at 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 at KARO-electronics.de>
    Signed-off-by: Dave Jones <davej at redhat.com>

commit 6715930654e06c4d2e66e718ea159079f71838f4
Merge: ea3f01f8afd3bc5daff915cc4ea5cc5ea9e7d427 e490517a039a99d692cb3a5561941b0a5f576172
Author: Ingo Molnar <mingo at 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 at 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 at 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 at parallels.com>
    Signed-off-by: Patrick McHardy <kaber at trash.net>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit b3137bc8e77962a8e3b4dfdc1bcfd38e437bd278
Author: Mike Galbraith <efault at 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 at gmx.de>
    Signed-off-by: Peter Zijlstra <peterz at infradead.org>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit a381759d6ad5c5dea5a981918e0b4493e9b66ac7
Author: Peter Zijlstra <a.p.zijlstra at 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 at chello.nl>

commit 6363ca57c76b7b83639ca8c83fc285fa26a7880e
Author: Ingo Molnar <mingo at 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 at 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 at linux.intel.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

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

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

commit c6fba5451a84143f34056a465e72ba187fcc651c
Author: Adrian Bunk <bunk at 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 at kernel.org>
    Cc: Mike Travis <travis at sgi.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 3f33a7ce9567ded582af1ab71f9802165fe12f09
Author: Roel Kluin <roel.kluin at 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 at gmail.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit f9305d4a0968201b2818dbed0dc8cb0d4ee7aeb3
Author: Ingo Molnar <mingo at 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 at 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 at linux.intel.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 8c3a01d0c259ec8b283c52dbeadda0122582a68b
Merge: 4c8411f8c115def968820a4df6658ccfd55d7f1a c97c23e38625f59e3e9869664eeeb0cab1822948
Author: David S. Miller <davem at 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 at 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 at linux.intel.com>
    Acked-by: Marcel Holtmann <marcel at holtmann.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit c97c23e38625f59e3e9869664eeeb0cab1822948
Author: Senthil Balasubramanian <senthilkumar at 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 at atheros.com>
    Signed-off-by: Luis R. Rodriguez <lrodriguez at atheros.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 70d251b24c44ab2fcba1807a5206e844cf10eb38
Author: Senthil Balasubramanian <senthilkumar at 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 at atheros.com>
    Signed-off-by: Luis Rodriguez <lrodriguez at atheros.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit f6d97104890203ba9c2cf8e34894c4c8e64cb880
Author: Yi Zhu <yi.zhu at 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 at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit a7624837261b55259d4a88309fd88529643fbb80
Author: Jussi Kivilinna <jussi.kivilinna at 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 at mbnet.fi>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 135a5484c3e0c6710035630b630cef3c856b78e2
Author: Guy Cohen <guy.cohen at 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 at intel.com>
    Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 47cfd463962ab0748ecbad761ff6ef2916b54aac
Author: Guy Cohen <guy.cohen at 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 at intel.com>
    Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 4364623cb79d02945ace7a4faa1f11e617dde198
Author: Scott Ashcroft <scott.ashcroft at 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 at talk21.com>
    [edit: cleanups]
    Signed-off-by: Jussi Kivilinna <jussi.kivilinna at mbnet.fi>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit d4231ca3e162387a2b6964dacaa83604e065c4e9
Author: Abhijeet Kolekar <abhijeet.kolekar at 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 at intel.com>
    Acked-by: Dan Williams <dcbw at redhat.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 633257d3db547e7553500f05e0aa2692c876d7a5
Author: Ivo van Doorn <ivdoorn at 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 at gmail.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit f06a0f486dc8bbe8808f46b81fbfd73241529fae
Author: Ivo van Doorn <ivdoorn at 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 at gmail.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 2088d4174e4292aef892bb7095fc3c3ea5bd117c
Author: Ivo van Doorn <ivdoorn at 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 at gmail.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 0f3e63a55b1a7b695a79bf3eec2ff5ab6b336037
Author: Ivo van Doorn <ivdoorn at 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 at gmail.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 9381be059bf5831d259e8735005cfa35b7488543
Author: Tomas Winkler <tomas.winkler at 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 at intel.com>
    Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
    Acked-by: Dan Williams <dcbw at redhat.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 3bf0a32e22fedc0b46443699db2d61ac2a883ac4
Author: Michael Buesch <mb at 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 at bu3sch.de>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 167ad6f7a2b2ae58dfaa46620b9b3212594f38e6
Author: Tomas Winkler <tomas.winkler at 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 at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 679fda1aa49fddf938bb699df7867c01988371ab
Author: Nicolas Kaiser <nikai at 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 at nikai.net>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 6b4bec010d888c5b8c731aa596635cd83dd3416c
Author: Michael Buesch <mb at 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 at bu3sch.de>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit bc1b1fb2753873314ad1bf56bc7d5b8dd447cd2a
Author: Andrea Merello <andrea.merello at 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 at tiscali.it>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 0a0ab41e833c8184c6d4ab663f137d5bbd50e049
Author: Andrea Merello <andrea.merello at 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 at tiscali.it>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 0823b2c3c10a4db21cd39a8c72cda96b4dd6d914
Author: Andrea Merello <andreamrl at 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 at tiscali.it>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 6f6c218f68e632e4596cae6e6d43658d26a5e0fe
Author: John W. Linville <linville at 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 at 163.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 3897b82c3586e774260d6bca56cc1efca79cd335
Merge: 0a2ce2ffc358da96792d514c1024b72c52be9cc1 4dcc29e1574d88f4465ba865ed82800032f76418
Author: Linus Torvalds <torvalds at 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 at 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 at openezx.org>
    Signed-off-by: Dmitry Torokhov <dtor at mail.ru>

commit b33cb815b565a94c654a0fe8e62e36f5b4053888
Author: Jason Wessel <jason.wessel at windriver.com>
Date:   Wed May 28 12:49:57 2008 -0500

    kgdbts: Use HW breakpoints with CONFIG_DEBUG_RODATA
    
    Whenever CONFIG_DEBUG_RODATA is set in the kernel config many kernel
    text sections become read-only, and the use of software breakpoints in
    the kgdb tests will cause the kernel to fail to complete the start up.
    
    Until such time that there is an official API for modifying read-only
    text sections hardware breakpoints must be used to run the do_fork or
    sys_open tests or the tests get skipped.
    
    Also fix the duplicated include reported by:
    Huang Weiyi <weiyi.huang at gmail.com>
    
    Signed-off-by: Jason Wessel <jason.wessel at windriver.com>

commit 827e609b4581282b98bdf7666f6e93ff1bd1a63e
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Wed May 28 12:49:56 2008 -0500

    kgdb: use common ascii helpers and put_unaligned_be32 helper
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Jason Wessel <jason.wessel at windriver.com>

commit 0a2ce2ffc358da96792d514c1024b72c52be9cc1
Author: David Howells <dhowells at 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 at linux-foundation.org>

commit b4412323cc954bd0a2144b1c2ed573dd2eddb32c
Merge: dc1d60a014aa9614518f9856ff661716d0969ffd d6de8be711b28049a5cb93c954722c311c7d3f7f
Author: Linus Torvalds <torvalds at 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 at 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 at redhat.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 5e55843bb8ed1ec7d134a759c53e34beb1618952
Author: Vegard Nossum <vegard.nossum at 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 at gmail.com>
    Signed-off-by: David Howells <dhowells at redhat.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit d6de8be711b28049a5cb93c954722c311c7d3f7f
Author: Jens Axboe <jens.axboe at 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 at linux.vnet.ibm.com> for
    review and comments!
    
    Signed-off-by: Jens Axboe <jens.axboe at oracle.com>

commit 64565911cdb57c2f512a9715b985b5617402cc67
Author: Jens Axboe <jens.axboe at 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 at oracle.com>

commit 4722dc52a891ab6cb2d637ddb87233e0ce277827
Author: Alan D. Brunelle <Alan.Brunelle at 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 at hp.com>
    Signed-off-by: Jens Axboe <jens.axboe at oracle.com>

commit 9d5f09a424a67ddb959829894efb4c71cbf6d600
Author: Alan D. Brunelle <Alan.Brunelle at 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 at hp.com>
    Signed-off-by: Jens Axboe <jens.axboe at oracle.com>

commit be754d2c2161c0cce11d62727016985ecb76831b
Author: Richard Kennedy <richard at 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 at rsk.demon.co.uk>
    Signed-off-by: Jens Axboe <jens.axboe at oracle.com>

commit 05caf8dbc1880415df3378cfd114d832c9618b60
Author: Zhang, Yanmin <yanmin_zhang at 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 at intel.com>
    Signed-off-by: Jens Axboe <jens.axboe at oracle.com>

commit ca39d651d17df49b6d11f851d56c0ce0ce01ea1a
Author: Jens Axboe <jens.axboe at 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 at us.ibm.com
    Signed-off-by: Jens Axboe <jens.axboe at oracle.com>

commit a82c53a0e3f57f02782330372b7adad67b417645
Author: Tom Zanussi <zanussi at 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 at comcast.net>
    Tested-by: Dan Williams <dan.j.williams at intel.com>
    Signed-off-by: Jens Axboe <jens.axboe at oracle.com>

commit 57f5b1590f2d801a3a7f072e2c65f14d4545852c
Author: Dmitry Torokhov <dmitry.torokhov at 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 at mail.ru>

commit 1ec7d99c16e69a9ed8ffeaa6c1846025b84bebad
Merge: 3dbfd0801bbbaf2800d7497d83d743a614430e82 9e4f2e8d4ddb04ad16a3828cd9a369a5a5287009
Author: Linus Torvalds <torvalds at 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 at 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 at jp.fujitsu.com>
    Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>

commit a86161b3134465f072d965ca7508ec9c1e2e52c7
Author: Kenji Kaneshige <kaneshige.kenji at 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 at jp.fujitsu.com>
    Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>

commit 0711c70ec0e9d2c002b1e9b5fb9f21e49d77f4fd
Author: Kenji Kaneshige <kaneshige.kenji at 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 at jp.fujitsu.com>
    Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>

commit 6592e02ae4bd7b277230aa0c5821588a13b9d8e3
Author: Kenji Kaneshige <kaneshige.kenji at 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 at jp.fujitsu.com>
    Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>

commit 5808639bfa98d69f77a481d759570d85f164fea0
Author: Kenji Kaneshige <kaneshige.kenji at 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 at jp.fujitsu.com>
    Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>

commit dbd79aed1aea2bece0bf43cc2ff3b2f9baf48a08
Author: Kenji Kaneshige <kaneshige.kenji at 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 at elte.hu>
    Signed-off-by: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
    Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>

commit b3bd307c628af2f0a581c42d5d7e4bcdbbf64b6a
Author: Kenji Kaneshige <kaneshige.kenji at 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 at jp.fujitsu.com>
    Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>

commit 732bee4c859012edf05f3e09b53b68fc332a369d
Author: Olof Johansson <olof at 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 at lixom.net>

commit c433a1b6426880d3e23267938c3542706f3d03a6
Author: Olof Johansson <olof at 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 at lixom.net>

commit 4dcc29e1574d88f4465ba865ed82800032f76418
Author: Tony Luck <tony.luck at 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 at intel.com>

commit ca61668b82a902143997794aae3f681a602e6ebc
Author: Brian King <brking at linux.vnet.ibm.com>
Date:   Mon May 19 10:27:56 2008 -0500

    [SCSI] ibmvscsi: Non SCSI error status fixup
    
    Some versions of the Virtual I/O Server on Power
    return 0x99 in the non-SCSI error status field as success,
    rather than 0. This fixes the ibmvscsi driver to treat this
    response as success.
    
    Signed-off-by: Brian King <brking at linux.vnet.ibm.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit 7ba2db5f38955907e46a65c9334d287cd3da32c2
Author: Michael Reed <mdr at sgi.com>
Date:   Thu Mar 13 14:53:56 2008 -0500

    [SCSI] fusion mpt: fix target missing after resetting external raid
    
    Following a hard reset of a SAS raid, one of the raid targets is occasionally
    missing.  I tracked this down to a pretty obscure little bug.
    
    The LSI fusion drivers for SAS and Fibre Channel both use their respective
    transport layers.  Those transport layers increment the target number
    assigned to new targets.
    
    The routine __scsi_scan_target uses the "this_id" element of the Scsi_Host
    structure to avoid scanning the scsi host adapter.  Both fusion drivers set
    "this_id" from a value returned in a firmware PortFacts response.  For my
    particular test case (SAS) the firmware id assigned to the initiator was
    173.  After enough raid resets to cause the raid targets to go and come a
    sufficient number of times, the id assigned by the transport to a raid
    target would match the id assigned by the host adapter to the "this_id"
    field, resulting in that target not being scanned.
    
    Fix by not assigning this_id and not checking it in slave_configure.
    
    Signed-off-by: Michael Reed <mdr at sgi.com>
    Acked-by: "Moore, Eric" <Eric.Moore at lsi.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit 3dbfd0801bbbaf2800d7497d83d743a614430e82
Merge: edb2301f2903e96beadc333f9584222c05858518 f04d264afc51acdffeba9cdf3baf04116687680c
Author: Linus Torvalds <torvalds at 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 at 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 at gmx.net>
    Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 825de27d9e40b3117b29a79d412b7a4b78c5d815
Author: Gerrit Renker <gerrit at 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 at erg.abdn.ac.uk>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 6079a463cf95fafcc704a4e5e92a4da12444bd3c
Author: Wei Yongjun <yjwei at 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 at cn.fujitsu.com>
    Acked-by: Gerrit Renker <gerrit at erg.abdn.ac.uk>
    Acked-by: Arnaldo Carvalho de Melo <acme at redhat.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit f04d264afc51acdffeba9cdf3baf04116687680c
Author: Haavard Skinnemoen <haavard.skinnemoen at 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 at atmel.com>

commit 87a54a28970fb6a91de3993120eccc01a0ece732
Author: Huang Weiyi <weiyi.huang at 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 at gmail.com>
    Signed-off-by: Dmitry Torokhov <dtor at mail.ru>

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

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

commit 5de4cd431db749bdca58ec88862462729f6159b2
Author: Mark Brown <broonie at 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 at enneenne.com> for the report.
    
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Signed-off-by: Dmitry Torokhov <dtor at mail.ru>

commit ef9db4929a4d9559abf1812fd89cc3b09c56b49b
Author: Mark Brown <broonie at 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 at gmx.de> for
    reporting this.
    
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Signed-off-by: Dmitry Torokhov <dtor at mail.ru>

commit 6b32ca39d70f5d92f4d450dc54966f20e8b5c1f6
Author: Mark Brown <broonie at 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 at opensource.wolfsonmicro.com>
    Signed-off-by: Dmitry Torokhov <dtor at mail.ru>

commit d35895db7aadc24086b6002101154eec478e9dd6
Author: Bruno Prémont <bonbons at 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 at linux-vserver.org>
    Signed-off-by: Dmitry Torokhov <dtor at mail.ru>

commit e490517a039a99d692cb3a5561941b0a5f576172
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Mon May 26 11:07:53 2008 -0700

    Linux 2.6.26-rc4

commit cbaffba12ce08beb3e80bfda148ee0fa14aac188
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Mon May 26 20:55:42 2008 +0400

    posix timers: discard SI_TIMER signals on exec
    
    Based on Roland's patch. This approach was suggested by Austin Clements
    from the very beginning, and then by Linus.
    
    As Austin pointed out, the execing task can be killed by SI_TIMER signal
    because exec flushes the signal handlers, but doesn't discard the pending
    signals generated by posix timers. Perhaps not a bug, but people find this
    surprising. See http://bugzilla.kernel.org/show_bug.cgi?id=10460
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: Austin Clements <amdragon+kernelbugzilla at mit.edu>
    Cc: Roland McGrath <roland at redhat.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit c8e85b4f4b9ee23bf0e79bdeb3da274a0f9c663f
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Mon May 26 20:55:42 2008 +0400

    posix timers: sigqueue_free: don't free sigqueue if it is queued
    
    Currently sigqueue_free() removes sigqueue from list, but doesn't cancel the
    pending signal. This is not consistent, the task should either receive the
    "full" signal along with siginfo_t, or it shouldn't receive the signal at all.
    
    Change sigqueue_free() to clear SIGQUEUE_PREALLOC but leave sigqueue on list
    if it is queued.
    
    This is a user-visible change. If the signal is blocked, it stays queued
    after sys_timer_delete() until unblocked with the "stale" si_code/si_value,
    and of course it is still counted wrt RLIMIT_SIGPENDING which also limits
    the number of posix timers.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: Austin Clements <amdragon+kernelbugzilla at mit.edu>
    Cc: Roland McGrath <roland at redhat.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 84a881657d391121cd88c37f0a312dec3528fa44
Merge: 1434b65731963207a4cc84bd87e6191e34321986 2548baa07ddf37ea8604e9627f042616d1cdc43e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Mon May 26 10:24:06 2008 -0700

    Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
    
    * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
      i2c: Align i2c_device_id
      tuner: Do not alter i2c_client.name

commit 1434b65731963207a4cc84bd87e6191e34321986
Merge: 4934ed888e6fe78d9d339471fb870819da911e8b 76994412f8e824e79a593d6777ec327d85f942b2
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Mon May 26 10:21:26 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
      slub: ksize() abuse checks
      slob: Fix to return wrong pointer

commit 4934ed888e6fe78d9d339471fb870819da911e8b
Merge: 0dfdf77ab81040e9e4569c9cdaaae5419d18aaaa 9c28faaab19132b3f029d4ffa9a4dee8a11f0cbb
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Mon May 26 10:20:40 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.26
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.26:
      sh: Drop broken URAM support on SH7723.
      sh: update Migo-R defconfig
      sh: use sm501 8250 mfd support on r2d boards
      sh: add probe support for new sh7723 cut
      sh: fix VPU interrupt vector for sh7723
      sh: fix USBF resource for sh7722

commit 0dfdf77ab81040e9e4569c9cdaaae5419d18aaaa
Merge: c5e6fd28e5776200a737e9df337a529d36fa9a54 551dec47bb5964478db594385a896eb0d4ab2b0a
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Mon May 26 10:14:37 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc64: global_reg_snapshot is not for userspace

commit c5e6fd28e5776200a737e9df337a529d36fa9a54
Merge: b3733034f113a4119f734b84e94180a42c8bc1a1 289c79a4bd350e8a25065102563ad1a183d1b402
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Mon May 26 10:14:02 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: (52 commits)
      vlan: Use bitmask of feature flags instead of seperate feature bits
      fmvj18x_cs: add NextCom NC5310 rev B support
      xirc2ps_cs: re-initialize the multicast address in do_reset
      3C509: rx_bytes should not be increased when alloc_skb failed
      NETFRONT: Use __skb_queue_purge()
      VIRTIO: Use __skb_queue_purge()
      phylib: do EXPORT_SYMBOL on get_phy_id
      netlink: Fix nla_parse_nested_compat() to call nla_parse() directly
      WAN: protect HDLC proto list while insmod/rmmod
      drivers/net/fs_enet: remove null pointer dereference
      S2io: Version update for napi and MSI-X patches
      S2io: Added napi support when MSIX is enabled.
      S2io: Move all the transmit completions to a single msi-x (alarm) vector
      drivers/net/ehea - remove unnecessary memset after kzalloc
      au1000_eth: remove useless check
      Blackfin EMAC Driver: Removed duplicated include <linux/ethtool.h>
      cpmac bugfixes and enhancements
      e1000e: use resource_size_t, not unsigned long, for phys addrs
      net/usb: add support for Apple USB Ethernet Adapter
      uli526x: add support for netpoll
      ...

commit 2548baa07ddf37ea8604e9627f042616d1cdc43e
Author: Jiri Slaby <jirislaby at gmail.com>
Date:   Mon May 26 16:08:40 2008 +0200

    i2c: Align i2c_device_id
    
    Align i2c_device_id.driver_data to 8 bytes to not fail on crossbuilds.
    
    (Added in d2653e92732bd3911feff6bee5e23dbf959381db.)
    
    Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
    Signed-off-by: Jean Delvare <khali at linux-fr.org>

commit 7271e60a950b3677f136a31e084bc4b0463c7018
Author: Michael Krufky <mkrufky at linuxtv.org>
Date:   Mon May 26 16:08:40 2008 +0200

    tuner: Do not alter i2c_client.name
    
    The tuner driver used to change i2c_client.name for its own needs, but
    it really shouldn't, as this field is used by i2c-core to do the
    device/driver matching. So, create and use a separate field for the
    tuner driver needs.
    
    Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
    Signed-off-by: Jean Delvare <khali at linux-fr.org>

commit d56acacdcd370c0077821a012607876cb11b1b3b
Author: Haavard Skinnemoen <haavard.skinnemoen at 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 at atmel.com>

commit 01575995de4289aa73aa7cb22cf8fe0461093589
Author: Adrian Bunk <bunk at 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 at kernel.org>
    Signed-off-by: Adrian Bunk <bunk at kernel.org>
    Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>

commit a0ed3d8d94b6a28c886cf9c023693afa3bb773f2
Author: Adrian Bunk <bunk at 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 at kernel.org>
    Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>

commit 551dec47bb5964478db594385a896eb0d4ab2b0a
Author: Adrian Bunk <bunk at kernel.org>
Date:   Sun May 25 22:50:16 2008 -0700

    sparc64: global_reg_snapshot is not for userspace
    
    global_reg_snapshot shouldn't be visible in our userspace headers.
    
    Signed-off-by: Adrian Bunk <bunk at kernel.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 9c28faaab19132b3f029d4ffa9a4dee8a11f0cbb
Author: Paul Mundt <lethal at linux-sh.org>
Date:   Mon May 26 11:45:45 2008 +0900

    sh: Drop broken URAM support on SH7723.
    
    This was copied over from the previous MobileR bits, which doesn't
    apply to R2. The URAM block on R2 is recycled for the L2 instead.
    
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit b3733034f113a4119f734b84e94180a42c8bc1a1
Merge: c8ff99a7c2fb23a0f1165f3821fd66fd65f30264 73531905ed53576d9e8707659a761e7046a60497
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sun May 25 15:00:27 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:
      Kconfig: introduce ARCH_DEFCONFIG to DEFCONFIG_LIST
      .gitignore: match ncscope.out
      scripts/ver_linux use 'gcc -dumpversion'

commit c8ff99a7c2fb23a0f1165f3821fd66fd65f30264
Merge: 32522bfdaed094e447f71cce68c349847ae9c7d5 a49056da0325742d3b4f5d1ef7bf8ab0690c3888
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sun May 25 14:59:59 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
      [WATCHDOG] Add ICH9DO into the iTCO_wdt.c driver
      [WATCHDOG] Fix booke_wdt.c on MPC85xx SMP system's
      [WATCHDOG] Add a watchdog driver based on the CS5535/CS5536 MFGPT timers
      [WATCHDOG] hpwdt: Fix NMI handling.
      [WATCHDOG] Blackfin Watchdog Driver: split platform device/driver
      [WATCHDOG] Add w83697h_wdt early_disable option
      [WATCHDOG] Make w83697h_wdt timeout option string similar to others
      [WATCHDOG] Make w83697h_wdt void-like functions void

commit 32522bfdaed094e447f71cce68c349847ae9c7d5
Merge: eb90d81d03c0917b0fd629f6342554a3b58ea52c 587755f1f6a983a9f0f3322d284034f4e146891a
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sun May 25 14:59:27 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      [ALSA] hda - Fix capture mute Widget for stac9250/9251
      [ALSA] snd-pcsp - fix pcsp_treble_info() to honour an item number
      [ALSA] hda - Added support for Foxconn P35AX-S mainboard
      [ALSA] hda - Fix COEF and EAPD in ALC889 auto-configuration mode
      [ALSA] hda - Fix noise on VT1708 codec
      [ALSA] hda - Add model for ASUS P5K-E/WIFI-AP

commit 73531905ed53576d9e8707659a761e7046a60497
Author: Sam Ravnborg <sam at ravnborg.org>
Date:   Sun May 25 23:03:18 2008 +0200

    Kconfig: introduce ARCH_DEFCONFIG to DEFCONFIG_LIST
    
    init/Kconfig contains a list of configs that are searched
    for if 'make *config' are used with no .config present.
    Extend this list to look at the config identified by
    ARCH_DEFCONFIG.
    
    With this change we now try the defconfig targets last.
    
    This fixes a regression reported
    by: Linus Torvalds <torvalds at linux-foundation.org>
    
    Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
    Cc: Linus Torvalds <torvalds at linux-foundation.org>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Cc: Ingo Molnar <mingo at redhat.com>
    Cc: "H. Peter Anvin" <hpa at zytor.com>

commit 9723c046bd5989aa9064038ce142f498bb1870d6
Author: Jike Song <albcamus at gmail.com>
Date:   Thu May 22 09:23:10 2008 +0800

    .gitignore: match ncscope.out
    
    Sometimes I got this:
    
        $ git-status
        {snip}
        # On branch master
        # Untracked files:
        #   (use "git add <file>..." to include in what will be committed)
        #
        #       ncscope.out
        nothing added to commit but untracked files present (use "git add"
    to track)
    
    Fix it.
    
    Signed-off-by: Jike Song <albcamus at gmail.com>
    Signed-off-by: Sam Ravnborg <sam at ravnborg.org>

commit 656a3f797889dafcce2f5b8b222ad66e9974b6f7
Author: Gabriel C <nix.or.die at googlemail.com>
Date:   Wed May 21 20:36:19 2008 +0200

    scripts/ver_linux use 'gcc -dumpversion'
    
    These magic greps and hacks in ver_linux to get the gcc version always break after some gcc releases.
    
    Since now gcc >4.3 allows compiling with '--with-pkgversion' ( which can be everything 'My Cool Gcc' or something )
    ver_linux will report random junk for these.
    
    Simply use 'gcc -dumpversion' to get the gcc version which should always work.
    
    Signed-off-by: Gabriel C <nix.or.die at googlemail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Sam Ravnborg <sam at ravnborg.org>

commit 587755f1f6a983a9f0f3322d284034f4e146891a
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date:   Sun May 25 18:20:06 2008 +0200

    [ALSA] hda - Fix capture mute Widget for stac9250/9251
    
    Fix capture mute widget for STAC9250/9251 codecs.  The widget 0x09
    has no mute but 0x14 does actually.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 97e08f5d732bbfd5180f73aa7875d328421bee8a
Author: Stas Sergeev <stsp at aknet.ru>
Date:   Sat May 24 18:05:47 2008 +0200

    [ALSA] snd-pcsp - fix pcsp_treble_info() to honour an item number
    
    This solves the problem with mixers wrongly displaying the PWM freq.
    
    Signed-off-by: Stas Sergeev <stsp at aknet.ru>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit a49056da0325742d3b4f5d1ef7bf8ab0690c3888
Author: Gabriel C <nix.or.die at googlemail.com>
Date:   Wed Apr 30 16:51:10 2008 +0200

    [WATCHDOG] Add ICH9DO into the iTCO_wdt.c driver
    
    Add the Intel ICH9DO controller ID's for the iTCO_wdt kernel driver and bump
    the driver version.
    
    Tested on an P5E-VM DO ASUS motherboard.
    
    Signed-off-by: Gabriel Craciunescu <nix.or.die at googlemail.com>
    Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>

commit f172ddc61ad7a7c444b2b3e08992a45c76b821f9
Author: Chen Gong <g.chen at freescale.com>
Date:   Tue Apr 29 16:42:05 2008 +0800

    [WATCHDOG] Fix booke_wdt.c on MPC85xx SMP system's
    
    On Book-E SMP systems each core has its own private watchdog.  If only one
    watchdog is enabled, when the core that doesn't enable the watchdog is hung,
    system can't reset because no watchdog is running on it.  That's bad.  It
    means we must enable watchdogs on both cores.
    
    We can use smp_call_function() to send appropriate messages to all the other
    cores to enable and update the watchdog.
    
    Signed-off-by: Chen Gong <g.chen at freescale.com>
    Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>

commit 0b36086b5d7c397a128784bed6e332418e500af1
Author: Jordan Crouse <jordan.crouse at amd.com>
Date:   Mon Jan 21 10:07:00 2008 -0700

    [WATCHDOG] Add a watchdog driver based on the CS5535/CS5536 MFGPT timers
    
    Add a watchdog timer based on the MFGPT timers in the CS5535/CS5536
    companion chips to the AMD Geode GX and LX processors.  Only caveat
    is that the BIOS must provide at least a one free timer, and most
    do not.
    
    Signed-off-by: Jordan Crouse <jordan.crouse at amd.com>
    Signed-off-by: Wim Van Sebroeck <wim at iguana.be>

commit 7f7f894c6d3285407b2493d1575500fb25e3d495
Author: Mingarelli, Thomas <Thomas.Mingarelli at hp.com>
Date:   Tue Mar 25 17:17:30 2008 +0000

    [WATCHDOG] hpwdt: Fix NMI handling.
    
    I need to just return in case it's not my NMI so someone else can take a look
    at it (and reset die_nmi_called to 0 in case I actually do get one that's mine
    to handle).
    
    Signed-off-by: Thomas Mingarelli <thomas.mingarelli at hp.com>
    Signed-off-by: Wim Van Sebroeck <wim at iguana.be>

commit 93539b194696a6291e6895be07d4241c8d972c4b
Author: Mike Frysinger <vapier.adi at gmail.com>
Date:   Thu Mar 27 11:53:32 2008 -0700

    [WATCHDOG] Blackfin Watchdog Driver: split platform device/driver
    
     - split platform device/driver registering from actual watchdog device/driver
       registering so that we can cleanly load/unload
     - fixup __initdata with __initconst and __devinitdata with __devinitconst
    
    Signed-off-by: Mike Frysinger <vapier.adi at gmail.com>
    Signed-off-by: Bryan Wu <cooloney at kernel.org>
    Signed-off-by: Wim Van Sebroeck <wim at iguana.be>

commit 6fd656012bb8d5c5a4570adc2e630668b0109cb0
Author: Samuel Tardieu <sam at rfc1149.net>
Date:   Wed Mar 12 14:28:03 2008 +0100

    [WATCHDOG] Add w83697h_wdt early_disable option
    
    Pádraig Brady requested the possibility of not disabling the watchdog
    at module load time or kernel boot time if it had been previously enabled
    in the bios. It may help rebooting the machine if it freezes before the
    userland daemon kicks in.
    
    Signed-off-by: Samuel Tardieu <sam at rfc1149.net>
    Cc: Pádraig Brady <P at draigBrady.com>
    Signed-off-by: Wim Van Sebroeck <wim at iguana.be>

commit 5794a9f412676ee7ec87828a926d0f58f0a2ffbf
Author: Samuel Tardieu <sam at rfc1149.net>
Date:   Wed Mar 12 14:28:02 2008 +0100

    [WATCHDOG] Make w83697h_wdt timeout option string similar to others
    
    Signed-off-by: Samuel Tardieu <sam at rfc1149.net>
    Signed-off-by: Wim Van Sebroeck <wim at iguana.be>

commit 03315adca76ee93128e4d92566d1f18a1a937e79
Author: Samuel Tardieu <sam at rfc1149.net>
Date:   Wed Mar 12 14:28:01 2008 +0100

    [WATCHDOG] Make w83697h_wdt void-like functions void
    
    Some non-exported functions always returned 0. Mark them void instead.
    
    Signed-off-by: Samuel Tardieu <sam at rfc1149.net>
    Signed-off-by: Wim Van Sebroeck <wim at iguana.be>

commit eb90d81d03c0917b0fd629f6342554a3b58ea52c
Merge: d3c5f8b93febadf62da9a4b39a2dca8e66a4da40 b1979a5fda7869a790f4fd83fb06c78498d26ba1
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sat May 24 10:20:00 2008 -0700

    Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip:
      x86: prevent PGE flush from interruption/preemption
      x86: use explicit copy in vdso_gettimeofday()
      namespacecheck: automated fixes
      x86/xen: fix arbitrary_virt_to_machine()
      x86: don't read maxlvt before checking if APIC is mapped
      x86: disable TSC for sched_clock() when calibration failed
      x86: distangle user disabled TSC from unstable
      x86: fix setup of cyc2ns in tsc_64.c

commit d3c5f8b93febadf62da9a4b39a2dca8e66a4da40
Merge: 25d5cb4b0375e5864ec0ccf35e12ff1d1b5cf3f0 7c28472a5d4ecf7c61b3c3901994be878cd6c5d2
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sat May 24 10:13:16 2008 -0700

    Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
    
    * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
      [ARM] integrator: fix build warnings and errors
      [ARM] fix OMAP include loops
      Revert "[ARM] pxa: spitz wants PXA27x UDC definitions"
      [ARM] 5053/1: define before use of processor_id
      [ARM] 5052/1: export clock functions for the at91x40
      [ARM] 5051/1: define pgtable_t for the !CONFIG_MMU case too
      [ARM] omap: fix omap clk support build errors
      [ARM] 5039/1: S3C244X: Rename SDI device if running on S3C244X.
      [ARM] 5043/1: pxafb: remove unused mode variable in pxafb_init_fbinfo
      [ARM] 5041/1: VR1000: Fix DM9000 IRQ flags initialisation
      [ARM] 5040/1: BAST: Fix DM9000 IRQ flags initialisation
      [ARM] 5038/1: ARM: OMAP: Remove tsc2102 references from board-palmte.c
      [ARM] 5025/2: fix collie cpu initialisation

commit 25d5cb4b0375e5864ec0ccf35e12ff1d1b5cf3f0
Author: David Brownell <david-b at pacbell.net>
Date:   Fri May 23 13:05:03 2008 -0700

    spi: remove some spidev oops-on-rmmod paths
    
    Somehow the spidev code forgot to include a critical mechanism: when the
    underlying device is removed (e.g.  spi_master rmmod), open file
    descriptors must be prevented from issuing new I/O requests to that
    device.  On penalty of the oopsing reported by Sebastian Siewior
    <bigeasy at tglx.de> ...
    
    This is a partial fix, adding handshaking between the lower level (SPI
    messaging) and the file operations using the spi_dev.  (It also fixes an
    issue where reads and writes didn't return the number of bytes sent or
    received.)
    
    There's still a refcounting issue to be addressed (separately).
    
    Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
    Reported-by: Sebastian Siewior <bigeasy at tglx.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 5c02b575780d0d785815a1e7b79a98edddee895a
Author: Cedric Le Goater <clg at fr.ibm.com>
Date:   Fri May 23 13:05:02 2008 -0700

    cgroups: remove node_ prefix_from ns subsystem
    
    This is a slight change in the namespace cgroup subsystem api.
    
    The change is that previously when cgroup_clone() was called (currently
    only from the unshare path in ns_proxy cgroup, you'd get a new group named
    "node_$pid" whereas now you'll get a group named after just your pid.)
    
    The only users who would notice it are those who are using the ns_proxy
    cgroup subsystem to auto-create cgroups when namespaces are unshared -
    something of an experimental feature, which I think really needs more
    complete container/namespace support in order to be useful.  I suspect the
    only users are Cedric and Serge, or maybe a few others on
    containers at lists.linux-foundation.org.  And in fact it would only be
    noticed by the users who make the assumption about how the name is
    generated, rather than getting it from the /proc/<pid>/cgroups file for
    the process in question.
    
    Whether the change is actually needed or not I'm fairly agnostic on, but I
    guess it is more elegant to just use the pid as the new group name rather
    than adding a fairly arbitrary "node_" prefix on the front.
    
    [menage at google.com: provided changelog]
    Signed-off-by: Cedric Le Goater <clg at fr.ibm.com>
    Cc: "Paul Menage" <menage at google.com>
    Cc: "Serge E. Hallyn" <serue at us.ibm.com>
    Cc: <stable at kernel.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 12d15f0d51d47cec39d1d7250e81573c5cbd8b5d
Author: Fernando Luis Vazquez Cao <fernando at oss.ntt.co.jp>
Date:   Fri May 23 13:05:01 2008 -0700

    for_each_online_pgdat(): kerneldoc fix
    
    for_each_pgdat() was renamed to for_each_online_pgdat() and kerneldoc
    comments should be updated accordingly.
    
    Signed-off-by: Fernando Luis Vazquez Cao <fernando at oss.ntt.co.jp>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit fb56f0f9922d3fb2c5503cdc346dc3f86c897bc4
Author: Adrian Bunk <bunk at kernel.org>
Date:   Fri May 23 13:05:00 2008 -0700

    frv: export empty_zero_page
    
    Fix the following build error:
    
    ERROR: "empty_zero_page" [fs/ext4/ext4dev.ko] undefined!
    
    Reported-by: Adrian Bunk <bunk at kernel.org>
    Signed-off-by: Adrian Bunk <bunk at kernel.org>
    Cc: David Howells <dhowells at redhat.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 7b26655f6208fdefa9ab0adc016116324f8d4ba8
Author: Shi Weihua <shiwh at cn.fujitsu.com>
Date:   Fri May 23 13:04:59 2008 -0700

    sys_prctl(): fix return of uninitialized value
    
    If none of the switch cases match, the PR_SET_PDEATHSIG and
    PR_SET_DUMPABLE cases of the switch statement will never write to local
    variable `error'.
    
    Signed-off-by: Shi Weihua <shiwh at cn.fujitsu.com>
    Cc: Andrew G. Morgan <morgan at kernel.org>
    Acked-by: "Serge E. Hallyn" <serue at us.ibm.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit f99c90094bffbe1cf38ef66f198a808c14a02d56
Author: Kumar Gala <galak at kernel.crashing.org>
Date:   Fri May 23 13:04:58 2008 -0700

    edac: mpc85xx: fix building as a module
    
    including of <asm/mpc85xx.h> causes build problems since it doesn't exist.
    
    Also removed warning:
    drivers/edac/mpc85xx_edac.c:45: warning: 'mpc85xx_ctl_name' defined but not used
    
    Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
    Acked-by: Doug Thompson <dougthompson at xmission.com>
    Acked-by: Dave Jiang <djiang at mvista.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 6ea0205b56546cef782b74d9f4664ec00290a6ae
Author: David Brownell <david-b at pacbell.net>
Date:   Fri May 23 13:04:58 2008 -0700

    gpio: build fixes
    
    This fixes various gpio-related build errors (mostly potential)
    reported in part by Russell King and Uwe Kleine-König.
    
    Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
    Cc: Uwe Kleine-König <Uwe.Kleine-Koenig at digi.com>
    Cc: Russell King <rmk at arm.linux.org.uk>
    Cc: Arnaud Patard <arnaud.patard at rtp-net.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit ee29420aca6ca6fbb3e72ee8a980b2600911b864
Author: Ben Dooks <ben-fbdev at fluff.org>
Date:   Fri May 23 13:04:57 2008 -0700

    S3C2410: fix driver MODULE_ALIAS()
    
    Add a correct MODULE_ALIAS() entry for this driver to enable udev module
    loading.
    
    Signed-off-by: Ben Dooks <ben-linux at fluff.org>
    Cc: Arnaud Patard <arnaud.patard at rtp-net.org>
    Acked-by: Krzysztof Helt <krzysztof.h1 at wp.pl>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 6a0e4ec7bcc6e80d2a32a4c0b83a32c904aadc05
Author: Ben Dooks <ben-fbdev at fluff.org>
Date:   Fri May 23 13:04:56 2008 -0700

    S3C2410: clean out changelog header and tidy
    
    Remove the old changelog entries which are now out of date and should be
    extractable from git anyway.  Also tidy up the copyright for the driver.
    
    Signed-off-by: Ben Dooks <ben-linux at fluff.org>
    Cc: Arnaud Patard <arnaud.patard at rtp-net.org>
    Acked-by: Krzysztof Helt <krzysztof.h1 at wp.pl>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit d585dfe840c93ea800afc124333b6ac04722d359
Author: Ben Dooks <ben-fbdev at fluff.org>
Date:   Fri May 23 13:04:56 2008 -0700

    S3C2410: add error print if we cannot add attribute
    
    Fix the following warning by checking the result of device_create_file and
    printing an error but not removing the device (loss of debug registers is
    not fatal).
    
    drivers/video/s3c2410fb.c:905: warning: ignoring return value of 'device_create_file', declared with attribute warn_unused_result
    
    Signed-off-by: Ben Dooks <ben-linux at fluff.org>
    Cc: Arnaud Patard <arnaud.patard at rtp-net.org>
    Acked-by: Krzysztof Helt <krzysztof.h1 at wp.pl>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 673b4600e3b3cc6689025e6a6fc6909b6e53dd5e
Author: Ben Dooks <ben-fbdev at fluff.org>
Date:   Fri May 23 13:04:55 2008 -0700

    S3C2410: ensure that FB_BLANK_POWERDOWN shuts down the controller
    
    When a blank level of FB_BLANK_POWERDOWN is used, we should shut down the
    controller so that it no longer tries to produce any panel signals or
    data, and shuts down the DMA which is not needed.
    
    Signed-off-by: Ben Dooks <ben-linux at fluff.org>
    Cc: Arnaud Patard <arnaud.patard at rtp-net.org>
    Acked-by: Krzysztof Helt <krzysztof.h1 at wp.pl>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit cdc83ae2453ddb19060e05e6afd22b1254128c42
Author: Ben Dooks <ben-fbdev at fluff.org>
Date:   Fri May 23 13:04:53 2008 -0700

    SM501: reverse FPEN/VBIASEN flags behaviour
    
    To keep backwards compatibility, reverse the meanings of these flags so
    that when they are not set, the driver uses the original behvaiour.
    
    Signed-off-by: Ben Dooks <ben-linux at fluff.org>
    Cc: Arnaud Patard <arnaud.patard at rtp-net.org>
    Acked-by: Krzysztof Helt <krzysztof.h1 at wp.pl>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit cd94b9dbfa300fc42e45f230010623fc08d59563
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date:   Fri May 23 13:04:52 2008 -0700

    memory hotplug: fix early allocation handling
    
    Trying to add memory via add_memory() from within an initcall function
    results in
    
    bootmem alloc of 163840 bytes failed!
    Kernel panic - not syncing: Out of memory
    
    This is caused by zone_wait_table_init() which uses system_state to decide
    if it should use the bootmem allocator or not.
    
    When initcalls are handled the system_state is still SYSTEM_BOOTING but
    the bootmem allocator doesn't work anymore.  So the allocation will fail.
    
    To fix this use slab_is_available() instead as indicator like we do it
    everywhere else.
    
    [akpm at linux-foundation.org: coding-style fix]
    Reviewed-by: Andy Whitcroft <apw at shadowen.org>
    Cc: Dave Hansen <haveblue at us.ibm.com>
    Cc: Gerald Schaefer <gerald.schaefer at de.ibm.com>
    Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
    Acked-by: Yasunori Goto <y-goto at jp.fujitsu.com>
    Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 7eb54824b76793dd86afb54f182ef9aa64b3a45a
Author: Andy Whitcroft <apw at shadowen.org>
Date:   Fri May 23 13:04:50 2008 -0700

    zonelists: handle a node zonelist with no applicable entries
    
    When booting 2.6.26-rc3 on a multi-node x86_32 numa system we are seeing
    panics when trying node local allocations:
    
     BUG: unable to handle kernel NULL pointer dereference at 0000034c
     IP: [<c1042507>] get_page_from_freelist+0x4a/0x18e
     *pdpt = 00000000013a7001 *pde = 0000000000000000
     Oops: 0000 [#1] SMP
     Modules linked in:
    
     Pid: 0, comm: swapper Not tainted (2.6.26-rc3-00003-g5abc28d #82)
     EIP: 0060:[<c1042507>] EFLAGS: 00010282 CPU: 0
     EIP is at get_page_from_freelist+0x4a/0x18e
     EAX: c1371ed8 EBX: 00000000 ECX: 00000000 EDX: 00000000
     ESI: f7801180 EDI: 00000000 EBP: 00000000 ESP: c1371ec0
      DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068
     Process swapper (pid: 0, ti=c1370000 task=c12f5b40 task.ti=c1370000)
     Stack: 00000000 00000000 00000000 00000000 000612d0 000412d0 00000000 000412d0
            f7801180 f7c0101c f7c01018 c10426e4 f7c01018 00000001 00000044 00000000
            00000001 c12f5b40 00000001 00000010 00000000 000412d0 00000286 000412d0
     Call Trace:
      [<c10426e4>] __alloc_pages_internal+0x99/0x378
      [<c10429ca>] __alloc_pages+0x7/0x9
      [<c105e0e8>] kmem_getpages+0x66/0xef
      [<c105ec55>] cache_grow+0x8f/0x123
      [<c105f117>] ____cache_alloc_node+0xb9/0xe4
      [<c105f427>] kmem_cache_alloc_node+0x92/0xd2
      [<c122118c>] setup_cpu_cache+0xaf/0x177
      [<c105e6ca>] kmem_cache_create+0x2c8/0x353
      [<c13853af>] kmem_cache_init+0x1ce/0x3ad
      [<c13755c5>] start_kernel+0x178/0x1ee
    
    This occurs when we are scanning the zonelists looking for a ZONE_NORMAL
    page.  In this system there is only ZONE_DMA and ZONE_NORMAL memory on
    node 0, all other nodes are mapped above 4GB physical.  Here is a dump
    of the zonelists from this system:
    
        zonelists pgdat=c1400000
         0: c14006c0:2 f7c006c0:2 f7e006c0:2 c1400360:1 c1400000:0
         1: c14006c0:2 c1400360:1 c1400000:0
        zonelists pgdat=f7c00000
         0: f7c006c0:2 f7e006c0:2 c14006c0:2 c1400360:1 c1400000:0
         1: f7c006c0:2
        zonelists pgdat=f7e00000
         0: f7e006c0:2 c14006c0:2 f7c006c0:2 c1400360:1 c1400000:0
         1: f7e006c0:2
    
    When performing a node local allocation we call get_page_from_freelist()
    looking for a page.  It in turn calls first_zones_zonelist() which returns
    a preferred_zone.  Where there are no applicable zones this will be NULL.
    However we use this unconditionally, leading to this panic.
    
    Where there are no applicable zones there is no possibility of a successful
    allocation, so simply fail the allocation.
    
    Signed-off-by: Andy Whitcroft <apw at shadowen.org>
    Acked-by: Mel Gorman <mel at csn.ul.ie>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 03a74dcc7eebe6edd778317e82fafdf71e68488c
Author: Arjan van de Ven <arjan at linux.intel.com>
Date:   Fri May 23 13:04:49 2008 -0700

    serial: fix enable_irq_wake/disable_irq_wake imbalance in serial_core.c
    
    enable_irq_wake() and disable_irq_wake() need to be balanced.  However,
    serial_core.c calls these for different conditions during the suspend and
    resume functions...
    
    This is causing a regular WARN_ON() as found at
    http://www.kerneloops.org/search.php?search=set_irq_wake
    
    This patch makes the conditions for triggering the _wake enable/disable
    sequence identical.
    
    Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
    Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit c4185a0e019387f5ad6e99009804965531fa1fab
Author: Denis V. Lunev <den at openvz.org>
Date:   Fri May 23 13:04:47 2008 -0700

    proc: proc_get_inode() should get module only once
    
    Any file under /proc/net opened more than once leaked the refcounter
    on the module it belongs to.
    
    The problem is that module_get is called for each file opening while
    module_put is called only when /proc inode is destroyed. So, lets put
    module counter if we are dealing with already initialised inode.
    
    Addresses http://bugzilla.kernel.org/show_bug.cgi?id=10737
    
    Signed-off-by: Denis V. Lunev <den at openvz.org>
    Cc: David Miller <davem at davemloft.net>
    Cc: Patrick McHardy <kaber at trash.net>
    Acked-by: Pavel Emelyanov <xemul at openvz.org>
    Acked-by: Robert Olsson <robert.olsson at its.uu.se>
    Acked-by: Eric W. Biederman <ebiederm at xmission.com>
    Reported-by: Roland Kletzing <devzero at web.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 53978d0a7a27eb036b9bf33c4caa06257a9dbed7
Author: Marcin Krol <hawk at pld-linux.org>
Date:   Fri May 23 13:04:46 2008 -0700

    brd: don't show ramdisks in /proc/partitions
    
    In 2.6.25, ramdisk devices show up in /proc/partitions, which is a
    behaviour change from the old rd.c.  Add GENHD_FL_SUPPRESS_PARTITION_INFO,
    which was present in rd.c.
    
    All kernels prior to 2.6.25 weren't displaying ramdisks in
    /proc/partitions.  Since there are many userspace tools using information
    from /proc/partitions some of them may now behave incorrectly (I didn't
    tested any though).  For example before 2.6.25 /proc/partitions was empty
    if no block devices like hard disks and such were detected by kernel.  Now
    all 16 ramdisks are always visible there.  Some software may rely on such
    information (I mean, on empty /proc/partitions).
    
    There was quite similar situation back in 2004, and ramdisks were excluded
    back from displaying.  Thats why I called this a regression (maybe a bit
    unfortunate).  See this patch for info:
    http://kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.3-rc2/2.6.3-rc2-mm1/broken-out/nbd-proc-partitions-fix.patch
    
    I also think that someone somewhere (long time ago) excluded ramdisks from
    /proc/partitions for good reasons.  It is possible that now such new
    "feature" is harmless, but I think there are more chances that someone
    will say "hey, /proc/partitions has changed, now my software doesn't work"
    then "hey where did my new 2.6.25 feature go".  nbd devices are also
    excluded, maybe for very same (unknown to me) reasons.
    
    Signed-off-by: Marcin Krol <hawk at pld-linux.org>
    Signed-off-by: Nick Piggin <npiggin at suse.de>
    Cc: <stable at kernel.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 6089093e588ee3f6aed99d08b1cf5ea37c52cf97
Author: Alan Cox <alan at redhat.com>
Date:   Fri May 23 13:04:45 2008 -0700

    ip2: fix crashes on load/unload
    
    This doesn't need to be two modules, and making it one cleans up the
    problem
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Cc: Jiri Slaby <jirislaby at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit bff5fda972dc23bd1806a47c2098ae173585d013
Author: Trent Piepho <xyzzy at speakeasy.org>
Date:   Fri May 23 13:04:44 2008 -0700

    gpiolib: fix off by one errors
    
    The last gpio belonging to a chip is chip->base + chip->ngpios - 1.  Some
    places in the code, but not all, forgot the critical minus one.
    
    Signed-off-by: Trent Piepho <xyzzy at speakeasy.org>
    Acked-by: David Brownell <dbrownell at users.sourceforge.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 1d1c1d9b557a12320174058d2d313ffb0f8611f4
Author: Roel Kluin <12o3l at tiscali.nl>
Date:   Fri May 23 13:04:43 2008 -0700

    gpio: mcp23s08 debug fix
    
    The return value of mcp23s08_read_regs() can only be evaluated when signed
    
    Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
    Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 69292b342193d4068f6435660368ff98713d8164
Author: David Brownell <david-b at pacbell.net>
Date:   Fri May 23 13:04:42 2008 -0700

    gpio: pca953x driver handles pca9554 too
    
    Teach drivers/gpio/pca953x.c about PCA9554, another compatible chip.
    
    Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit da7978b0348d497688541e2d2f5739aa2a2c334f
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Fri May 23 13:04:41 2008 -0700

    signals: fix sigqueue_free() vs __exit_signal() race
    
    __exit_signal() does flush_sigqueue(tsk->pending) outside of ->siglock.
    This can race with another thread doing sigqueue_free(), we can free the
    same SIGQUEUE_PREALLOC sigqueue twice or corrupt the pending->list.
    
    Note that even sys_exit_group() can trigger this race, not only
    sys_timer_delete().
    
    Move the callsite of flush_sigqueue(tsk->pending) under ->siglock.
    
    This patch doesn't touch flush_sigqueue(->shared_pending) below, it is
    called when there are no other threads which can play with signals, and
    sigqueue_free() can't be used outside of our thread group.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Acked-by: Roland McGrath <roland at redhat.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit dfc7064500061677720fa26352963c772d3ebe6b
Author: NeilBrown <neilb at suse.de>
Date:   Fri May 23 13:04:39 2008 -0700

    md: restart recovery cleanly after device failure.
    
    When we get any IO error during a recovery (rebuilding a spare), we abort
    the recovery and restart it.
    
    For RAID6 (and multi-drive RAID1) it may not be best to restart at the
    beginning: when multiple failures can be tolerated, the recovery may be
    able to continue and re-doing all that has already been done doesn't make
    sense.
    
    We already have the infrastructure to record where a recovery is up to
    and restart from there, but it is not being used properly.
    This is because:
      - We sometimes abort with MD_RECOVERY_ERR rather than just MD_RECOVERY_INTR,
        which causes the recovery not be be checkpointed.
      - We remove spares and then re-added them which loses important state
        information.
    
    The distinction between MD_RECOVERY_ERR and MD_RECOVERY_INTR really isn't
    needed.  If there is an error, the relevant drive will be marked as
    Faulty, and that is enough to ensure correct handling of the error.  So we
    first remove MD_RECOVERY_ERR, changing some of the uses of it to
    MD_RECOVERY_INTR.
    
    Then we cause the attempt to remove a non-faulty device from an array to
    fail (unless recovery is impossible as the array is too degraded).  Then
    when remove_and_add_spares attempts to remove the devices on which
    recovery can continue, it will fail, they will remain in place, and
    recovery will continue on them as desired.
    
    Issue:  If we are halfway through rebuilding a spare and another drive
    fails, and a new spare is immediately available,  do we want to:
     1/ complete the current rebuild, then go back and rebuild the new spare or
     2/ restart the rebuild from the start and rebuild both devices in
        parallel.
    
    Both options can be argued for.  The code currently takes option 2 as
      a/ this requires least code change
      b/ this results in a minimally-degraded array in minimal time.
    
    Cc: "Eivind Sarto" <ivan at kasenna.com>
    Signed-off-by: Neil Brown <neilb at suse.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 90b08710e41a07d4ff0fb8940dcce3a552991a56
Author: Bernd Schubert <bs at q-leap.de>
Date:   Fri May 23 13:04:38 2008 -0700

    md: allow parallel resync of md-devices.
    
    In some configurations, a raid6 resync can be limited by CPU speed
    (Calculating P and Q and moving data) rather than by device speed.  In
    these cases there is nothing to be gained byt serialising resync of arrays
    that share a device, and doing the resync in parallel can provide benefit.
     So add a sysfs tunable to flag an array as being allowed to resync in
    parallel with other arrays that use (a different part of) the same device.
    
    Signed-off-by: Bernd Schubert <bs at q-leap.de>
    Signed-off-by: Neil Brown <neilb at suse.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 4f54b0e9485644a3c5fca2ae43bcbe7376825747
Author: Dan Williams <dan.j.williams at intel.com>
Date:   Fri May 23 13:04:37 2008 -0700

    md: notify userspace on 'stop' events
    
    This additional notification to 'array_state' is needed to allow the
    monitor application to learn about stop events via sysfs.  The
    sysfs_notify("sync_action") call that comes at the end of do_md_stop()
    (via md_new_event) is insufficient since the 'sync_action' attribute has
    been removed by this point.
    
    (Seems like a sysfs-notify-on-removal patch is a better fix.  Currently
    removal updates the event count but does not wake up waiters)
    
    Signed-off-by: Dan Williams <dan.j.williams at intel.com>
    Signed-off-by: Neil Brown <neilb at suse.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 09a44cc15079f80c1416cde1a1d5b2cdd8f2118a
Author: NeilBrown <neilb at suse.de>
Date:   Fri May 23 13:04:36 2008 -0700

    md: notify userspace on 'write-pending' changes to array_state
    
    When an array enters write pending, 'array_state' changes, so we must be
    sure to sysfs_notify.
    
    Also, when waiting for user-space to acknowledge 'write-pending' by
    marking the metadata as dirty, we don't want to wait for MD_CHANGE_DEVS to
    be cleared as that might not happen.  So explicity test for the bits that
    we are really interested in.
    
    Signed-off-by: Neil Brown <neilb at suse.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 698b18c1e8bddf39cbf1ba50792b0fe302dbe6d6
Author: NeilBrown <neilb at suse.de>
Date:   Fri May 23 13:04:35 2008 -0700

    md: raid1: Fix restoration of bio between failed read and write.
    
    When performing a "recovery" or "check" pass on a RAID1 array, we read
    from each device and possible, if there is a difference or a read error,
    write back to some devices.
    
    We use the same 'bio' for both read and write, resetting various fields
    between the two operations.
    
    We forgot to reset bv_offset and bv_len however.  These are often left
    unchanged, but in the case where there is an IO error one or two sectors
    into a page, they are changed.
    
    This results in correctable errors not being corrected properly.  It does
    not result in any data corruption.
    
    Cc: "Fairbanks, David" <David.Fairbanks at stratus.com>
    Signed-off-by: Neil Brown <neilb at suse.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 6be9d4940134b36f9ed020aead36f831f19b49f1
Author: Bernd Schubert <bernd-schubert at gmx.de>
Date:   Fri May 23 13:04:34 2008 -0700

    md: md: raid5 rate limit error printk
    
    Last night we had scsi problems and a hardware raid unit was offlined
    during heavy i/o.  While this happened we got for about 3 minutes a huge
    number messages like these
    
    Apr 12 03:36:07 pfs1n14 kernel: [197510.696595] raid5:md7: read error not correctable (sector 2993096568 on sdj2).
    
    I guess the high error rate is responsible for not scheduling other events
    - during this time the system was not pingable and in the end also other
    devices run into scsi command timeouts causing problems on these unrelated
    devices as well.
    
    Signed-off-by: Bernd Schubert <bernd-schubert at gmx.de>
    Signed-off-by: Dan Williams <dan.j.williams at intel.com>
    Signed-off-by: Neil Brown <neilb at suse.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 6bcfd601861cce45ca73ac1d714f1286b6b3f0d4
Author: Christoph Hellwig <hch at lst.de>
Date:   Fri May 23 13:04:34 2008 -0700

    md: kill file_path wrapper
    
    Kill the trivial and rather pointless file_path wrapper around d_path.
    
    Signed-off-by: Christoph Hellwig <hch at lst.de>
    Signed-off-by: Neil Brown <neilb at suse.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 03de250a269bfa8e6a9e6ccb4a1dbce19dae8a61
Author: Adrian Bunk <bunk at kernel.org>
Date:   Fri May 23 13:04:33 2008 -0700

    md: proper extern for mdp_major
    
    This patch adds a proper extern for mdp_major in include/linux/raid/md.h
    
    Signed-off-by: Adrian Bunk <bunk at kernel.org>
    Signed-off-by: Neil Brown <neilb at suse.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 84255d1018c50e72c71a49f359989597d53a3f53
Author: NeilBrown <neilb at suse.de>
Date:   Fri May 23 13:04:32 2008 -0700

    md: fix possible oops when removing a bitmap from an active array
    
    It is possible to add a write-intent bitmap to an active array, or remove
    the bitmap that is there.
    
    When we do with the 'quiesce' the array, which causes make_request to
    block in "wait_barrier()".
    
    However we are sampling the value of "mddev->bitmap" before the
    wait_barrier call, and using it afterwards.  This can result in using a
    bitmap structure that has been freed.
    
    Signed-off-by: Neil Brown <neilb at suse.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 80119ef5c8153e0a6cc5edf00c083dc98a9bd348
Author: Alan Cox <alan at redhat.com>
Date:   Fri May 23 13:04:31 2008 -0700

    mm: fix atomic_t overflow in vm
    
    The atomic_t type is 32bit but a 64bit system can have more than 2^32
    pages of virtual address space available.  Without this we overflow on
    ludicrously large mappings
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 6c7c6afbb8c0e60d32a563cae7c6889211e9d9d8
Author: maximilian attems <max at stro.at>
Date:   Fri May 23 13:04:29 2008 -0700

    types.h: don't expose struct ustat to userspace
    
    <linux/types.h> can't be used together with <sys/ustat.h> because they
    both define struct ustat:
    
        $ cat test.c
        #include <sys/ustat.h>
        #include <linux/types.h>
        $ gcc -c test.c
        In file included from test.c:2:
        /usr/include/linux/types.h:165: error: redefinition of 'struct ustat'
    
    has been reported a while ago to debian, but seems to have been
    lost in cat fighting: http://bugs.debian.org/429064
    
    Signed-off-by: maximilian attems <max at stro.at>
    Cc: <stable at kernel.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 4b6f6ce97ecc20eb8f3ece3c8370faacfe73e8c2
Author: Ignacio García Pérez <iggarpe at t2i.com>
Date:   Fri May 23 13:04:28 2008 -0700

    serial: support for InstaShield IS-400 four port RS-232 PCI card
    
    Add support for the InstaShield IS-400 four port RS-232 PCI card.
    
    Signed-off-by: Ignacio García Pérez <iggarpe at t2i.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 25829b0e977a7e396b284dad0f523099394390e7
Author: Mariusz Kozlowski <m.kozlowski at tuxland.pl>
Date:   Fri May 23 13:04:28 2008 -0700

    fix parenthesis in include/asm-mips/mach-au1x00/au1000.h
    
    Parenthesis fix in include/asm-mips/mach-au1x00/au1000.h
    
    Signed-off-by: Mariusz Kozlowski <m.kozlowski at tuxland.pl>
    Cc: Ralf Baechle <ralf at linux-mips.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 9d5437a15884bfb3429aee99f76fc014c7de039a
Author: Mariusz Kozlowski <m.kozlowski at tuxland.pl>
Date:   Fri May 23 13:04:26 2008 -0700

    fix parenthesis in include/asm-mips/gic.h
    
    Parenthesis fix in include/asm-mips/gic.h
    
    Signed-off-by: Mariusz Kozlowski <m.kozlowski at tuxland.pl>
    Cc: Ralf Baechle <ralf at linux-mips.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 8808a793f052c0a67426a24b961402fa20e92814
Author: Darrick J. Wong <djwong at us.ibm.com>
Date:   Fri May 23 13:04:25 2008 -0700

    ibmaem: new driver for power/energy/temp meters in IBM System X hardware
    
    This driver reads IBM Active Energy Manager energy/temperature/power
    sensors on IBM System X hardware.
    
    [akpm at linux-foundation.org: fix printk warnings]
    Signed-off-by: Darrick J. Wong <djwong at us.ibm.com>
    Cc: "Mark M. Hoffman" <mhoffman at lightlink.com>
    Cc: Corey Minyard <minyard at acm.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit b8fdaf5a05adbf80e5a943bb3f65b46b5fb9b488
Author: Darrick J. Wong <djwong at us.ibm.com>
Date:   Fri May 23 13:04:25 2008 -0700

    i5k_amb: support Intel 5400 chipset
    
    Minor rework to support the Intel 5400 chipset.
    
    Signed-off-by: Darrick J. Wong <djwong at us.ibm.com>
    Cc: "Mark M. Hoffman" <mhoffman at lightlink.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit ca68d0ac16539a062ae26ca50da8b186fa3a0814
Author: Gabor Czigola <czigola at gmail.com>
Date:   Fri May 23 13:04:23 2008 -0700

    hdaps: invert the axes for HDAPS on Lenovo R61i ThinkPads
    
    Cc: "Mark M. Hoffman" <mhoffman at lightlink.com>
    Cc: Dmitry Torokhov <dtor at mail.ru>
    Cc: Jiri Kosina <jikos at jikos.cz>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 80bfc25f42db6d4715c7688ae2352c5a8038fe7e
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date:   Fri May 23 13:04:22 2008 -0700

    ntfs: le*_add_cpu conversion
    
    replace all:
    little_endian_variable = cpu_to_leX(leX_to_cpu(little_endian_variable) +
    					expression_in_cpu_byteorder);
    with:
    	leX_add_cpu(&little_endian_variable, expression_in_cpu_byteorder);
    generated with semantic patch
    
    Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
    Acked-by: Anton Altaparmakov <aia21 at cantab.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit f7232154198f928fc25f420d6190468212a7632a
Author: Johannes Weiner <hannes at saeurebad.de>
Date:   Fri May 23 13:04:21 2008 -0700

    mm: don't drop a partial page in a zone's memory map size
    
    In a zone's present pages number, account for all pages occupied by the
    memory map, including a partial.
    
    Signed-off-by: Johannes Weiner <hannes at saeurebad.de>
    Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit f899b0adc6fc8f60a9db8b52f36f06fd1abeaf7c
Author: Karel Zak <kzak at redhat.com>
Date:   Fri May 23 13:04:21 2008 -0700

    MAINTAINERS: add util-linux-ng package
    
    (akpm: we often deal with util-linux and I (at least) can never remember
    where they hang out).
    
    Signed-off-by: Karel Zak <kzak at redhat.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 71fd5179e8d1d4d503b517e0c5374f7c49540bfc
Author: Cyrill Gorcunov <gorcunov at gmail.com>
Date:   Fri May 23 13:04:20 2008 -0700

    ecryptfs: fix missed mutex_unlock
    
    Cc: Michael Halcrow <mhalcrow at us.ibm.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 03fb0bce01490c9bdedad861962c76f987531014
Author: Miklos Szeredi <mszeredi at suse.cz>
Date:   Fri May 23 13:04:19 2008 -0700

    fuse: fix bdi naming conflict
    
    Fuse allocates a separate bdi for each filesystem, and registers them
    in sysfs with "MAJOR:MINOR" of sb->s_dev (st_dev).  This works fine for
    anon devices normally used by fuse, but can conflict with an already
    registered BDI for "fuseblk" filesystems, where sb->s_dev represents a
    real block device.  In particularl this happens if a non-partitioned
    device is being mounted.
    
    Fix by registering with a different name for "fuseblk" filesystems.
    
    Thanks to Ioan Ionita for the bug report.
    
    Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
    Reported-by: Ioan Ionita <opslynx at gmail.com>
    Tested-by: Ioan Ionita <opslynx at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 42172d751b4596b8ca4346a1c251b5f1c661ab0c
Author: Nick Piggin <npiggin at suse.de>
Date:   Fri May 23 13:04:18 2008 -0700

    mm: allow pfnmap ->fault()s
    
    Take out an assertion to allow ->fault handlers to service PFNMAP regions.
    This is required to reimplement .nopfn handlers with .fault handlers and
    subsequently remove nopfn.
    
    Signed-off-by: Nick Piggin <npiggin at suse.de>
    Acked-by: Jes Sorensen <jes at sgi.com>
    Cc: Paul Mackerras <paulus at samba.org>
    Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 97ec710cab76f90a6bece76a04e76aa50096a470
Author: Travis Place <wishie at wishie.net>
Date:   Fri May 23 18:31:46 2008 +0200

    [ALSA] hda - Added support for Foxconn P35AX-S mainboard
    
    Added IDs for the Foxconn P35AX-S mainboard to patch_realtek.c, so
    that ALC883_6ST_DIG is used by default.
    
    Signed-off-by: Travis Place <wishie at wishie.net>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 20a3a05dd66ad0f678a587688cc85f0b36869876
Author: Takashi Iwai <tiwai at suse.de>
Date:   Fri May 23 17:52:53 2008 +0200

    [ALSA] hda - Fix COEF and EAPD in ALC889 auto-configuration mode
    
    Fix the missing COEF and EAPD initialization in ALC889 auto-configuration
    mode.
    
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit bc9b56238eedda865070dcaed6694d65b517c8d6
Author: Takashi Iwai <tiwai at suse.de>
Date:   Fri May 23 17:50:27 2008 +0200

    [ALSA] hda - Fix noise on VT1708 codec
    
    We get quite noisy output on the right channel on VT1708 codec
    when 24bit samples are used.  Suppress the 24bit support until any
    real fix is found.
    	https://bugzilla.novell.com/show_bug.cgi?id=390473
    
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit b9e16bc548600124da9d24186364ee8d06040569
Author: Travis Place <wishie at wishie.net>
Date:   Wed May 21 16:57:20 2008 +0200

    [ALSA] hda - Add model for ASUS P5K-E/WIFI-AP
    
    Added a config table entry for the ASUS P5K-E/WIFI-AP mainboard (ID
    1043:8227) to use AD1988_6STACK_DIG
    
    Signed-off-by: Travis Place <wishie at wishie.net>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 1f42ea7bc0ddfadebd9e1c5362b41b53902dbcb1
Author: James Bottomley <James.Bottomley at HansenPartnership.com>
Date:   Thu May 22 12:34:41 2008 +0100

    [SCSI] fix intermittent oops in scsi_bus_uevent
    
    Reported-by: Sitsofe Wheeler <sitsofe at yahoo.com>
    > BUG: unable to handle kernel paging request at e6f17fac
    > IP: [<c02604d6>] scsi_bus_uevent+0x1/0x17
    > *pde = 2714b163 *pte = 26f17160
    > Oops: 0000 [#1] DEBUG_PAGEALLOC
    > last sysfs file:
    >
    > Pid:  1, comm: swapper Not tainted (2.6.26-rc2-next-20080516skw #30)
    > EIP: 0060:[<c02604d6>] EFLAGS: 00010282 CPU: 0
    > EIP is at scsi_bus_uevent+0x1/0x17
    > EAX: e6f18014 EBX: e6f18014 ECX: c02604d5 EDX: e7173000
    > ESI: e7173000 EDI: e7173000 EBP: e7851ca0 ESP: e7851c90
    >  DS: 007b ES: 007b FS: 0000 GS: 0000 SS: 0068
    
    The problem is caused by:
    
    commit b0ed43360fdca227048d88a08290365cb681c1a8
    Author: Hannes Reinecke <hare at suse.de>
    Date:   Tue Mar 18 14:32:28 2008 +0100
    
        [SCSI] add scsi_host and scsi_target to scsi_bus
    
    which added scsi_bus_type to the struct scsi_target device.  This
    causes both the scsi_device and scsi_target to fire scsi_bus_uevents.
    However, the actualy scsi_bus_uevent() call assumes blindly that it's
    a struct scsi_device.  Check for this and return immediately if it
    isn't.
    
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit 7c28472a5d4ecf7c61b3c3901994be878cd6c5d2
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date:   Fri May 23 19:35:52 2008 +0100

    [ARM] integrator: fix build warnings and errors
    
    Fix resource_size_t warning in impd1.c, and printascii() build
    errors in pci_v3.c
    
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit c2448278e3be3a43fe0343e138444742af1e99ae
Merge: e6b027a398bcfbb8897353a88a2edfcc97fd604d 5a4f2b675210718aceb4abf41617a3af31bba718
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Fri May 23 11:11:44 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
      IB/mad: Fix kernel crash when .process_mad() returns SUCCESS|CONSUMED
      IPoIB: Test for NULL broadcast object in ipiob_mcast_join_finish()
      MAINTAINERS: Add cxgb3 and iw_cxgb3 NIC and iWARP driver entries
      IB/mlx4: Fix creation of kernel QP with max number of send s/g entries
      IB/mthca: Fix max_sge value returned by query_device
      RDMA/cxgb3: Fix uninitialized variable warning in iwch_post_send()
      IB/mlx4: Fix uninitialized-var warning in mlx4_ib_post_send()
      IB/ipath: Fix UC receive completion opcode for RDMA WRITE with immediate
      IB/ipath: Fix printk format for ipath_sdma_status

commit 5a4f2b675210718aceb4abf41617a3af31bba718
Author: Dave Olson <dave.olson at qlogic.com>
Date:   Fri May 23 10:52:59 2008 -0700

    IB/mad: Fix kernel crash when .process_mad() returns SUCCESS|CONSUMED
    
    If a low-level driver returns IB_MAD_RESULT_SUCCESS | IB_MAD_RESULT_CONSUMED,
    handle_outgoing_dr_smp() doesn't clean up properly.  The fix is to
    kfree the local data and break, rather than falling through.  This was
    observed with the ipath driver, but could happen with any driver.
    
    This fixes <https://bugs.openfabrics.org/show_bug.cgi?id=1027>.
    
    Signed-off-by: Dave Olson <dave.olson at qlogic.com>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit e6b027a398bcfbb8897353a88a2edfcc97fd604d
Merge: 57f7bd5b455298dbe94227aa1fedbbfe63bbf252 4f74369422b883164c50b5936517d010a3e1ce59
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Fri May 23 09:24:52 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] clarify license of freq_table.c
      [CPUFREQ] Remove documentation of removed ondemand tunable.
      [CPUFREQ] Crusoe: longrun cpufreq module reports false min freq
      [CPUFREQ] powernow-k8: improve error messages

commit b1979a5fda7869a790f4fd83fb06c78498d26ba1
Author: Ingo Molnar <mingo at elte.hu>
Date:   Mon May 12 21:21:15 2008 +0200

    x86: prevent PGE flush from interruption/preemption
    
    CR4 manipulation is not protected against interrupts and preemption,
    but KVM uses smp_function_call to manipulate the X86_CR4_VMXE bit
    either from the CPU hotplug code or from the kvm_init call.
    
    We need to protect the CR4 manipulation from both interrupts and
    preemption.
    
    Original bug report: http://lkml.org/lkml/2008/5/7/48
    Bugzilla entry: http://bugzilla.kernel.org/show_bug.cgi?id=10642
    
    This is not a regression from 2.6.25, it's a long standing and hard to
    trigger bug.
    
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit 57f7bd5b455298dbe94227aa1fedbbfe63bbf252
Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date:   Fri May 23 08:40:45 2008 -0700

    remove debug printk from DRM suspend path
    
    Not sure how this snuck upstream, but it really doesn't belong there.  We
    don't need a KERN_ERR printk in the suspend path to know what's going on (at
    least not anymore).
    
    Signed-off-by:  Jesse Barnes <jbarnes at virtuousgeek.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

commit cfb41bf756cac168c829e27def36072dbfbe6fd0
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date:   Fri May 23 15:38:07 2008 +0100

    [ARM] fix OMAP include loops
    
    OMAP has two include loops in its header files:
    
      asm-arm/hardware.h <- asm-arm/arch-omap/io.h <-
       asm-arm/arch-omap/hardware.h <- asm-arm/hardware.h
    
      asm-arm/arch-omap/board-palmte.h <-
       asm-arm/arch-omap/hardware.h <- asm-arm/hardware.h <-
       asm-arm/arch-omap/gpio.h <- asm-arm/arch-omap/board-palmte.h
    
    Circular include dependencies are dangerous since they can result in
    inconsistent definitions being provided to other code, especially if
    '#ifndef' constructs are used.
    
    Solve these by removing the offending includes, and add additional
    includes where necessary.
    
    Acked-by: Tony Lindgren <tony at atomide.com>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit 2a740d7a64807acaceb7e44ccf50df35107a34ab
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date:   Fri May 23 13:53:31 2008 +0100

    Revert "[ARM] pxa: spitz wants PXA27x UDC definitions"
    
    This reverts commit 53491e042e79578765e2d33512a45d50eb0d8801, which hit
    the kernel tree too early.
    
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit 415ad1e50abcc86c235a42fbab57f2b6134412d7
Author: Greg Ungerer <gerg at snapgear.com>
Date:   Fri May 23 08:31:39 2008 +0100

    [ARM] 5053/1: define before use of processor_id
    
    For the simple read_cpuid() macro case the variable processor_id has
    no definition on use of the macro. Add an extern for it. Move all the
    processor ID macros into the #ifndef __ASSEMBLEY__ block.
    
    Signed-off-by: Greg Ungerer <gerg at uclinux.org>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit 66aaeff1c27545909e502546120be2c5432394e3
Author: Greg Ungerer <gerg at snapgear.com>
Date:   Fri May 23 08:26:24 2008 +0100

    [ARM] 5052/1: export clock functions for the at91x40
    
    Export the AT91 clock functions for the AT91X40. Some external code common
    to all AT91 family parts relys on this, like the gpio and serial support.
    
    Signed-off-by: Greg Ungerer <gerg at uclinux.org>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit 50346e621252617a07eb800dfa3f876ccd52d534
Author: Greg Ungerer <gerg at snapgear.com>
Date:   Fri May 23 07:16:52 2008 +0100

    [ARM] 5051/1: define pgtable_t for the !CONFIG_MMU case too
    
    The non-MMU case also needs the type definition of pgtable_t.
    So move it out of a CONFIG_MMU conditional section.
    
    Signed-off-by: Greg Ungerer <gerg at uclinux.org>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit a1289643adb6272c04db9399653ae195072c482a
Author: Andi Kleen <andi at firstfloor.org>
Date:   Wed May 14 16:10:42 2008 -0700

    x86: use explicit copy in vdso_gettimeofday()
    
    Jeremy's gcc 3.4 seems to be unable to inline a 8 byte memcpy.  But the
    vdso doesn't support external references.  Copy the structure members
    of struct timezone explicitely instead.
    
    Signed-off-by: Andi Kleen <ak at linux.intel.com>
    Cc: Jeremy Fitzhardinge <jeremy at goop.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit 2ddfd20e7c55421435cbf95a5ed3dd6e423cf934
Author: Ingo Molnar <mingo at elte.hu>
Date:   Thu May 22 10:37:48 2008 +0200

    namespacecheck: automated fixes
    
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit de067814d6b69030d0030e1c5b3dbaf0385aae41
Author: Jan Beulich <jbeulich at novell.com>
Date:   Thu May 15 13:24:52 2008 +0100

    x86/xen: fix arbitrary_virt_to_machine()
    
    While I realize that the function isn't currently being used, I still
    think an obvious mistake like this should be corrected.
    
    Signed-off-by: Jan Beulich <jbeulich at novell.com>
    Acked-by: Jeremy Fitzhardinge <jeremy at goop.org>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit 2584a82deed7196f48066f1b1a7fad4ec5bea961
Author: Chuck Ebbert <cebbert at redhat.com>
Date:   Tue May 20 18:18:12 2008 -0400

    x86: don't read maxlvt before checking if APIC is mapped
    
    A check for unmapped apic was added before reading maxlvt but the early
    read of maxlvt wasn't removed.
    
    Signed-off-by: Chuck Ebbert <cebbert at redhat.com>
    Cc: Andi Kleen <ak at suse.de>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
    Cc: stable at kernel.org

commit 74dc51a3de06aa516e3b9fdc4017b2aeb38bf44b
Author: Thomas Gleixner <tglx at linutronix.de>
Date:   Sun May 18 22:17:59 2008 +0200

    x86: disable TSC for sched_clock() when calibration failed
    
    When the TSC calibration fails then TSC is still used in
    sched_clock(). Disable it completely in that case.
    
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
    Cc: stable at kernel.org

commit 9ccc906c97e34fd91dc6aaf5b69b52d824386910
Author: Thomas Gleixner <tglx at linutronix.de>
Date:   Tue May 13 12:31:00 2008 +0200

    x86: distangle user disabled TSC from unstable
    
    tsc_enabled is set to 0 from the command line switch "notsc" and from
    the mark_tsc_unstable code. Seperate those functionalities and replace
    tsc_enable with tsc_disable. This makes also the native_sched_clock()
    decision when to use TSC understandable.
    
    Preparatory patch to solve the sched_clock() issue on 32 bit.
    
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit b6db80ee1331e7beaeb91b4b3d946dd16c72e388
Author: Thomas Gleixner <tglx at linutronix.de>
Date:   Sun May 18 19:27:48 2008 +0200

    x86: fix setup of cyc2ns in tsc_64.c
    
    When the TSC is calibrated against the PIT due to the nonavailability
    of PMTIMER/HPET or due to SMI interference then the setup of the per
    CPU cyc2ns variables is skipped. This is unlikely to happen but it
    would definitely render sched_clock() unusable.
    
    This was introduced with commit 53d517cdbaac704352b3d0c10fecb99e0b54572e
    
        x86: scale cyc_2_nsec according to CPU frequency
    
    Update the per CPU cyc2ns variables in all exit pathes of tsc_calibrate.
    
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
    Cc: stable at kernel.org

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

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

commit 289c79a4bd350e8a25065102563ad1a183d1b402
Author: Patrick McHardy <kaber at trash.net>
Date:   Fri May 23 00:22:04 2008 -0700

    vlan: Use bitmask of feature flags instead of seperate feature bits
    
    Herbert Xu points out that the use of seperate feature bits for features
    to be propagated to VLAN devices is going to get messy real soon.
    Replace the VLAN feature bits by a bitmask of feature flags to be
    propagated and restore the old GSO_SHIFT/MASK values.
    
    Signed-off-by: Patrick McHardy <kaber at trash.net>
    Acked-by: Herbert Xu <herbert at gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 7bece8155be133cd67c41eed2b31c60a310609de
Merge: b9a2f2e450b0f770bb4347ae8d48eb2dea701e24 bdefff1f54cb76a19700663f211350de2f65cc91
Author: David S. Miller <davem at davemloft.net>
Date:   Fri May 23 00:05:14 2008 -0700

    Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

commit c511afb41f21857fbbae78f83f88b1247597f46f
Author: Magnus Damm <magnus.damm at gmail.com>
Date:   Thu May 22 22:38:36 2008 +0900

    sh: update Migo-R defconfig
    
    Update the Migo-R defconfig to include support for KEYSC, I2C, RTC and
    NAND and NOR MTD devices.
    
    Signed-off-by: Magnus Damm <damm at igel.co.jp>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit fa7ff086008d1af6b7325bf556a0cf70aaf2efd3
Author: Magnus Damm <magnus.damm at gmail.com>
Date:   Thu May 22 22:34:28 2008 +0900

    sh: use sm501 8250 mfd support on r2d boards
    
    Make use of recently added sm501 8250 uart support, commit
    61711f8fd8180e458cfb6846bcf4fc636a95f3db makes the mfd code
    handle 8250 uarts so there is no longer need to do it from
    the r2d board code.
    
    Signed-off-by: Magnus Damm <damm at igel.co.jp>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit b76baf4cf5978efeabf5a3e054551e40ef599b69
Author: Magnus Damm <magnus.damm at gmail.com>
Date:   Thu May 22 22:24:51 2008 +0900

    sh: add probe support for new sh7723 cut
    
    This patch adds support for sh7723 silicon with a prr value of 0x51.
    
    Signed-off-by: Magnus Damm <damm at igel.co.jp>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit 760130447248de94943cf75c80fa3ac8fe9d977d
Author: Magnus Damm <magnus.damm at gmail.com>
Date:   Thu May 22 22:19:39 2008 +0900

    sh: fix VPU interrupt vector for sh7723
    
    This patch fixes a VPU vector typo for sh7723. The correct value is 0x980,
    the same as for sh7722.
    
    Signed-off-by: Magnus Damm <damm at igel.co.jp>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit 526c1c23a23785114f618624e22480a3317388e1
Author: Magnus Damm <magnus.damm at gmail.com>
Date:   Thu May 22 22:15:31 2008 +0900

    sh: fix USBF resource for sh7722
    
    The USBF function on sh7722 is currently not working with the m66592_udc
    driver. The driver is using platform_get_resource_byname() so my commit
    a0d29798e568116aa6c32aef7bab2d9e620c88ad broke sh7722 support.
    
    The long term fix is to replace platform_get_resource_byname() in the
    driver with platform_get_resource(), but this helps until that happens.
    
    Signed-off-by: Magnus Damm <damm at igel.co.jp>
    Signed-off-by: Paul Mundt <lethal at linux-sh.org>

commit 4f74369422b883164c50b5936517d010a3e1ce59
Author: Dominik Brodowski <linux at dominikbrodowski.net>
Date:   Thu May 22 08:52:05 2008 +0200

    [CPUFREQ] clarify license of freq_table.c
    
    Signed-off-by: Dominik Brodowski <linux at dominikbrodowski.net>
    Signed-off-by: Dave Jones <davej at redhat.com>

commit bdefff1f54cb76a19700663f211350de2f65cc91
Author: Komuro <komurojun-mbn at nifty.com>
Date:   Mon May 5 10:51:12 2008 +0900

    fmvj18x_cs: add NextCom NC5310 rev B support
    
    fmvj18x_cs: The manfid of "NextCom NC5310 rev B" is MANF_ID_FUJITSU.
                but this card is MBH10302 based card.
                use ConfigBase to detect the cardtype for this card.
    
    Signed-off-by: Komuro <komurojun-mbn at nifty.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 43fc63dceb8ff58c5ef0a30c70abd31336b5e8b4
Author: Komuro <komurojun-mbn at nifty.com>
Date:   Sun Apr 20 14:32:34 2008 +0900

    xirc2ps_cs: re-initialize the multicast address in do_reset
                keep bit7,8 of XIRCREG42_SWC1 in set_multicast_list.
    
    Signed-off-by: Komuro <komurojun-mbn at nifty.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit f7f312a0c7e7a1947cf193e0e94a257ad7742cb2
Author: Wang Chen <wangchen at cn.fujitsu.com>
Date:   Tue May 20 17:13:52 2008 +0800

    3C509: rx_bytes should not be increased when alloc_skb failed
    
    If alloc_skb failed, the recieved packet will be dropped. Do not increase
    rx_bytes for dropped packet.
    
    Signed-off-by: Wang Chen <wangchen at cn.fujitsu.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 56cfe5d028687468f76e8b613c63ca41f209982d
Author: Wang Chen <wangchen at cn.fujitsu.com>
Date:   Thu May 22 18:09:06 2008 +0800

    NETFRONT: Use __skb_queue_purge()
    
    Use standard routine for queue purging.
    
    Signed-off-by: Wang Chen <wangchen at cn.fujitsu.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 288369cc2580178ef6ed7c5c63cc1ef08c803250
Author: Wang Chen <wangchen at cn.fujitsu.com>
Date:   Thu May 22 18:07:43 2008 +0800

    VIRTIO: Use __skb_queue_purge()
    
    Use standard routine for queue purging.
    
    Signed-off-by: Wang Chen <wangchen at cn.fujitsu.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit a01b3d766c0ad3e63978b0f6faf4004688f13522
Author: Paul Gortmaker <paul.gortmaker at windriver.com>
Date:   Thu May 22 12:43:50 2008 -0400

    phylib: do EXPORT_SYMBOL on get_phy_id
    
    Commit cac1f3c8 factored out the code for get_phy_id so that it
    could be reused in multiple places.  Turns out that some of the
    users can be modular, so we need to export this symbol as well.
    
    Signed-off-by: Paul Gortmaker <paul.gortmaker at windriver.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit b9a2f2e450b0f770bb4347ae8d48eb2dea701e24
Author: Thomas Graf <tgraf at suug.ch>
Date:   Thu May 22 10:48:59 2008 -0700

    netlink: Fix nla_parse_nested_compat() to call nla_parse() directly
    
    The purpose of nla_parse_nested_compat() is to parse attributes which
    contain a struct followed by a stream of nested attributes.  So far,
    it called nla_parse_nested() to parse the stream of nested attributes
    which was wrong, as nla_parse_nested() expects a container attribute
    as data which holds the attribute stream.  It needs to call
    nla_parse() directly while pointing at the next possible alignment
    point after the struct in the beginning of the attribute.
    
    With this patch, I can no longer reproduce the reported leftover
    warnings.
    
    Signed-off-by: Thomas Graf <tgraf at suug.ch>
    Acked-by: Patrick McHardy <kaber at trash.net>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 76994412f8e824e79a593d6777ec327d85f942b2
Author: Pekka Enberg <penberg at cs.helsinki.fi>
Date:   Thu May 22 19:22:25 2008 +0300

    slub: ksize() abuse checks
    
    Add a WARN_ON for pages that don't have PageSlab nor PageCompound set to catch
    the worst abusers of ksize() in the kernel.
    
    Acked-by: Christoph Lameter <clameter at sgi.com>
    Cc: Matt Mackall <mpm at selenic.com>
    Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi>

commit b851cb289d905ea04e5f0b518bf3f28407a72118
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date:   Thu May 22 16:38:50 2008 +0100

    [ARM] omap: fix omap clk support build errors
    
    arch/arm/plat-omap/clock.c:397: warning: "struct cpufreq_frequency_table" declared inside parameter list
    arch/arm/plat-omap/clock.c:397: warning: its scope is only this definition or declaration, which is probably not what you want
    arch/arm/plat-omap/clock.c: In function `clk_init_cpufreq_table':
    arch/arm/plat-omap/clock.c:402: error: structure has no member named `clk_init_cpufreq_table'
    arch/arm/plat-omap/clock.c:403: error: structure has no member named `clk_init_cpufreq_table'
    
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

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

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

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

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

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

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

commit 90239bbd598c6a0fc7f2c7352e9886bd3be968d0
Author: Ben Dooks <ben-linux at fluff.org>
Date:   Wed May 21 10:24:17 2008 +0100

    [ARM] 5039/1: S3C244X: Rename SDI device if running on S3C244X.
    
    Rename the SDI device if on an S3C2440 or S3C2442.
    
    Signed-off-by: Ben Dooks <ben-linux at fluff.org>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit 4ba35fbe293be319b1a5d97951e567c0d9527d09
Author: Philipp Zabel <philipp.zabel at gmail.com>
Date:   Thu May 22 10:19:28 2008 +0100

    [ARM] 5043/1: pxafb: remove unused mode variable in pxafb_init_fbinfo
    
    Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
    Acked-by: Eric Miao <eric.miao at marvell.com>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit e142848300b1a13d59a6e5fff8c914096d3830fb
Author: Ben Dooks <ben-linux at fluff.org>
Date:   Wed May 21 10:25:01 2008 +0100

    [ARM] 5041/1: VR1000: Fix DM9000 IRQ flags initialisation
    
    Add the IRQF_TRIGGER_ type to the DM9000 IRQ resource
    to stop the driver itself complaining it was not given
    any flags to use.
    
    Signed-off-by: Ben Dooks <ben-linux at fluff.org>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit ace94f9efb8ad2c21b308b3bdf02db984d8b3c5f
Author: Ben Dooks <ben-linux at fluff.org>
Date:   Wed May 21 10:24:46 2008 +0100

    [ARM] 5040/1: BAST: Fix DM9000 IRQ flags initialisation
    
    Add the IRQF_TRIGGER_ type to the DM9000 IRQ resource
    to stop the driver itself complaining it was not given
    any flags to use.
    
    Signed-off-by: Ben Dooks <ben-linux at fluff.org>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit 59d83db559315bb75aea849ee773f571ddcc3574
Author: Tony Lindgren <tony at atomide.com>
Date:   Mon May 19 05:20:56 2008 +0100

    [ARM] 5038/1: ARM: OMAP: Remove tsc2102 references from board-palmte.c
    
    As noted by Russell King. These depend on tsc210x drivers
    getting integrated first.
    
    Signed-off-by: Tony Lindgren <tony at atomide.com>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit 864d0ec9db9c0c18b79cebb9d8b7ac75c3b70571
Author: Thomas Kunze <thommycheck at gmx.de>
Date:   Mon May 19 22:06:51 2008 +0100

    [ARM] 5025/2: fix collie cpu initialisation
    
    collie.h:
         * add some meaningfull names to some gpios
    collie.c:
        * initialize cpu registers correctly
    
    Signed-off-by: Thomas Kunze <thommycheck at gmx.de>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit fa701bd24d6e64a2283d6fa386554775fd4336e7
Author: Krzysztof Halasa <khc at pm.waw.pl>
Date:   Mon May 19 19:00:51 2008 +0200

    WAN: protect HDLC proto list while insmod/rmmod
    
    WAN: protect protocol list in hdlc.c with RTNL.
    
    Signed-off-by: Krzysztof Hałasa <khc at pm.waw.pl>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 4ecc8c066f3cecb55807644a01435084d8ed638a
Author: Julia Lawall <julia at diku.dk>
Date:   Mon May 12 15:38:26 2008 +0200

    drivers/net/fs_enet: remove null pointer dereference
    
    The following code appears in the function fs_init_instance in the file drivers/net/fs_enet/fs_enet-main.c.
    
    	if (fep->ops == NULL) {
    		printk(KERN_ERR DRV_MODULE_NAME
    		       ": %s No matching ops found (%d).\n",
    		       ndev->name, fpi->fs_no);
    		err = -EINVAL;
    		goto err;
    	}
    
    This code implies that at the point of err, fep->ops can be NULL, so an
    extra test is needed before dereferencing this value.
    
    This problem was found using the following semantic match
    (http://www.emn.fr/x-info/coccinelle/)
    
    // <smpl>
    @@
    expression E, E1;
    identifier f;
    statement S1,S2,S3;
    @@
    
    * if (E == NULL)
    {
      ... when != if (E == NULL) S1 else S2
          when != E = E1
    * E->f
      ... when any
      return ...;
    }
    else S3
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia at diku.dk>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 0b5923cd477674755dde670ba804649523f27c97
Author: Sreenivasa Honnur <Sreenivasa.Honnur at neterion.com>
Date:   Mon May 12 13:43:05 2008 -0400

    S2io: Version update for napi and MSI-X patches
    
    - Updated version number
    
    Signed-off-by: Sreenivasa Honnur <sreenivasa.honnur at neterion.com>
    Signed-off-by: Ramkrishna Vepa <ram.vepa at neterion.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit f61e0a3544be2f615a0af4aec71eb85a96bdbd62
Author: Sreenivasa Honnur <Sreenivasa.Honnur at neterion.com>
Date:   Mon May 12 13:42:17 2008 -0400

    S2io: Added napi support when MSIX is enabled.
    
    - Added napi support when MSIX is enabled.
    - Moved test_msi function from s2io_open to probe function.
    
    Signed-off-by: Sreenivasa Honnur <sreenivasa.honnur at neterion.com>
    Signed-off-by: Ramkrishna Vepa <ram.vepa at neterion.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit ac731ab66960547c33a4e2c504419389ae747067
Author: Sreenivasa Honnur <Sreenivasa.Honnur at neterion.com>
Date:   Mon May 12 13:41:32 2008 -0400

    S2io: Move all the transmit completions to a single msi-x (alarm) vector
    
    - Move all the transmit completions to a single msi-x (alarm) vector.
    - Enable the continuous timer interrupt for only one transmit fifo.
    
    Signed-off-by: Santosh Rastapur <santosh.rastapur at neterion.com>
    Signed-off-by: Ramkrishna Vepa <ram.vepa at neterion.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 25c16fffa8ed82d3ef31980d76ff95d3c6430f00
Author: Joe Perches <joe at perches.com>
Date:   Mon May 12 14:38:17 2008 -0700

    drivers/net/ehea - remove unnecessary memset after kzalloc
    
    Signed-off-by: Joe Perches <joe at perches.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit d04455fba3777fa5c3963348be76510169bbf4df
Author: Francois Romieu <romieu at fr.zoreil.com>
Date:   Mon May 12 18:44:21 2008 +0200

    au1000_eth: remove useless check
    
    The lifespan of the device covers the request_irq .. free_irq interval.
    
    The cast of a void * pointer is not needed either.
    
    Signed-off-by: Francois Romieu <romieu at fr.zoreil.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 94a47f4161798c34bec7718768f72cf16bcfb4f0
Author: Huang Weiyi <weiyi.huang at gmail.com>
Date:   Mon May 12 12:14:04 2008 +0800

    Blackfin EMAC Driver: Removed duplicated include <linux/ethtool.h>
    
    Signed-off-by: Huang Weiyi <weiyi.huang at gmail.com>
    Signed-off-by: Bryan Wu <cooloney at kernel.org>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit f917d58031fce6dfd7cea71259ea6a2b663ec813
Author: Matteo Croce <matteo at openwrt.org>
Date:   Wed May 14 00:58:32 2008 +0200

    cpmac bugfixes and enhancements
    
    * Resolve some locking issues using atomic_inc/atomic_dec
    * move status code in cpmac_check_status
    * unmark the BROKEN flag in Kconfig
    * move code which should have been in platform code in
      arch/mips/ar7/platform.c
    * fixed an IRQ storm which lets the kernel hang
    * fixed a double call to netif_start_queue which causes a kernel panic
    * don't fail to register the PHY, works on many devices now
    
    Signed-off-by: Matteo Croce <matteo at openwrt.org>
    Signed-off-by: Felix Fietkau <nbd at openwrt.org>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit f47e81fc36371a2f5e2b9792b6a8c56a4564ebbe
Author: Becky Bruce <bgill at freescale.com>
Date:   Thu May 1 18:03:11 2008 -0500

    e1000e: use resource_size_t, not unsigned long, for phys addrs
    
    The use of unsigned long causes the driver to fail on 32-bit systems
    which support 64-bit resources.
    
    Signed-off-by: Becky Bruce <becky.bruce at freescale.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 3d60efb55f634e200fd99e0960a8e099fb38446a
Author: Aurelien Nephtali <aurelien.nephtali at sitadelle.com>
Date:   Wed May 14 17:04:13 2008 -0700

    net/usb: add support for Apple USB Ethernet Adapter
    
    Add support for Apple USB Ethernet Adapter.
    
    http://store.apple.com/1-800-MY-APPLE/WebObjects/AppleStore.woa/wa/RSLID?nplm=MB442Z/A
    
    Signed-off-by: Aurelien Nephtali <aurelien at sitadelle.com>
    Acked-by: Greg KH <greg at kroah.com>
    Cc: David Brownell <david-b at pacbell.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 7fa0cba330af3a24f43ac85e14b0b5fed557cdab
Author: Anton Vorontsov <avorontsov at ru.mvista.com>
Date:   Fri May 16 23:04:51 2008 +0400

    uli526x: add support for netpoll
    
    This patch adds netpoll support for the uli526x ethernet driver --
    simply call the interrupt handler for polling.
    
    To do this without disable_irq()/enable_irq() pair we should fully
    protect the handler. Luckily, it's already using irqsave spinlock,
    the only unprotected place is interrupts re-enabling write. It was
    safe to re-enable interrupts without holding the spinlock, but with
    netpoll possibility now it doesn't seem so.
    
    Patch was tested using netconsole and KGDBoE.
    
    Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 7f80202bb964dd9c5b408af8100c7f0fd39a15c7
Author: Andy Fleming <afleming at freescale.com>
Date:   Thu May 15 17:00:21 2008 -0500

    ucc_geth: Fix arguments to dma map/unmap functions
    
    We were passing NULL as the device.  When we actually start supporting
    more interesting memory configurations, this will break things, so
    we proactively are fixing the bug.
    
    Signed-off-by: Andy Fleming <afleming at freescale.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 940608be2e6117c17c19b203f7393ced4d02590a
Author: Maciej W. Rozycki <macro at linux-mips.org>
Date:   Sat May 17 07:07:36 2008 +0100

    PHYLIB: Kconfig: Fix the dependency on S390
    
     PHYLIB was first marked as BROKEN on S390, then the enclosing menu marked
    as non-S390, then the two dependencies merged with the conversion to
    menuconfig.  Reduce to non-S390.
    
    Signed-off-by: Maciej W. Rozycki <macro at linux-mips.org>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 5a0a92e67b5009a71e011658da04fb92dad8961f
Author: Gerrit Renker <gerrit at erg.abdn.ac.uk>
Date:   Sat May 17 08:35:36 2008 +0100

    [SC92031] Using padto turned driver into an IPv6-only interface
    
    IPv4 would work with this driver only with static arp table entries,
    the patch  reverts a padto introduced in
    
     commit 26a17b7bbb36a8552d531bc1ad08472fb5aa3007
     sc92031: start transmit return value bugfix
    
    The padto does not work because the driver code evaluates `len' later on and
    there are cases where skb->len is not updated accordingly.
    
    This was observed with ARP frames (skb->len = 42 bytes, !skb_cloned(),
    skb_tailroom = 84 bytes). Then in skb_pad(), the first condition is true, where
    skb->len is not updated. As a consequence, the driver uses 42 bytes instead of
    the 60 bytes, and the ARP frame never makes it onto the wire.
    
    Signed-off-by: Gerrit Renker <gerrit at erg.abdn.ac.uk>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 789585e968f07653a29a9e829aed20386043636c
Author: Stephen Hemminger <shemminger at vyatta.com>
Date:   Sun May 18 04:45:09 2008 +0100

    sb1250: use netdev_alloc_skb
    
     Use netdev_alloc_skb.  This sets skb->dev and allows arch specific
    allocation.  Also simplify and cleanup the alignment code.
    
    Signed-off-by: Stephen Hemminger <shemminger at vyatta.com>
    Signed-off-by: Maciej W. Rozycki <macro at linux-mips.org>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 40ba182e3ca9f019f299ce5052fcd7e4cf68d11b
Author: Tobias Diedrich <ranma+kernel at tdiedrich.de>
Date:   Sun May 18 15:00:36 2008 +0200

    [netdrvr] forcedeth: Restore multicast settings on resume
    
    nv_open() resets multicast settings, call nv_set_multicast(dev)
    to restore them.  (Maybe this should rather be moved into nv_open())
    
    Signed-off-by: Tobias Diedrich <ranma+kernel at tdiedrich.de>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit aff26e2faa782e196f28b86d04b093fd3bae1ffb
Author: Krzysztof Halasa <khc at pm.waw.pl>
Date:   Mon May 19 19:11:08 2008 +0200

    WAN: protect Cisco HDLC state changes with a spinlock.
    
    Signed-off-by: Krzysztof Hałasa <khc at pm.waw.pl>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 0178ec3d3e4e48c63b350e712835a4a5c15c6c86
Author: Adrian Bunk <bunk at kernel.org>
Date:   Tue May 20 00:53:00 2008 +0300

    make myri10ge_get_firmware_capabilities() static
    
    This patch makes the needlessly global
    myri10ge_get_firmware_capabilities() static.
    
    Signed-off-by: Adrian Bunk <bunk at kernel.org>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 7ad62dbcb5766dae38516e0333a6f68a1b6df884
Author: Ilpo Järvinen <ilpo.jarvinen at helsinki.fi>
Date:   Tue May 13 14:16:54 2008 +0300

    s2io: add missing block braces to multistatement if statement
    
    Signed-off-by: Ilpo Järvinen <ilpo.jarvinen at helsinki.fi>
    Cc: Ramkrishna Vepa <ram.vepa at neterion.com>
    Cc: Rastapur Santosh <santosh.rastapur at neterion.com>
    Cc: Sivakumar Subramani <sivakumar.subramani at neterion.com>
    Cc: Sreenivasa Honnur <sreenivasa.honnur at neterion.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 6941727a08d49c88a58bc3afb55044df7932549e
Author: Ilpo Järvinen <ilpo.jarvinen at helsinki.fi>
Date:   Tue May 13 14:16:53 2008 +0300

    hamradio/scc: add missing block braces to multi-statement if
    
    Signed-off-by: Ilpo Järvinen <ilpo.jarvinen at helsinki.fi>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 7fb1c2ac8ecaf0883f2fcb38dfc9ec2d15cee11d
Author: Brian King <brking at linux.vnet.ibm.com>
Date:   Wed May 14 09:48:25 2008 -0500

    ehea: Fix use after free on reboot
    
    Fixes the following use after free oops:
    
    ehea: Reboot: freeing all eHEA resources
    Unable to handle kernel paging request for data at address 0x6b6b6b6b6b6b6c5b
    Faulting instruction address: 0xd000000000354488
    cpu 0x0: Vector: 300 (Data Access) at [c00000002ec6f310]
        pc: d000000000354488: .ehea_shutdown_single_port+0x50/0x78 [ehea]
        lr: d00000000035447c: .ehea_shutdown_single_port+0x44/0x78 [ehea]
        sp: c00000002ec6f590
       msr: 8000000000009032
       dar: 6b6b6b6b6b6b6c5b
     dsisr: 40000000
      current = 0xc0000000281412e0
      paca    = 0xc0000000006df300
        pid   = 10930, comm = reboot
    enter ? for help
    [c00000002ec6f590] d00000000035d64c .ehea_remove+0x44/0x124 [ehea] (unreliable)
    [c00000002ec6f630] c000000000319f88 .of_platform_device_remove+0x40/0x58
    [c00000002ec6f6a0] c000000000291018 .__device_release_driver+0xb0/0xf0
    [c00000002ec6f730] c000000000291120 .driver_detach+0xc8/0xfc
    [c00000002ec6f7c0] c00000000028fe24 .bus_remove_driver+0xb4/0x114
    [c00000002ec6f850] c000000000291768 .driver_unregister+0x54/0x74
    [c00000002ec6f8e0] c00000000031a0c8 .of_unregister_driver+0x14/0x28
    [c00000002ec6f950] c000000000023ba0 .ibmebus_unregister_driver+0x10/0x24
    [c00000002ec6f9c0] d000000000354180 .ehea_reboot_notifier+0x30/0x4c [ehea]
    [c00000002ec6fa40] c0000000003c95a8 .notifier_call_chain+0x5c/0xcc
    [c00000002ec6fae0] c000000000082cd4 .__blocking_notifier_call_chain+0x70/0xb0
    [c00000002ec6fb90] c000000000075cf8 .kernel_restart_prepare+0x24/0x58
    [c00000002ec6fc10] c000000000075f0c .kernel_restart+0x20/0x6c
    [c00000002ec6fc90] c000000000078674 .sys_reboot+0x1d4/0x290
    [c00000002ec6fe30] c0000000000086ac syscall_exit+0x0/0x40
    
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 74ef5c5025fed5ad6a1cbdfb5c2e831acdbbd2fe
Author: Pierre Ynard <linkfanel at yahoo.fr>
Date:   Wed May 14 16:20:16 2008 -0700

    rndis_host: increase delay in command response loop
    
    Some devices running some WinCE firmware (with SC_* Samsung processors
    according to the SynCE project, verified on a HTC P3600 device) fail to
    register because they apparently need extra time to respond correctly to
    requests.  Increase the existing delay to satisfy them.  Based on code
    from the SynCE project, on a suggestion of David Brownell.
    
    This patch Works For Me(tm).
    
    Signed-off-by: Pierre Ynard <linkfanel at yahoo.fr>
    Acked-by: David Brownell <david-b at pacbell.net>
    Cc: Greg KH <greg at kroah.com>
    Cc: Jeff Garzik <jeff at garzik.org>
    Cc: "David S. Miller" <davem at davemloft.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 63dac8ff1b3709b5f7ba71283eb48b4e1f18d563
Author: Andrew Morton <akpm at linux-foundation.org>
Date:   Wed May 14 16:20:15 2008 -0700

    drivers/net/tokenring/olympic.c: fix warning
    
    When dev_name() is changed to return `const char *':
    
    drivers/net/tokenring/olympic.c: In function 'olympic_probe':
    drivers/net/tokenring/olympic.c:234: warning: assignment discards qualifiers from pointer target type
    
    Cc: Jeff Garzik <jeff at garzik.org>
    Cc: Greg KH <greg at kroah.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 5d9bac8ece5e2a64a2a450c7e2d6901ed9152052
Author: Andrew Morton <akpm at linux-foundation.org>
Date:   Wed May 14 16:20:15 2008 -0700

    drivers/net/tokenring/3c359.c: squish a warning
    
    When dev_name() is changed to return `const char *':
    
    drivers/net/tokenring/3c359.c: In function 'xl_probe':
    drivers/net/tokenring/3c359.c:318: warning: assignment discards qualifiers from pointer target type
    
    Cc: Jeff Garzik <jeff at garzik.org>
    Cc: Greg KH <greg at kroah.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit b166cfba01d62d04ae81ecce2d5dbe308db8083a
Author: Andrew Morton <akpm at linux-foundation.org>
Date:   Wed May 14 16:20:14 2008 -0700

    pcnet32: fix warning
    
    pci_name() will be changed to return `const char *':
    
    drivers/net/pcnet32.c: In function 'pcnet32_probe1':
    drivers/net/pcnet32.c:1884: warning: passing argument 2 of 'pcnet32_alloc_ring' discards qualifiers from pointer target type
    
    Cc: Jeff Garzik <jeff at garzik.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 5bceeda3253d9ea6a38e2e918362a2610677f9c0
Author: Andrew Morton <akpm at linux-foundation.org>
Date:   Wed May 14 16:20:12 2008 -0700

    [netdrvr] dm9000: use delayed work to update mii phy state fix
    
    use cancel_delayed_work_sync()
    
    Cc: Ben Dooks <ben-linux at fluff.org>
    Cc: Enrico Scholz <enrico.scholz at sigma-chemnitz.de>
    Cc: Jeff Garzik <jeff at garzik.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit d494eacde8858f9b53f5c640692caf14eb3c8239
Author: Stephen Hemminger <shemminger at vyatta.com>
Date:   Wed May 14 17:04:13 2008 -0700

    sky2: restore vlan acceleration on reset
    
    If device has to be reset by sky2_restart, then need to restore
    the VLAN acceleration settings.
    
    Signed-off-by: Stephen Hemminger <shemminger at vyatta.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 8757a5f71530c2dc8db7823ad68a5d4c2fbdad19
Author: Ben Hutchings <bhutchings at solarflare.com>
Date:   Fri May 16 21:21:06 2008 +0100

    sfc: Remove sub-minor component from driver version
    
    This driver has diverged from the out-of-tree driver to which the version
    number originally applied.  It should be identified primarily by kernel
    version.
    
    Signed-off-by: Ben Hutchings <bhutchings at solarflare.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 9b7bfc4c4c601a5cb368751f60cac054492c45f5
Author: Ben Hutchings <bhutchings at solarflare.com>
Date:   Fri May 16 21:20:20 2008 +0100

    sfc: Added checks for heap allocation failure
    
    Signed-off-by: Ben Hutchings <bhutchings at solarflare.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit d3208b5ebae9e62c32f0cf74dce1d4ddfac3f895
Author: Ben Hutchings <bhutchings at solarflare.com>
Date:   Fri May 16 21:20:00 2008 +0100

    sfc: Remove redundant casts to and from void *
    
    Signed-off-by: Ben Hutchings <bhutchings at solarflare.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 5daab96d873721cb84f4583f232b88fcd67c51fb
Author: Ben Hutchings <bhutchings at solarflare.com>
Date:   Fri May 16 21:19:43 2008 +0100

    sfc: Change type of efx_nic::nic_data to struct falcon_nic_data *
    
    Remove redundant casts and variable.
    
    Signed-off-by: Ben Hutchings <bhutchings at solarflare.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 24c28edc5a1b1dc4677eb13408ff3492d65df159
Author: Ben Hutchings <bhutchings at solarflare.com>
Date:   Fri May 16 21:19:21 2008 +0100

    sfc: Use __packed macro
    
    Signed-off-by: Ben Hutchings <bhutchings at solarflare.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 6f8135ca7224d98c2de43edde69f4e6bec12da0e
Author: Ben Hutchings <bhutchings at solarflare.com>
Date:   Fri May 16 21:19:05 2008 +0100

    sfc: Do not define inline macro
    
    Signed-off-by: Ben Hutchings <bhutchings at solarflare.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 9bbd7d9a3528de1b5b915fa77df027b4de62174c
Author: Ben Hutchings <bhutchings at solarflare.com>
Date:   Fri May 16 21:18:48 2008 +0100

    sfc: Use DMA_BIT_MASK() instead of our own DMA mask macros
    
    Also change type of efx_nic_type::max_dma_mask to u64, matching
    pci_dma_supported() parameter type.
    
    Signed-off-by: Ben Hutchings <bhutchings at solarflare.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 5b9e207ced5bb7af98b3c147171893435f5104ca
Author: Ben Hutchings <bhutchings at solarflare.com>
Date:   Fri May 16 21:18:14 2008 +0100

    sfc: Correct and expand some comments
    
    These comments have been revised in response to questions raised by Andrew
    Morton in <20080501120858.207b6dd6.akpm at linux-foundation.org>.
    
    Signed-off-by: Ben Hutchings <bhutchings at solarflare.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 086ea3564a5378a06c7cbfaf9d2727bc58a8c285
Author: Ben Hutchings <bhutchings at solarflare.com>
Date:   Fri May 16 21:17:06 2008 +0100

    sfc: Use resource_size_t for PCI bus address
    
    This should make the driver work on 32-bit systems with 64-bit PCI support.
    
    Signed-off-by: Ben Hutchings <bhutchings at solarflare.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 184be0c21aba048cf510036edeee095e68740951
Author: Ben Hutchings <bhutchings at solarflare.com>
Date:   Fri May 16 21:16:31 2008 +0100

    sfc: Merged efx_page_offset() into efx_rx_buf_offset()
    
    Signed-off-by: Ben Hutchings <bhutchings at solarflare.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 55668611d0b2a5947cd17f66243be3cebf21400c
Author: Ben Hutchings <bhutchings at solarflare.com>
Date:   Fri May 16 21:16:10 2008 +0100

    sfc: Replaced various macros with inline functions
    
    Signed-off-by: Ben Hutchings <bhutchings at solarflare.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit b3475645ed8b823c063f7560b243026150d7c3f8
Author: Ben Hutchings <bhutchings at solarflare.com>
Date:   Fri May 16 21:15:49 2008 +0100

    sfc: Added and removed braces to comply with kernel style
    
    Signed-off-by: Ben Hutchings <bhutchings at solarflare.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 2c118e0f6b7f3b8021df3c80c80c0545402f38b4
Author: Ben Hutchings <bhutchings at solarflare.com>
Date:   Fri May 16 21:15:29 2008 +0100

    sfc: Removed unncesssary UL suffixes on 0 literals
    
    Signed-off-by: Ben Hutchings <bhutchings at solarflare.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit f7f13b0b9253e21557ad090144a44f20860332f1
Author: Ben Hutchings <bhutchings at solarflare.com>
Date:   Fri May 16 21:15:06 2008 +0100

    sfc: Simplified efx_rx_calc_buffer_size() using get_order()
    
    Merged it into its only caller, efx_init_channels().
    
    Signed-off-by: Ben Hutchings <bhutchings at solarflare.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 91ad757c2fc35ec79dd2c909dc6dc721b9c257f3
Author: Ben Hutchings <bhutchings at solarflare.com>
Date:   Fri May 16 21:14:27 2008 +0100

    sfc: Removed casts to void
    
    Signed-off-by: Ben Hutchings <bhutchings at solarflare.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 4cc58bdebfcb7561de401999705a5cde16674842
Author: Ben Hutchings <bhutchings at solarflare.com>
Date:   Fri May 16 21:13:57 2008 +0100

    sfc: Use mod_timer() to set expiry and add_timer() together
    
    Signed-off-by: Ben Hutchings <bhutchings at solarflare.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit a0abb93bf9dc590b031a1123f3e6c6c225c1cdd1
Merge: 9956c1120826bce3b42093099a0149b7f62d0b8a 071f92d05967a0c8422f1c8587ce0b4d90a8b447
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed May 21 22:14:39 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      net: The world is not perfect patch.
      tcp: Make prior_ssthresh a u32
      xfrm_user: Remove zero length key checks.
      net/ipv4/arp.c: Use common hex_asc helpers
      cassini: Only use chip checksum for ipv4 packets.
      tcp: TCP connection times out if ICMP frag needed is delayed
      netfilter: Move linux/types.h inclusions outside of #ifdef __KERNEL__
      af_key: Fix selector family initialization.
      libertas: Fix ethtool statistics
      mac80211: fix NULL pointer dereference in ieee80211_compatible_rates
      mac80211: don't claim iwspy support
      orinoco_cs: add ID for SpeedStream wireless adapters
      hostap_cs: add ID for Conceptronic CON11CPro
      rtl8187: resource leak in error case
      ath5k: Fix loop variable initializations

commit 9956c1120826bce3b42093099a0149b7f62d0b8a
Merge: 78b58e549a3098a8c1408d0214bd25e5d5e7a3a3 ada44a0430fdd00b3f38aad0aa518e97cb760bd0
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed May 21 22:00:12 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc64: Prevent stack backtrace false positives on trap frames.
      sparc64: Fix stack tracing through trap frames.
      sparc64: Fix kernel thread stack termination.
      sunhv: Fix locking in non-paged I/O case.

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

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

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

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

commit ddc9753fcddfe5f9885dc133824962c047252b43
Author: Shaohua Li <shaohua.li at 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 at intel.com>
    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

commit da8395be0bb04f685d55f124d046766d9209214a
Author: Dave Jones <davej at redhat.com>
Date:   Tue May 20 22:13:09 2008 -0400

    [CPUFREQ] Remove documentation of removed ondemand tunable.
    
    sampling_down_factor was removed in ccb2fe209dac9ff67f6351e783e610073afaaeaf
    back in June 2006.
    
    Signed-off-by: Dave Jones <davej at redhat.com>

commit e616c6303306df62223ebe2e68bb2f19c420dd81
Merge: 789319db76ccb8f61d2f6a91d2f2fcb70edae9c5 d3ede327e83f202c3a0962e207318f65717c5eb7
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue May 20 17:23:03 2008 -0700

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

commit 789319db76ccb8f61d2f6a91d2f2fcb70edae9c5
Merge: fd9908c078b30db393e9855fb96f804793af23ba 93dae5b70e7c1c8e927d22e1c20a941ca376906a
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue May 20 17:21:32 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc64: Add global register dumping facility.
      sparc: remove CVS keywords
      sparc64: remove CVS keywords

commit fd9908c078b30db393e9855fb96f804793af23ba
Merge: 57312b75aa06b09c28acd9c5a9c70827da3696d2 afba937e540c902c989cd516fd97ea0c8499bb27
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue May 20 17:20:49 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
      USB: CDC WDM driver
      USB: ehci-orion: the Orion EHCI root hub does have a Transaction Translator
      USB: serial: ch341: New VID/PID for CH341 USB-serial
      USB: build fix
      USB: pxa27x_udc - Fix Oops
      USB: OPTION: fix name of Onda MSA501HS HSDPA modem
      USB: add TELIT HDSPA UC864-E modem to option driver
      usb-serial: Use ftdi_sio driver for RATOC REX-USB60F

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

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

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

    Merge branch 'from-tomtucker' into for-2.6.26

commit e1d50dce5af77cb6d33555af70e2b8748dd84009
Author: Jack Morgenstein <jackm at dev.mellanox.co.il>
Date:   Tue May 20 15:41:09 2008 -0700

    IPoIB: Test for NULL broadcast object in ipiob_mcast_join_finish()
    
    We saw a kernel oops in our regression testing when a multicast "join
    finish" occurred just after the interface was -- this is
    <https://bugs.openfabrics.org/show_bug.cgi?id=1040>.  The test
    randomly causes the HCA physical port to go down then up.
    
    The cause of this is that ipoib_mcast_join_finish() processing happen
    just after ipoib_mcast_dev_flush() was invoked (in which case the
    broadcast pointer is NULL).  This patch tests for and handles the case
    where priv->broadcast is NULL.
    
    Cc: <stable at kernel.org>
    Signed-off-by: Jack Morgenstein <jackm at dev.mellanox.co.il>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

commit e5ec3789c16e12a1936a3be7bdda51897a4148b8
Author: Steve Wise <swise at opengridcomputing.com>
Date:   Tue May 20 14:06:33 2008 -0700

    MAINTAINERS: Add cxgb3 and iw_cxgb3 NIC and iWARP driver entries
    
    Signed-off-by: Steve Wise <swise at opengridcomputing.com>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit cd155c1c7c9e64df6afb5504d292fef7cb783a4f
Author: Roland Dreier <rolandd at cisco.com>
Date:   Tue May 20 14:00:02 2008 -0700

    IB/mlx4: Fix creation of kernel QP with max number of send s/g entries
    
    When creating a kernel QP where the consumer asked for a send queue
    with lots of scatter/gater entries, set_kernel_sq_size() incorrectly
    returned an error if the send queue stride is larger than the
    hardware's maximum send work request descriptor size.  This is not a
    problem; the only issue is to make sure that the actual descriptors
    used do not overflow the maximum descriptor size, so check this instead.
    
    Clamp the returned max_send_sge value to be no bigger than what
    query_device returns for the max_sge to avoid confusing hapless users,
    even if the hardware is capable of handling a few more s/g entries.
    
    This bug caused NFS/RDMA mounts to fail when the server adapter used
    the mlx4 driver.
    
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

commit 737b0fbf448306975267509e6c6a074885ddb43c
Merge: c110a2bd82676a8f124cf4dfc39339fd366f0e59 c1f69db782595a9869395dad4b60d331906c22ef
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue May 20 10:55:04 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
      PCI: correct mailing list address
      PCI: Correct last two HP entries in the bfsort whitelist

commit 65e660aa3f76b120c2fe69bf07e1b416dae404a7
Author: Bruno Prémont <bonbons at 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 at linux-vserver.org>
    Signed-off-by: Dmitry Torokhov <dtor at mail.ru>

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

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

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

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

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

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

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

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

commit babd90b274e6b43a7dc7bb08562bf566cbabdbf8
Merge: 424de91dd6163808729d7082de55c319e1096bee 186c3117f8aac0b2ac5290aaed254fcfdcc937de
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue May 20 08:49:08 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      [ALSA] hda - Fix ASUS P5GD1 model
      [ALSA] hda - Fix ALC262 fujitsu model
      snd-pcsp: use HRTIMER_CB_SOFTIRQ

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

commit ca56d9aaf2a135e0eb528df427f7dda15d077b11
Author: Bryan Wu <cooloney at 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 at kernel.org>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

commit 667ad4f70110357e8f024e81741c7bd1d7906e7d
Author: maximilian attems <max at stro.at>
Date:   Thu May 8 22:10:01 2008 +0200

    [CPUFREQ] Crusoe: longrun cpufreq module reports false min freq
    
    The longrun cpufreq module reports a false minimum frequency 3MHz on
    300-600MHz Crusoe processor.  This may be due to a calculation bug
    in the module.
    
    Original patch from Kaz Sasayama <kazssym at hypercore.co.jp>
    submitted as http://bugs.debian.org/468149 patch ported to x86
    
    Cc: Kaz Sasayama <kazssym at hypercore.co.jp>
    Signed-off-by: maximilian attems <max at stro.at>
    Signed-off-by: Dave Jones <davej at redhat.com>

commit eba9fe93a2959ec7f195c47c9db6ce7b5114ce1f
Author: Mark Langsdorf <mark.langsdorf at amd.com>
Date:   Tue Mar 18 15:24:32 2008 -0500

    [CPUFREQ] powernow-k8: improve error messages
    
    The most common error with powernow-k8 is an ACPI _PSS error
    caused either by failure to load the ACPI processor module
    or a bad parse of the _PSS object.  Make the error message
    returned to the user in these situations more straightforward
    and easier to understand.
    
    -Mark Langsdorf
    Operating System Research Center
    AMD
    
    Signed-off-by: Mark Langsdorf <mark.langsdorf at amd.com>
    Signed-off-by: Andreas Herrmann <andreas.herrmann3 at amd.com>
    Signed-off-by: Dave Jones <davej at redhat.com>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

commit 239f49c0800778c863585a103805c58afbad6748
Author: MinChan Kim <minchan.kim at gmail.com>
Date:   Mon May 19 22:12:08 2008 +0900

    slob: Fix to return wrong pointer
    
    Although slob_alloc return NULL, __kmalloc_node returns NULL + align.
    Because align always can be changed, it is very hard for debugging
    problem of no page if it don't return NULL.
    
    We have to return NULL in case of no page.
    
    [penberg at cs.helsinki.fi: fix formatting as suggested by Matt.]
    Acked-by: Matt Mackall <mpm at selenic.com>
    Signed-off-by: MinChan Kim <minchan.kim at gmail.com>
    Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi>

commit 83e0c24a38aa91f7d932bbcab257093b82435074
Merge: 161fb0cf5c7e94cd0490e4bd04edcf1e24d1d288 42ece6c1f8162cd782b44dc4863679e888531df5
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Mon May 19 09:24:49 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      snd-pcsp: silent misleading warning
      snd-pcsp: depend on CONFIG_EXPERIMENTAL
      snd-pcsp: put back the compatibility code for the older alsa-libs
      snd-pcsp: adjust help texts to frighten users

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

commit b8291ad07a7f3b5b990900f0001198ac23ba893e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sun May 18 14:36:41 2008 -0700

    Linux 2.6.26-rc3

commit 3e5b787ac38575c88ceb20619bcda09cb4c17d8b
Merge: 026bf9bbcf88f31ea619eb46cf9d62beade00821 70455e790391dac85d9b483a9e286a40df1ecc7f
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sun May 18 13:56:54 2008 -0700

    Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
    
    * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
      i2c/max6875: Really prevent 24RF08 corruption
      i2c-amd756: Fix functionality flags
      i2c: Kill the old driver matching scheme
      i2c: Convert remaining new-style drivers to use module aliasing
      i2c: Switch pasemi to the new device/driver matching scheme
      i2c: Clean up Blackfin BF527 I2C device declarations
      i2c-nforce2: Disable the second SMBus channel on the DFI Lanparty NF4 Expert
      i2c: New co-maintainer

commit 026bf9bbcf88f31ea619eb46cf9d62beade00821
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date:   Sun May 18 20:47:24 2008 +0200

    m68k: Add multi_defconfig
    
    Add multi_defconfig, to build a kernel for all supported m68k platforms,
    excluding Sun 3 (Sun 3 kernels are incompatible with all other m68k platforms)
    
    Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit b4029b310795c2142afa6037668e7d4f5d8224bc
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date:   Sun May 18 20:47:23 2008 +0200

    m68k: Update defconfigs
    
    Update the m68k defconfigs
    
    Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit d5ec550a044c0136c3fece4007f05d08ee4a4fd8
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date:   Sun May 18 20:47:22 2008 +0200

    m68k: Correctly handle multi-ISA at runtime
    
    m68k: Correctly handle multi-ISA at runtime in multi-platform kernels
    
    Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 52de114e357b8035d54040be8b9148de437b5b4b
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date:   Sun May 18 20:47:21 2008 +0200

    m68k: Prefix ISA type with ISA_TYPE_
    
    The *_ISA type defines are quite generic and cause namespace conflicts
    (e.g. with `AMIGAHW_DECLARE(GG2_ISA)' in <asm/amigahw.h>) for some kernel
    configurations. Use ISA_TYPE_* to avoid such conflicts.
    
    Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 91cf248396d18989f5f4090497723f4f90c8971f
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date:   Sun May 18 20:47:20 2008 +0200

    m68k: export m68k_mmutype
    
    UIO needs m68k_mmutype:
    
    ERROR: "m68k_mmutype" [drivers/uio/uio.ko] undefined!
    
    (noticed by Christian T. Steigies)
    
    Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 3f20a4ef57f4cbe8e2bbdb12640548795b32c6f7
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date:   Sun May 18 20:47:19 2008 +0200

    m68k: Q40/Q60 floppy support is broken
    
    Mark Q40/Q60 floppy support broken:
    
        arch/m68k/q40/q40ints.c: In function 'q40_irq_handler':
        arch/m68k/q40/q40ints.c:214: error: implicit declaration of function 'floppy_hardint'
    
    Including <asm/floppy.h> doesn't help, as it causes a lot of additional error
    messages (cfr. Sun 3x).
    
    Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit fd5b462f0b3ae641e39966d1c6cd0dd66100cda5
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date:   Sun May 18 20:47:18 2008 +0200

    m68k: Return -ENODEV if no device is found
    
    According to the tests in do_initcalls(), the proper error code in case no
    device is found is -ENODEV, not -ENXIO or -EIO.
    
    Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit eb98630ba02f6a23a2d202be082757a9e9940b2b
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date:   Sun May 18 20:47:17 2008 +0200

    m68k: Some input drivers do not check the platform
    
    Some input drivers do not check whether they're actually running on the
    correct platform, causing multi-platform kernels to crash if they are not.
    
    Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 0f734484ac51711f6b9e48b42242e19e88eb2926
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date:   Sun May 18 20:47:16 2008 +0200

    m68k: Some network drivers do not check the platform
    
    Some network drivers do not check whether they're actually running on the
    correct platform, causing multi-platform kernels to crash if they are not.
    
    Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit d6497700879beeaaae208c0e9fd10b74dc44db5e
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date:   Sun May 18 20:47:15 2008 +0200

    m68k: dnfb doesnt check for Apollo
    
    The Apollo frame buffer device driver (dnfb) doesn't check whether it's
    actually running on Apollo hardware, causing a crash if it isn't.
    
    Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 3ce92a2a7b03dae6b7778e2a5ff52f2042512887
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date:   Sun May 18 20:47:14 2008 +0200

    m68k: macide doesnt check for Mac
    
    The Macintosh IDE driver (macide) doesn't check whether it's actually running
    on Mac hardware, causing a crash if it isn't.
    
    Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 3f365e8ee90bf835553ea964ba5accf5b8ba4070
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date:   Sun May 18 20:47:13 2008 +0200

    m68k: Correct jump if not running on HP300
    
    When running a HP300-enabled kernel on non-HP300 hardware, a test in the early
    startup code jumps to the wrong label, causing a double bus fault.
    
    Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit e8006b060f3982a969c5170aa869628d54dd30d8
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date:   Sun May 18 20:47:12 2008 +0200

    m68k: Make gcc aware that BUG() does not return
    
    Use `__builtin_trap()' instead of `asm volatile("illegal")' in the m68k BUG()
    macros (as suggested by Andrew Pinski), to kill warnings in code that assumes
    BUG() does not return.
    
    Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit eb4db450aa19dfc806fbd9747879c420e154dc33
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date:   Sun May 18 20:47:11 2008 +0200

    m68k vme_scc: avoid global namespace pollution
    
    m68k vme_scc:
      - make scc_ports[] static
      - kill unused global scc_initialized
    
    Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 47738a75cdf3fb6793a834ec5c4dc2c6a88e510a
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date:   Sun May 18 20:47:10 2008 +0200

    m68k: Kill CONFIG_WHIPPET_SERIAL
    
    The Hisoft Whippet PCMCIA serial driver has been removed a long time ago, but
    it's Kconfig symbol still existed.
    
    Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit ad7e484fad0d6b35c4788d265e4e7e1122b960f7
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date:   Sun May 18 20:47:09 2008 +0200

    m68k: FB_HP300 depends on DIO and doesnt need FB_CFB_FILLRECT
    
    Correct FB_HP300 dependencies:
      - FB_HP300 doesn't depend only on HP300, but also on DIO (which depends on
        HP300)
      - FB_HP300 does not need FB_CFB_FILLRECT
    
    Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 8d13e5ca4851845cb3e688eaea3a766f16caf9db
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date:   Sun May 18 20:47:08 2008 +0200

    m68k: Kill CONFIG_FB_DAFB
    
    CONFIG_FB_DAFB is a leftover from pre-Kconfig
    
    Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 70f9cac5e077df8fc5a613d84e2e13005a6ff841
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date:   Sun May 18 20:47:07 2008 +0200

    m68k: Convert access_ok() to an inline function
    
    Convert access_ok() from a macro to an inline function, so the compiler no
    longer complains about unused variables:
    
        fs/read_write.c: In function 'rw_copy_check_uvector':
        fs/read_write.c:556: warning: unused variable 'buf'
    
    Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 70455e790391dac85d9b483a9e286a40df1ecc7f
Author: Jean Delvare <khali at linux-fr.org>
Date:   Sun May 18 20:49:41 2008 +0200

    i2c/max6875: Really prevent 24RF08 corruption
    
    i2c-core takes care of the possible corruption of 24RF08 chips for
    quite some times, so device devices no longer need to do it. And they
    really should not, as applying the prevention twice voids it.
    
    I thought that I had fixed all drivers long ago but apparently I had
    missed that one.
    
    Signed-off-by: Jean Delvare <khali at linux-fr.org>
    Cc: Ben Gardner <bgardner at wabtec.com>

commit 875b0a473c3ddd80bc4ae88a65cd20027428e160
Author: Jean Delvare <khali at linux-fr.org>
Date:   Sun May 18 20:49:41 2008 +0200

    i2c-amd756: Fix functionality flags
    
    The i2c-amd756 driver pretends to support SMBus process call
    transactions but actually does not. Fix it.
    
    Signed-off-by: Jean Delvare <khali at linux-fr.org>

commit eb8a79080984eb9819406a55e4dd17043c380a09
Author: Jean Delvare <khali at linux-fr.org>
Date:   Sun May 18 20:49:41 2008 +0200

    i2c: Kill the old driver matching scheme
    
    Remove the old driver_name/type scheme for i2c driver matching. Only the
    standard aliasing model will be used from now on.
    
    Signed-off-by: Jean Delvare <khali at linux-fr.org>

commit af294867a52bf718df835a688e8c786d550bee26
Author: Jean Delvare <khali at linux-fr.org>
Date:   Sun May 18 20:49:40 2008 +0200

    i2c: Convert remaining new-style drivers to use module aliasing
    
    Update all the remaining new-style i2c drivers to use standard module
    aliasing instead of the old driver_name/type driver matching scheme.
    
    Note that the tuner driver is a bit quirky at the moment, as it
    overwrites i2c_client.name with arbitrary strings. We write "tuner"
    back on remove, to make sure that driver cycling will work properly,
    but there may still be troublesome corner cases.
    
    Signed-off-by: Jean Delvare <khali at linux-fr.org>

commit 238a871e41ffbd9ba6608cac7c8b74549ac3bb9b
Author: Jean Delvare <khali at linux-fr.org>
Date:   Sun May 18 20:49:40 2008 +0200

    i2c: Switch pasemi to the new device/driver matching scheme
    
    The old device/driver matching scheme is going away so stop using it.
    
    Signed-off-by: Jean Delvare <khali at linux-fr.org>
    Acked-by: Olof Johansson <olof at lixom.net>

commit 24fbacca029ef1ecf007dc804c8f2c2285b6ceb3
Author: Jean Delvare <khali at linux-fr.org>
Date:   Sun May 18 20:49:40 2008 +0200

    i2c: Clean up Blackfin BF527 I2C device declarations
    
    I2C_BOARD_INFO() now sets the type field so no need to set it
    separatetly.
    
    Signed-off-by: Jean Delvare <khali at linux-fr.org>
    Cc: Bryan Wu <cooloney at kernel.org>

commit 08851d6eb4eeb0894f4d095dfdf8ab61c435ad57
Author: Jean Delvare <khali at linux-fr.org>
Date:   Sun May 18 20:49:40 2008 +0200

    i2c-nforce2: Disable the second SMBus channel on the DFI Lanparty NF4 Expert
    
    There is a strange chip at 0x2e on the second SMBus channel of the
    DFI Lanparty NF4 Expert motherboard. Accessing the chip reboots the
    system. As there's nothing interesting on this SMBus channel, the
    easiest and safest thing to do is to disable it on that board.
    
    This is a better fix to bug #5889 than the it87 driver update that was
    done originally:
    http://bugzilla.kernel.org/show_bug.cgi?id=5889
    
    Signed-off-by: Jean Delvare <khali at linux-fr.org>

commit 710cf7e75076e8d95ce677876b0655d37d14c1b8
Author: Jean Delvare <khali at linux-fr.org>
Date:   Sun May 18 20:49:40 2008 +0200

    i2c: New co-maintainer
    
    Ben Dooks agreed to become my co-maintainer for the i2c subsystem. In
    particular, Ben will help with drivers for embedded systems, of which
    my experience is inexistent. Thanks Ben and welcome on board!
    
    Signed-off-by: Jean Delvare <khali at linux-fr.org>
    Acked-by: Ben Dooks <ben-linux at fluff.org>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

commit 29e92f483603d97dd1d2bafcb32101287dfac4ad
Merge: 08c18964a247b412acab56599a643e6f73e1ec5a dfb0ae091479240c19bef4382026671776ca204e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sat May 17 15:17:10 2008 -0700

    Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
    
    * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
      [ARM] pxa: spitz wants PXA27x UDC definitions
      [ARM] pxa: fix pxafb build when cpufreq is enabled
      [ARM] fix parenthesis in include/asm-arm/arch-omap/control.h
      [ARM] colibri: fix support for DM9000 ethernet device
      [ARM] arm/kernel/arthur.c: add MODULE_LICENSE
      [ARM] 5037/1: Orion: fix DNS323/Kurobox Pro PCI initialisation
      [ARM] 5034/1: fix arm{925,926,940,946} dma_flush_range() in WT mode
      [ARM] export copy_page
      [ARM] 5026/1: locomo: add .settype for gpio and several small fixes
      ARM: OMAP: Fixed comments on global PRM register usage
      ARM: OMAP: Add PARENT_CONTROLS_CLOCK flag to dpll5_m2_ck
      ARM: OMAP: PRCM fixes to ssi clock handling
      ARM: OMAP: Add fuctional clock enabler for iva2
      ARM: OMAP: Fix 34xx to use correct shift values for gpio2-6 fclks
      ARM: OMAP: Keymap fix for palmte and palmz71
      ARM: OMAP: Fix Unbalanced enable for IRQ in omap mailbox
      ARM: OMAP: DMA: Fix incorrect channel linking
      ARM: OMAP: Warn on disabling clocks with no users
      ARM: OMAP: Add calls to omap2_set_globals_*()
      ARM: OMAP: Update MMC header to fix compile

commit dfb0ae091479240c19bef4382026671776ca204e
Merge: 1da7807842f7ccd9a3962dc276e489b76cd320c7 dfa3d039dae89e8e9a7302ebf25370caaf1b62e3
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date:   Sat May 17 22:56:08 2008 +0100

    Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

commit 1da7807842f7ccd9a3962dc276e489b76cd320c7
Merge: 53491e042e79578765e2d33512a45d50eb0d8801 2a52efb2cecf78201d61bd4930153bf52e57503b
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date:   Sat May 17 22:55:51 2008 +0100

    Merge branch 'sa1100'

commit 53491e042e79578765e2d33512a45d50eb0d8801
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date:   Sat May 17 22:51:35 2008 +0100

    [ARM] pxa: spitz wants PXA27x UDC definitions
    
    ... so include the header file.
    
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit 78d3cfd33e7acdae0108837de1c55a8cef04805f
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date:   Sat May 17 22:51:14 2008 +0100

    [ARM] pxa: fix pxafb build when cpufreq is enabled
    
    If cpufreq is enabled, pxafb wants to call the removed
    get_clk_frequency_khz() function for a debug printk.  Remove
    this reference.
    
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit 1df5a8d004f64b1aa3fb93e0556886ba00ebc979
Author: Mariusz Kozlowski <m.kozlowski at tuxland.pl>
Date:   Thu May 15 11:52:24 2008 -0700

    [ARM] fix parenthesis in include/asm-arm/arch-omap/control.h
    
    Parenthesis fix in include/asm-arm/arch-omap/control.h
    
    Signed-off-by: Mariusz Kozlowski <m.kozlowski at tuxland.pl>
    Cc: Paul Walmsley <paul at pwsan.com>
    Cc: Tony Lindgren <tony at atomide.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit d0afc85f15deda94abdfe9118ac225c4208d5897
Author: Michael Abbott <michael.abbott at diamond.ac.uk>
Date:   Wed May 14 16:29:24 2008 -0700

    [ARM] colibri: fix support for DM9000 ethernet device
    
    Two changes are necessary to enable proper operation of the DM9000 device with
    the Colibri PXA 270 board: firstly, the IRQ type needs to be configured for
    rising edge interrupts, and secondly this configuration needs to be
    communicated through to the DM9000.
    
    [akpm at linux-foundation.org: remove set_irq_type() call as per ben-linux request]
    Signed-off-by: Michael Abbott <michael.abbott at diamond.ac.uk>
    Cc: Daniel Mack <daniel at caiaq.org>
    Cc: Jeff Garzik <jeff at garzik.org>
    Cc: Ben Dooks <ben-linux at fluff.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit 7cc09c248f4e286a153b5068a30b3fa857f5ce71
Author: Adrian Bunk <bunk at kernel.org>
Date:   Mon Mar 31 12:08:16 2008 +0300

    [ARM] arm/kernel/arthur.c: add MODULE_LICENSE
    
    This patch adds the missing MODULE_LICENSE("GPL").
    
    Signed-off-by: Adrian Bunk <bunk at kernel.org>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit bbdf1c1e58f215940243bedc235e48ed7e8d6f2d
Author: Lennert Buytenhek <buytenh at wantstofly.org>
Date:   Thu May 15 10:31:14 2008 +0100

    [ARM] 5037/1: Orion: fix DNS323/Kurobox Pro PCI initialisation
    
    Whereas most Orion 5x machine support code would initialise the PCI
    subsystem with nr_controllers in their struct hw_pci set to 2, the
    DNS323 and Kurobox Pro machine support code had nr_controllers set
    to 1.
    
    This was presumably done because on those two machines, the PCI(-X)
    controller (nr == 1) isn't used, requiring initialisation of only
    the PCIe controller (nr == 0.)  However, not initialising the PCI(-X)
    controller on boards that don't use it leads to a situation where
    both the PCIe and the PCI(-X) controller think that their root bus is
    zero, and it messes up IRQ assignment.
    
    This patch changes the DNS323 and Kurobox Pro support code to always
    use nr_controllers == 2.
    
    Signed-off-by: Lennert Buytenhek <buytenh at marvell.com>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit b3a8b751c1c2997653c6bf2b5d10467c39f3cc6e
Author: Lennert Buytenhek <buytenh at wantstofly.org>
Date:   Sat May 10 21:05:31 2008 +0100

    [ARM] 5034/1: fix arm{925,926,940,946} dma_flush_range() in WT mode
    
    The CPU's dma_flush_range() operation needs to clean+invalidate the
    given memory area if the cache is in writeback mode, or do just the
    invalidate part if the cache is in writethrough mode, but the current
    proc-arm{925,926,940,946} (incorrectly) do a cache clean in the
    latter case.  This patch fixes that.
    
    Signed-off-by: Lennert Buytenhek <buytenh at marvell.com>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit db2c4392907524fa376ffbd04f5781d6394e2666
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date:   Sun May 11 22:36:03 2008 +0100

    [ARM] export copy_page
    
    Martin Michlmayr reported that fuse complains:
      ERROR: "copy_page" [fs/fuse/fuse.ko] undefined!
    
    so export the needed function.
    
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit 2a52efb2cecf78201d61bd4930153bf52e57503b
Author: Thomas Kunze <thommycheck at gmx.de>
Date:   Tue Apr 29 17:44:54 2008 +0100

    [ARM] 5026/1: locomo: add .settype for gpio and several small fixes
    
    irqs.h:
        * rename IRQ_LOCOMO_SPI_OVRN to IRQ_LOCOMO_SPI_REND
    locomo.h:
        * add some definition for locomo spi controller
        * correct some errors
    locomo.c:
        * correct some errors
        * add set_type for locomo gpio irq chip
    
    Signed-off-by: Thomas Kunze <thommycheck at gmx.de>
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit 08c18964a247b412acab56599a643e6f73e1ec5a
Merge: 20a249896bb53536b69b228593dbdb6eb0d18113 e9623b35599fcdbc00c16535cbefbb4d5578f4ab
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sat May 17 14:21:43 2008 -0700

    Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86: disable mwait for AMD family 10H/11H CPUs
      x86: fix crash on cpu hotplug on pat-incapable machines
      x86: remove mwait capability C-state check

commit e9623b35599fcdbc00c16535cbefbb4d5578f4ab
Author: Thomas Gleixner <tglx at linutronix.de>
Date:   Fri May 16 22:55:26 2008 +0200

    x86: disable mwait for AMD family 10H/11H CPUs
    
    The previous revert of 0c07ee38c9d4eb081758f5ad14bbffa7197e1aec left
    out the mwait disable condition for AMD family 10H/11H CPUs.
    
    Andreas Herrman said:
    
    It depends on the CPU. For AMD CPUs that support MWAIT this is wrong.
    Family 0x10 and 0x11 CPUs will enter C1 on HLT. Powersavings then
    depend on a clock divisor and current Pstate of the core.
    
    If all cores of a processor are in halt state (C1) the processor can
    enter the C1E (C1 enhanced) state. If mwait is used this will never
    happen.
    
    Thus HLT saves more power than MWAIT here.
    
    It might be best to switch off the mwait flag for these AMD CPU
    families like it was introduced with commit
    f039b754714a422959027cb18bb33760eb8153f0 (x86: Don't use MWAIT on AMD
    Family 10)
    
    Re-add the AMD families 10H/11H check and disable the mwait usage for
    those.
    
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit 31f4d870b02e1590260ab7f2a9ff74306bd27e88
Author: Avi Kivity <avi at qumranet.com>
Date:   Wed May 14 12:20:32 2008 +0300

    x86: fix crash on cpu hotplug on pat-incapable machines
    
    pat_disable() is __init, which means it goes away after booting is complete.
    Unfortunately it is used by the hotplug code if the machine is not
    pat-capable, causing a crash.
    
    Fix by marking pat_disable() as __cpuinit.
    
    Signed-off-by: Avi Kivity <avi at qumranet.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit a738d897b7b03b83488ae74a9bc03d26a2875dc6
Author: Ingo Molnar <mingo at elte.hu>
Date:   Wed May 14 08:47:40 2008 +0200

    x86: remove mwait capability C-state check
    
    Vegard Nossum reports:
    
    | powertop shows between 200-400 wakeups/second with the description
    | "<kernel IPI>: Rescheduling interrupts" when all processors have load (e.g.
    | I need to run two busy-loops on my 2-CPU system for this to show up).
    |
    | The bisect resulted in this commit:
    |
    | commit 0c07ee38c9d4eb081758f5ad14bbffa7197e1aec
    | Date:   Wed Jan 30 13:33:16 2008 +0100
    |
    |     x86: use the correct cpuid method to detect MWAIT support for C states
    
    remove the functional effects of this patch and make mwait unconditional.
    
    A future patch will turn off mwait on specific CPUs where that causes
    power to be wasted.
    
    Bisected-by: Vegard Nossum <vegard.nossum at gmail.com>
    Tested-by: Vegard Nossum <vegard.nossum at gmail.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

commit 20a249896bb53536b69b228593dbdb6eb0d18113
Merge: 9a6ab769bdacc65e7d4e931034e12e02c357c4d3 109d1c88e9dd7e78ade8da742152e4e4da0d8103
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Fri May 16 15:39:28 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc64: Update defconfig.
      sparc64: Fix lmb_reserve() args in find_ramdisk().

commit 12103dca52e79e23afe2fbcaf3d9e7fc9ceb6b18
Author: Roland Dreier <rolandd at cisco.com>
Date:   Fri May 16 14:58:44 2008 -0700

    IB/mthca: Fix max_sge value returned by query_device
    
    The mthca driver returns the maximum number of scatter/gather entries
    returned by the firmware as the max_sge value when device properties
    are queried.  However, the firmware also reports a limit on the
    maximum descriptor size allowed, and because mthca takes into account
    the worst case send request overhead when checking whether to allow a
    QP to be created, the largest number of scatter/gather entries that
    can be used with mthca may be limited by the maximum descriptor size
    rather than just by the actual s/g entry limit.
    
    This means that applications cannot actually create QPs with
    max_send_sge equal to the limit returned by ib_query_device().  Fix
    this by checking if the maximum descriptor size imposes a lower limit
    and if so returning that lower limit.
    
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit 21609ae3efa42f4118ce741f7e55d66d716cb17c
Author: Roland Dreier <rolandd at cisco.com>
Date:   Fri May 16 14:58:40 2008 -0700

    RDMA/cxgb3: Fix uninitialized variable warning in iwch_post_send()
    
        drivers/infiniband/hw/cxgb3/iwch_qp.c: In function 'iwch_post_send':
        drivers/infiniband/hw/cxgb3/iwch_qp.c:232: warning: 't3_wr_flit_cnt' may be used uninitialized in this function
    
    This is what akpm describes as "the dopey
    gcc-doesn't-know-that-foo(&var)-writes-to-var problem."
    
    Signed-off-by: Roland Dreier <rolandd at cisco.com>
    Acked-by: Steve Wise <swise at opengridcomputing.com>

commit a3d8e1591dc90d359d444c759dfda2c6fc605251
Author: Andrew Morton <akpm at linux-foundation.org>
Date:   Fri May 16 14:28:30 2008 -0700

    IB/mlx4: Fix uninitialized-var warning in mlx4_ib_post_send()
    
        drivers/infiniband/hw/mlx4/qp.c: In function 'mlx4_ib_post_send':
        drivers/infiniband/hw/mlx4/qp.c:1460: warning: 'seglen' may be used uninitialized in this function
    
    This is the dopey gcc-doesn't-know-that-foo(&var)-writes-to-var problem.
    
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

commit 109d1c88e9dd7e78ade8da742152e4e4da0d8103
Author: David S. Miller <davem at davemloft.net>
Date:   Fri May 16 13:36:27 2008 -0700

    sparc64: Update defconfig.
    
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 7047901ec7d6eca97cf66f54b8a4197bb0754f40
Author: David S. Miller <davem at davemloft.net>
Date:   Wed May 14 23:10:33 2008 -0700

    sparc64: Fix lmb_reserve() args in find_ramdisk().
    
    This fixes the missing ram regression reported by
    Mikael Pettersson <mikpe at it.uu.se>, much thanks for
    all of this help in diagnosing this.
    
    The second argument to lmb_reserve() is a size,
    not an end address bounds.
    
    Tested-by: Mikael Pettersson <mikpe at it.uu.se>
    
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 9a6ab769bdacc65e7d4e931034e12e02c357c4d3
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Fri May 16 11:20:25 2008 -0700

    byteorder: don't directly include linux/byteorder/generic.h
    
    Use asm/byteorder.h instead.
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

commit f26a3988917913b3d11b2bd741601a2c64ab9204
Merge: ac0e9c30b1cb22c01f3edbb94857de2bae7611ca faa5b9daa8bd8a18b5b1f3a8dd79261503f7cdd3
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu May 15 18:28:46 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] macintosh: Replace deprecated __initcall with device_initcall
      [POWERPC] cell: Fix section mismatches in io-workarounds code
      [POWERPC] spufs: Fix compile error
      [POWERPC] Fix uninitialized variable bug in copy_{to|from}_user
      [POWERPC] Add null pointer check to of_find_property
      [POWERPC] vmemmap fixes to use smaller pages
      [POWERPC] spufs: Fix pointer reference in find_victim
      [POWERPC] 85xx: SBC8548 - Add flash support and HW Rev reporting
      [POWERPC] 85xx: Fix some sparse warnings for 85xx MDS
      [POWERPC] 83xx: Enable DMA engine on the MPC8377 MDS board.
      [POWERPC] 86xx: mpc8610_hpcd: fix second serial port
      [POWERPC] 86xx: mpc8610_hpcd: add support for NOR and NAND flashes
      [POWERPC] 85xx: Add 8568 PHY workarounds to board code
      [POWERPC] 86xx: mpc8610_hpcd: use ULI526X driver for on-board ethernet

commit ac0e9c30b1cb22c01f3edbb94857de2bae7611ca
Merge: a76bfd0da2321ed0a978ccbef192856ce7ed687a 02c471cb17203c748e9bc87003052c1f46e5df69
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu May 15 18:28:28 2008 -0700

    Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
      jbd2: update transaction t_state to T_COMMIT fix
      ext4: Retry block allocation if new blocks are allocated from system zone.
      ext4: mballoc fix mb_normalize_request algorithm for 1KB block size filesystems
      ext4: fix typos in messages and comments (journalled -> journaled)
      ext4: fix synchronization of quota files in journal=data mode
      ext4: Fix mount messages when quota disabled
      ext4: correct mount option parsing to detect when quota options can be changed

commit a76bfd0da2321ed0a978ccbef192856ce7ed687a
Author: Cyrill Gorcunov <gorcunov at gmail.com>
Date:   Thu May 15 13:52:41 2008 -0700

    initcalls: Fix m68k build and possible buffer overflow
    
    This patch fixes a build bug on m68k - gcc decides to emit a call to the
    strlen library function, which we don't implement.
    
    More importantly - my previous patch "init: don't lose initcall return
    values" (commit e662e1cfd434aa234b72fbc781f1d70211cb785b) had introduced
    potential buffer overflow by wrong calculation of string accumulator
    size.
    
    Use strlcat() instead, fixing both bugs.
    
    Many thanks Andreas Schwab and Geert Uytterhoeven for helping
    to catch and fix the bug.
    
    Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
    Cc: Geert Uytterhoeven <geert at linux-m68k.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit e0df154f45e40677781e971daec6c430cb34716b
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu May 15 18:14:01 2008 -0700

    Split up 'do_initcalls()' into two simpler functions
    
    One function to just loop over the entries, one function to actually do
    the call and the associated debugging code.
    
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit a442ac512f36981182e66a427ad05f449ff6593b
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu May 15 17:50:37 2008 -0700

    Clean up 'print_fn_descriptor_symbol()' types
    
    Everybody wants to pass it a function pointer, and in fact, that is what
    you _must_ pass it for it to make sense (since it knows that ia64 and
    ppc64 use descriptors for function pointers and fetches the actual
    address from there).
    
    So don't make the argument be a 'unsigned long' and force everybody to
    add a cast.
    
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit df3f0da8db6b5e7e8f0585221c8b1cd8ff806d35
Author: Ralph Campbell <ralph.campbell at qlogic.com>
Date:   Thu May 15 16:37:25 2008 -0700

    IB/ipath: Fix UC receive completion opcode for RDMA WRITE with immediate
    
    When I fixed the RC receive completion opcode in 2bfc8e9e ("IB/ipath:
    Return the correct opcode for RDMA WRITE with immediate"), I forgot to
    fix UC, which had the same problem for RDMA write with immediate
    returning the wrong opcode.
    
    Signed-off-by: Ralph Campbell <ralph.campbell at qlogic.com>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit cd80ec6f81db89d109187a673470c04af4c09a63
Author: Roland Dreier <rolandd at cisco.com>
Date:   Thu May 15 15:28:55 2008 -0700

    IB/ipath: Fix printk format for ipath_sdma_status
    
    Commit f018c7e1 ("IB/ipath: Change ipath_devdata.ipath_sdma_status to be
    unsigned long") changed ipath_sdma_status to be unsigned long, but left
    a few debug messages that printed it out with a %016llx format, which
    generates the warnings
    
        drivers/infiniband/hw/ipath/ipath_sdma.c:348: warning: format '%016llx' expects type 'long long unsigned int', but argument  3 has type 'long unsigned int'
        drivers/infiniband/hw/ipath/ipath_sdma.c:618: warning: format '%016llx' expects type 'long long unsigned int', but argument  3 has type 'long unsigned int'
    
    Fix this by changing the format used to print out the value to %08lx
    (8 hex digits are now sufficient, because the highest bit used is 31).
    
    Warnings reported by Randy Dunlap <randy.dunlap at oracle.com>.
    
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit 7371fd11a6e2aed99895db4f100940fa5022f7fe
Merge: 487ad7efbf6b0ec338cdfc2a7b0fbeb53f17a94c 839052d27e8db0c1545256fe5827abcd00fb51c5
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu May 15 13:56:42 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] fix personality(PER_LINUX32) performance issue
      [IA64] Properly unregister legacy interrupts
      [IA64] Remove NULL pointer check for argument never passed as NULL.
      [IA64] trivial cleanup for perfmon.c
      [IA64] trivial cleanup for entry.S
      [IA64] fix interrupt masking for pending works on kernel leave
      [IA64] allow user to force_pal_cache_flush
      [IA64] Don't reserve crashkernel memory > 4 GB
      [IA64] machvec support for SGI UV platform
      [IA64] Add header files for SGI UV platform

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

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

commit 02c471cb17203c748e9bc87003052c1f46e5df69
Author: Mingming Cao <cmm at us.ibm.com>
Date:   Thu May 15 14:46:17 2008 -0400

    jbd2: update transaction t_state to T_COMMIT fix
    
    Updating the current transaction's t_state is protected by j_state_lock.  We
    need to do the same when updating the t_state to T_COMMIT.
    
    Acked-by: Jan Kara <jack at suse.cz>
    Signed-off-by: Mingming Cao <cmm at us.ibm.com>
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>

commit 519deca0496a4df07d15acf3181ca5d573bffdec
Author: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>
Date:   Thu May 15 14:43:20 2008 -0400

    ext4: Retry block allocation if new blocks are allocated from system zone.
    
    If the block allocator gets blocks out of system zone ext4 calls
    ext4_error. But if the file system is mounted with errors=continue
    retry block allocation. We need to mark the system zone blocks as
    in use to make sure retry don't pick them again
    
    System zone is the block range mapping block bitmap, inode bitmap and inode
    table.
    
    Signed-off-by: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>
    Signed-off-by: Mingming Cao <cmm at us.ibm.com>
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>

commit 487ad7efbf6b0ec338cdfc2a7b0fbeb53f17a94c
Author: Ingo Molnar <mingo at elte.hu>
Date:   Wed May 14 17:11:46 2008 +0200

    tty: fix BKL related leak and crash
    
    Enabling the BKL to be lockdep tracked uncovered the following
    upstream kernel bug in the tty code, which caused a BKL
    reference leak:
    
      ================================================
      [ BUG: lock held when returning to user space! ]
      ------------------------------------------------
      dmesg/3121 is leaving the kernel with locks still held!
      1 lock held by dmesg/3121:
       #0:  (kernel_mutex){--..}, at: [<c02f34d9>] opost+0x24/0x194
    
    this might explain some of the atomicity warnings and crashes
    that -tip tree testing has been experiencing since the BKL
    was converted back to a spinlock.
    
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 839052d27e8db0c1545256fe5827abcd00fb51c5
Author: Huang, Xiaolan <xiaolan.huang at intel.com>
Date:   Thu May 15 10:18:41 2008 +0800

    [IA64] fix personality(PER_LINUX32) performance issue
    
    The patch aims to fix a performance issue for the syscall
    personality(PER_LINUX32).
    
    On IA-64 box, the syscall personality (PER_LINUX32) has poor performance
    because it failed to find the Linux/x86 execution domain. Then it tried
    to load the kernel module however it failed always and it used the default
    execution domain PER_LINUX instead. Requesting kernel modules is very
    expensive. It caused the performance issue. (see the function
    lookup_exec_domain in kernel/exec_domain.c).
    
    To resolve the issue, execution domain Linux/x86 is always registered in
    initialization time for IA-64 architecture.
    
    Signed-off-by: Xiaolan Huang <xiaolan.huang at intel.com>
    Signed-off-by: Tony Luck <tony.luck at intel.com>

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

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

commit 8568dae21e186fbb111bbe6583033a33fe26f83d
Merge: 713c0515a555952d53956196d47dec3a3ece860a 8dd79cb1051723496bbdcea2247e49567cedb3ac
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu May 15 09:10:13 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] show_interrupts: prevent cpu hotplug when walking cpu_online_map.
      [S390] smp: __smp_call_function_map vs cpu_online_map fix.
      [S390] tape: Use ccw_dev_id to build cdev_id.
      [S390] dasd: fix timeout handling in interrupt handler
      [S390] s390dbf: Use const char * for dbf name.
      [S390] dasd: Use const in busid functions.
      [S390] blacklist.c: removed duplicated include
      [S390] vmlogrdr: module initialization function should return negative errors
      [S390] sparsemem vmemmap: initialize memmap.
      [S390] Remove last traces of cio_msg=.
      [S390] cio: Remove CCW_CMD_SUSPEND_RECONN in front of CCW_CMD_SET_PGID.

commit 713c0515a555952d53956196d47dec3a3ece860a
Merge: 8f40f672e6bb071812f61bfbd30efc3fc1263ad1 c913f94d86d75492af6222d268c53df236194afb
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu May 15 09:09:43 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
      arch/parisc/kernel/perf_asm.S: build fix
      parisc: remove -traditional from assembler flags
      parisc: use conditional macro for 64-bit wide ops
      parisc: Remove ioctl.h content picked up from <asm-generic/ioctl.h>.
      arch/parisc/kernel/unaligned.c: use time_* macros
      parisc: remove redundant display of free swap space in show_mem()
      drivers/parisc: replace remaining __FUNCTION__ occurrences
      parisc: replace remaining __FUNCTION__ occurrences
      parisc: new termios definitions
      parisc: fix trivial section name warnings

commit 7853099a70742b2a3c753282e5ccfbdda86cb29f
Author: Andrew Vasquez <andrew.vasquez at qlogic.com>
Date:   Mon May 12 22:21:16 2008 -0700

    [SCSI] qla2xxx: Update version number to 8.02.01-k3.
    
    Signed-off-by: Andrew Vasquez <andrew.vasquez at qlogic.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit a7cd02320eeee9992c7eba347555e8970042b68c
Author: Andrew Vasquez <andrew.vasquez at qlogic.com>
Date:   Mon May 12 22:21:15 2008 -0700

    [SCSI] qla2xxx: Revert "qla2xxx: Validate mid-layer 'underflow' during check-condition handling."
    
    This reverts commit 8084fe168a5252548cdddf2ed181c337fecd0523.
    The midlayer should be given the oppotunity to interpret the
    check-condition and based on scsi_cmnd->resid determine if a
    transfer should be retried or failed.
    
    Signed-off-by: Andrew Vasquez <andrew.vasquez at qlogic.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit d2ba5675d8993e669182250e41ad83e7a0b5d4ad
Author: Andrew Vasquez <andrew.vasquez at qlogic.com>
Date:   Mon May 12 22:21:14 2008 -0700

    [SCSI] qla2xxx: Disable local-interrupts while polling for RISC status.
    
    Matthew Wilcox <matthew at wil.cx> reported the following lockdep
    warning:
    
     > =================================
     > [INFO:inconsistentlockstate]
     > 2.6.26-rc1-00115-g0340eda-dirty#60
     > ---------------------------------
     > inconsistent{hardirq-on-W}->{in-hardirq-W}usage.
     > swapper/1[HC1[1]:SC0[0]:HE0:SE1]takes:
     > (&ha->hardware_lock){+-..},at:[<c035495d>]qla2300_intr_handler+0x35/0x1f5
     > {hardirq-on-W}statewasregisteredat:
     > [<c0139a16>]__lock_acquire+0x459/0xb1d
     > [<c013a091>]__lock_acquire+0xad4/0xb1d
     > [<c013a142>]lock_acquire+0x68/0x82
     > [<c035495d>]qla2300_intr_handler+0x35/0x1f5
     > [<c0506da5>]_spin_lock+0x24/0x4d
     > [<c035495d>]qla2300_intr_handler+0x35/0x1f5
     > [<c035495d>]qla2300_intr_handler+0x35/0x1f5
     > [<c01391e4>]trace_hardirqs_on+0xe7/0x10e
     > [<c034f0a6>]qla2x00_mailbox_command+0x1c6/0x433
     ...
     > other info that might help us debug this:
     > no locks held by swapper/1.
     >
     > stack backtrace:
     > Pid:1,comm:swapperNottainted2.6.26-rc1-00115-g0340eda-dirty#60
     > [<c0138121>]print_usage_bug+0x100/0x10a
     > [<c0138d37>]mark_lock+0xaa/0x395
     > [<c01399af>]__lock_acquire+0x3f2/0xb1d
     > [<c013a091>]__lock_acquire+0xad4/0xb1d
     > [<c013a142>]lock_acquire+0x68/0x82
     > [<c035495d>]qla2300_intr_handler+0x35/0x1f5
     > [<c0506da5>]_spin_lock+0x24/0x4d
     > [<c035495d>]qla2300_intr_handler+0x35/0x1f5
     > [<c035495d>]qla2300_intr_handler+0x35/0x1f5
     > [<c014a37b>]handle_IRQ_event+0x13/0x3d
     > [<c014b366>]handle_fasteoi_irq+0x76/0xab
    
    Which shows that lockdep is detecting the driver's
    interrupt-handler is run in both process and interrupt context
    with irqs-enabled in the former case.
    
    During init-time and error-recovery (after a RISC reset), the
    driver disables interrupts and 'polls' for completions by calling
    qla2x00_poll():
    
    	static inline void
    	qla2x00_poll(scsi_qla_host_t *ha)
    	{
    		ha->isp_ops->intr_handler(0, ha);
    	}
    
    which in-turn calls the ISP registered interrupt handler.  This
    patch corrects it by disabling local interrupts during polling.
    
    Reviewed-by: Matthew Wilcox <willy at linux.intel.com>
    Signed-off-by: Andrew Vasquez <andrew.vasquez at qlogic.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit 68af081151670af4ca405823f9dfb74ec6b20e66
Author: Andrew Vasquez <andrew.vasquez at qlogic.com>
Date:   Mon May 12 22:21:13 2008 -0700

    [SCSI] qla2xxx: Extend the 'fw_dump' SYSFS node the ability to initiate a firmware dump.
    
    The user-initiated dump can be a useful tool in triaging complex
    ISP and FC issues.
    
    Signed-off-by: Andrew Vasquez <andrew.vasquez at qlogic.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit fa0926df0f5cf63b998a79127519bdcfe9bf05f7
Author: Andrew Vasquez <andrew.vasquez at qlogic.com>
Date:   Mon May 12 22:21:12 2008 -0700

    [SCSI] qla2xxx: Don't depend on mailbox return values while enabling FCE tracing.
    
    Recent firmwares no longer return the 'number of buffers' in
    mailbox6.  The original code may result in a potential panic
    during a FW-dump process due to the driver misinterpreting the
    size of the allocated buffer.
    
    Signed-off-by: Andrew Vasquez <andrew.vasquez at qlogic.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit 6c2f527cb84cbd7d2d8a668c979e70bf78980ccc
Author: matthias at kaehlcke.net <matthias at kaehlcke.net>
Date:   Mon May 12 22:21:11 2008 -0700

    [SCSI] qla2xxx: Convert vport_sem to a mutex
    
    The semaphore vport_sem is used as a mutex.  Convert it to the
    mutex API.
    
    Signed-off-by: Matthias Kaehlcke <matthias at kaehlcke.net>
    Signed-off-by: Andrew Vasquez <andrew.vasquez at qlogic.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit e1e82b6f0df0c5175ddd3d4f8862507aa71da8e9
Author: Daniel Walker <dwalker at mvista.com>
Date:   Mon May 12 22:21:10 2008 -0700

    [SCSI] qla2xxx: firmware semaphore to mutex
    
    Signed-off-by: Daniel Walker <dwalker at mvista.com>
    Signed-off-by: Andrew Vasquez <andrew.vasquez at qlogic.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit 0e973a24f02ed8c627271b013d69683b4497828d
Author: Andrew Vasquez <andrew.vasquez at qlogic.com>
Date:   Mon May 12 22:21:09 2008 -0700

    [SCSI] qla2xxx: Correct locking within MSI-X interrupt handlers.
    
    Both MSI-X vector handlers attempt to acquire the HA's
    hardware_lock.  This though requires that interrupts be
    disabled/enabled during acquisition and release of the spinlock.
    
    Signed-off-by: Andrew Vasquez <andrew.vasquez at qlogic.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit fd9a29f03600f306acb4faf49b92ca5472f39ee8
Author: Andrew Vasquez <andrew.vasquez at qlogic.com>
Date:   Mon May 12 22:21:08 2008 -0700

    [SCSI] qla2xxx: Display driver version at module init-time.
    
    Signed-off-by: Andrew Vasquez <andrew.vasquez at qlogic.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit 2f2fa13d5665d7d5f2ba6068dd28ca7796fa9ea8
Author: Shyam Sundar <shyam.sundar at qlogic.com>
Date:   Mon May 12 22:21:07 2008 -0700

    [SCSI] qla2xxx: Return correct port_type to FC-transport for Vports.
    
    For Vports, the port_type should be set to FC_PORTTYPE_NPIV.
    
    Signed-off-by: Andrew Vasquez <andrew.vasquez at qlogic.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit c913f94d86d75492af6222d268c53df236194afb
Author: Kyle McMartin <kyle at mcmartin.ca>
Date:   Thu May 15 10:57:33 2008 -0400

    arch/parisc/kernel/perf_asm.S: build fix
    
    Missing <linux/init.h> header for __HEAD macro.
    
    Signed-off-by: Kyle McMartin <kyle at mcmartin.ca>

commit 3378f7ec6cbc04c64ec8512847ac96fb7f376d93
Author: Kyle McMartin <kyle at mcmartin.ca>
Date:   Thu May 15 10:56:36 2008 -0400

    parisc: remove -traditional from assembler flags
    
    Signed-off-by: Kyle McMartin <kyle at mcmartin.ca>

commit 872f6debcae63309eb39bfc2cc9462fb83450ee0
Author: Kyle McMartin <kyle at mcmartin.ca>
Date:   Thu May 15 10:53:57 2008 -0400

    parisc: use conditional macro for 64-bit wide ops
    
    This work enables us to remove -traditional from $AFLAGS on
    parisc.
    
    Signed-off-by: Kyle McMartin <kyle at mcmartin.ca>

commit f54d8a1b3fef79bb1aa2f0840dd356ce7bb180f9
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date:   Wed May 14 15:14:52 2008 -0400

    parisc: Remove ioctl.h content picked up from <asm-generic/ioctl.h>.
    
    Now that <asm-generic/ioctl.h> allows overriding of the most commonly
    changed macro values, take advantage of that.
    
    Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
    Signed-off-by: Kyle McMartin <kyle at mcmartin.ca>

commit 8dd79cb1051723496bbdcea2247e49567cedb3ac
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date:   Thu May 15 16:52:39 2008 +0200

    [S390] show_interrupts: prevent cpu hotplug when walking cpu_online_map.
    
    Surround all the code withing show_interrupts() with
    get/put_online_cpus() to prevent strange results wrt cpu hotplug.
    
    Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit 85cb185dad54be308c3f3a6068dd7d418b8b53e4
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date:   Thu May 15 16:52:38 2008 +0200

    [S390] smp: __smp_call_function_map vs cpu_online_map fix.
    
    Both smp_call_function() and __smp_call_function_map() access
    cpu_online_map. Both functions run with preemption disabled which
    protects for cpus going offline. However new cpus can be added and
    therefore the cpu_online_map can change unexpectedly.
    So use the call_lock to protect against changes to the cpu_online_map
    in start_secondary() and all smp_call_* functions.
    
    Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit f455adcff102851629d716815f92bb7010de0c4e
Author: Cornelia Huck <cornelia.huck at de.ibm.com>
Date:   Thu May 15 16:52:37 2008 +0200

    [S390] tape: Use ccw_dev_id to build cdev_id.
    
    To construct the integer containing the information from the bus_id,
    it is easier to use the data from ccw_dev_id than to parse the bus_id.
    
    Signed-off-by: Cornelia Huck <cornelia.huck at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit f16f5843507ceaea315dae82b9fee29a65b72f24
Author: Stefan Weinhuber <wein at de.ibm.com>
Date:   Thu May 15 16:52:36 2008 +0200

    [S390] dasd: fix timeout handling in interrupt handler
    
    When the dasd_int_handler is called with an error code instead of
    an irb, the associated request should be restarted. This handling
    was missing from the -ETIMEDOUT case. In fact it should be done in
    any case.
    
    Signed-off-by: Stefan Weinhuber <wein at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit 5cbbf16a0fab91662af8400b5ada658990932a87
Author: Cornelia Huck <cornelia.huck at de.ibm.com>
Date:   Thu May 15 16:52:35 2008 +0200

    [S390] s390dbf: Use const char * for dbf name.
    
    We should use const char * for passing the name of the debug feature
    around since it will not be changed.
    
    Signed-off-by: Cornelia Huck <cornelia.huck at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit 69f90f6a5650a74dd8f428e8d2f05859d58da3d7
Author: Cornelia Huck <cornelia.huck at de.ibm.com>
Date:   Thu May 15 16:52:34 2008 +0200

    [S390] dasd: Use const in busid functions.
    
    We should use 'const char *' in the busid functions since the
    strings are not modified anyway.
    
    Signed-off-by: Cornelia Huck <cornelia.huck at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit c7a8548ffa0a2cf6313fe8b3bb4b4a199a9a080f
Author: Huang Weiyi <weiyi.huang at gmail.com>
Date:   Thu May 15 16:52:33 2008 +0200

    [S390] blacklist.c: removed duplicated include
    
    Removed duplicated include <asm/cio.h>
    in drivers/s390/cio/blacklist.c.
    
    Signed-off-by: Huang Weiyi <weiyi.huang at gmail.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit 3cb2cea15e707dd030b3293d6d08183da369d291
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date:   Thu May 15 16:52:32 2008 +0200

    [S390] vmlogrdr: module initialization function should return negative errors
    
    Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit 2069e978d5a6e7b45d58027e3de7f879b8c5e488
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date:   Thu May 15 16:52:31 2008 +0200

    [S390] sparsemem vmemmap: initialize memmap.
    
    Let's just use the generic vmmemmap_alloc_block() function which
    always returns initialized memory.
    
    Cc: Gerald Schaefer <gerald.schaefer at de.ibm.com>
    Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit e0a45ee0b922b998f8d6737cf6e9e69a791252b7
Author: Cornelia Huck <cornelia.huck at de.ibm.com>
Date:   Thu May 15 16:52:30 2008 +0200

    [S390] Remove last traces of cio_msg=.
    
    cio_msg= is gone, also remove it from kernel-parameters.txt.
    
    Signed-off-by: Cornelia Huck <cornelia.huck at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit 32aff5732a11739e81994b3bcd7a9d0e8b1ea06e
Author: Michael Ernst <mernst at de.ibm.com>
Date:   Thu May 15 16:52:29 2008 +0200

    [S390] cio: Remove CCW_CMD_SUSPEND_RECONN in front of CCW_CMD_SET_PGID.
    
    CCW_CMD_SUSPEND_RECONN causes a system hang if the cable of a
    reserved DASD is disconnected and connected again.
    
    Signed-off-by: Michael Ernst <mernst at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit e557d2775a530c12818fcb5895c4457a5fec59ae
Author: S.Caglar Onur <caglar at pardus.org.tr>
Date:   Wed May 14 16:21:57 2008 -0700

    arch/parisc/kernel/unaligned.c: use time_* macros
    
    The functions time_before, time_before_eq, time_after, and time_after_eq are
    more robust for comparing jiffies against other values.
    
    So use the time_after() macro, defined in linux/jiffies.h, which deals with
    wrapping correctl
    
    [akpm at linux-foundation.org: coding-style fixes]
    Signed-off-by: S.Caglar Onur <caglar at pardus.org.tr>
    Cc: Kyle McMartin <kyle at mcmartin.ca>
    Cc: Matthew Wilcox <matthew at wil.cx>
    Cc: Grant Grundler <grundler at parisc-linux.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Kyle McMartin <kyle at mcmartin.ca>

commit b64af9b54c17008705367f554131415793a03fba
Author: Johannes Weiner <hannes at saeurebad.de>
Date:   Wed May 14 16:21:56 2008 -0700

    parisc: remove redundant display of free swap space in show_mem()
    
    show_mem() has no need to print the amount of free swap space manually because
    show_free_areas() does this already and is called by the former.
    
    The two outputs only differ in text formatting:
    
      printk("Free swap  = %lukB\n", ...);
      printk("Free swap:       %6ldkB\n", ...);
    
    Signed-off-by: Johannes Weiner <hannes at saeurebad.de>
    Cc: Kyle McMartin <kyle at mcmartin.ca>
    Cc: Matthew Wilcox <matthew at wil.cx>
    Cc: Grant Grundler <grundler at parisc-linux.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Kyle McMartin <kyle at mcmartin.ca>

commit a8043ecb17bd2e4b034006bee315efeea3936278
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Wed May 14 16:21:56 2008 -0700

    drivers/parisc: replace remaining __FUNCTION__ occurrences
    
    __FUNCTION__ is gcc-specific, use __func__
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Cc: Kyle McMartin <kyle at mcmartin.ca>
    Cc: Matthew Wilcox <willy at debian.org>
    Cc: Grant Grundler <grundler at parisc-linux.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Kyle McMartin <kyle at mcmartin.ca>

commit 91bae23ce185b74c9b6dda86b92bb204a1c951c3
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Wed May 14 16:21:55 2008 -0700

    parisc: replace remaining __FUNCTION__ occurrences
    
    __FUNCTION__ is gcc-specific, use __func__
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Cc: Kyle McMartin <kyle at mcmartin.ca>
    Cc: Matthew Wilcox <willy at debian.org>
    Cc: Grant Grundler <grundler at parisc-linux.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Kyle McMartin <kyle at mcmartin.ca>

commit 9e491e54f0589cc26e2c096664e9d95493b1af29
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed May 14 16:21:54 2008 -0700

    parisc: new termios definitions
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Cc: Kyle McMartin <kyle at mcmartin.ca>
    Cc: Grant Grundler <grundler at parisc-linux.org>
    Cc: Matthew Wilcox <willy at debian.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Kyle McMartin <kyle at mcmartin.ca>

commit bd3bb8c15b9a80dbddfb7905b237a4a11a4725b4
Author: Helge Deller <deller at gmx.de>
Date:   Fri May 2 22:02:48 2008 +0200

    parisc: fix trivial section name warnings
    
    This trivial patch fixes the following section warnings on PARISC:
    > WARNING: vmlinux.o (.text.1): unexpected section name.
    >The (.[number]+) following section name are ld generated and not expected.
    > Did you forget to use "ax"/"aw" in a .S file?
    > Note that for example <linux/init.h> contains
    > section definitions for use in .S files.
    
    Signed-off-by: Helge Deller <deller at gmx.de>
    Signed-off-by: Kyle McMartin <kyle at mcmartin.ca>

commit faa5b9daa8bd8a18b5b1f3a8dd79261503f7cdd3
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date:   Thu May 15 09:12:53 2008 +1000

    [POWERPC] macintosh: Replace deprecated __initcall with device_initcall
    
    Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
    Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Paul Mackerras <paulus at samba.org>

commit 7012255aaee28203c15761f864e34b806b71dd53
Author: Ishizaki Kou <kou.ishizaki at toshiba.co.jp>
Date:   Wed May 14 19:05:19 2008 +1000

    [POWERPC] cell: Fix section mismatches in io-workarounds code
    
    Fix following warnings:
    WARNING: arch/powerpc/platforms/cell/built-in.o(.devinit.text+0x9c): Section mismatch in reference from the function .cell_setup_phb() to the function .init.text:.iowa_register_bus()
    WARNING: arch/powerpc/platforms/cell/built-in.o(.devinit.text+0xa4): Section mismatch in reference from the function .cell_setup_phb() to the function .init.text:.io_workaround_init()
    
    Signed-off-by: Kou Ishizaki <kou.ishizaki at toshiba.co.jp>
    Signed-off-by: Paul Mackerras <paulus at samba.org>

commit dfe1e09f220b73ff9b5614185ef24de4c07c578d
Author: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Date:   Tue May 13 19:07:42 2008 +1000

    [POWERPC] spufs: Fix compile error
    
    With CONFIG_VIRT_CPU_ACCOUNTING disabled, I got the following error:
    
    linux-2.6/arch/powerpc/platforms/cell/spufs/file.c: In function 'spu_switch_log_notify':
    linux-2.6/arch/powerpc/platforms/cell/spufs/file.c:2542: error: implicit declaration of function 'get_tb'
    make[4]: *** [arch/powerpc/platforms/cell/spufs/file.o] Error 1
    
    Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
    Signed-off-by: Paul Mackerras <paulus at samba.org>

commit 9c8387afdc93f90bf0241411d44e011d8d5b76df
Author: Nate Case <ncase at xes-inc.com>
Date:   Tue May 13 06:14:14 2008 +1000

    [POWERPC] Fix uninitialized variable bug in copy_{to|from}_user
    
    Calls to copy_to_user() or copy_from_user() can fail when copying N
    bytes, where N is a constant less than 8, but not 1, 2, 4, or 8,
    because 'ret' is not initialized and is only set if the size is 1,
    2, 4 or 8, but is tested after the switch statement for any constant
    size <= 8.  This fixes it by initializing 'ret' to 1, causing the
    code to fall through to the __copy_tofrom_user call for sizes other
    than 1, 2, 4 or 8.
    
    Signed-off-by: Dave Scidmore <dscidmore at xes-inc.com>
    Signed-off-by: Nate Case <ncase at xes-inc.com>
    Signed-off-by: Paul Mackerras <paulus at samba.org>

commit 64e4566f6d590fbb284da061b9b664c2486dd2de
Author: Timur Tabi <timur at freescale.com>
Date:   Thu May 8 05:19:59 2008 +1000

    [POWERPC] Add null pointer check to of_find_property
    
    Update function of_find_property() to return NULL if the device_node
    passed to it is also NULL.  Otherwise, passing NULL will cause a null
    pointer dereference.
    
    Without this, the legacy_serial driver will crash if there's no
    'chosen' node in the device tree.
    
    Signed-off-by: Timur Tabi <timur at freescale.com>
    Signed-off-by: Paul Mackerras <paulus at samba.org>

commit cec08e7a948326b01555be6311480aa08e637de2
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date:   Wed Apr 30 15:41:48 2008 +1000

    [POWERPC] vmemmap fixes to use smaller pages
    
    This changes vmemmap to use a different region (region 0xf) of the
    address space, and to configure the page size of that region
    dynamically at boot.
    
    The problem with the current approach of always using 16M pages is that
    it's not well suited to machines that have small amounts of memory such
    as small partitions on pseries, or PS3's.
    
    In fact, on the PS3, failure to allocate the 16M page backing vmmemmap
    tends to prevent hotplugging the HV's "additional" memory, thus limiting
    the available memory even more, from my experience down to something
    like 80M total, which makes it really not very useable.
    
    The logic used by my match to choose the vmemmap page size is:
    
     - If 16M pages are available and there's 1G or more RAM at boot,
       use that size.
     - Else if 64K pages are available, use that
     - Else use 4K pages
    
    I've tested on a POWER6 (16M pages) and on an iSeries POWER3 (4K pages)
    and it seems to work fine.
    
    Note that I intend to change the way we organize the kernel regions &
    SLBs so the actual region will change from 0xf back to something else at
    one point, as I simplify the SLB miss handler, but that will be for a
    later patch.
    
    Signed-off-by: Paul Mackerras <paulus at samba.org>

commit 08fcf1d61193d7b7779aa6d7388535e26e064a0b
Author: Luke Browning <lukebr at linux.vnet.ibm.com>
Date:   Mon May 12 14:36:59 2008 +0000

    [POWERPC] spufs: Fix pointer reference in find_victim
    
    If victim (not ctx) is in spu_run, add victim to rq.
    
    Signed-off-by: Luke Browning <lukebrowning at us.ibm.com>
    Acked-by: Christoph Hellwig <hch at lst.de>
    Signed-off-by: Paul Mackerras <paulus at samba.org>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

commit 8f40f672e6bb071812f61bfbd30efc3fc1263ad1
Merge: 8978a318837d7acefca82645017c0534aeba5a36 887b3ece65be7b643dfdae0d433c91a26a3f437d
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed May 14 19:30:13 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
    
    * 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
      9p: fix error path during early mount
      9p: make cryptic unknown error from server less scary
      9p: fix flags length in net
      9p: Correct fidpool creation failure in p9_client_create
      9p: use struct mutex instead of struct semaphore
      9p: propagate parse_option changes to client and transports
      fs/9p/v9fs.c (v9fs_parse_options): Handle kstrdup and match_strdup failure.
      9p: Documentation updates
      add match_strlcpy() us it to make v9fs make uname and remotename parsing more robust

commit 8978a318837d7acefca82645017c0534aeba5a36
Merge: f7fd63c0b5e170efc20e7b9a0aad7f69dff62c64 9a28dbf8af11d127bf1c644143e7882cb91515dd
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed May 14 19:11:36 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc64: Use a TS_RESTORE_SIGMASK
      lmb: Make lmb debugging more useful.
      lmb: Fix inconsistent alignment of size argument.
      sparc: Fix mremap address range validation.

commit f7fd63c0b5e170efc20e7b9a0aad7f69dff62c64
Author: Andrew Morton <akpm at linux-foundation.org>
Date:   Wed May 14 16:05:59 2008 -0700

    net/irda/irnet/irnet_irda.c needs unaligned.h
    
    net/irda/irnet/irnet_irda.c: In function 'irnet_discovery_indication':
    net/irda/irnet/irnet_irda.c:1676: error: implicit declaration of function 'get_unaligned'
    
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Acked-by: David S. Miller <davem at davemloft.net>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 9ffee4cbc51907755809d98613d9e7133612803a
Author: Andrew Morton <akpm at linux-foundation.org>
Date:   Wed May 14 16:05:58 2008 -0700

    tty_check_change(): avoid taking tasklist_lock while holding tty->ctrl_lock
    
    May 11 09:42:27 [kernel] [ 1104.496819] rarian-sk-get-c[5630]: segfault at 0 ip 7f478556caf0 sp 7fff8e3fe338 error 4 in libc-2.6.1.so[7f47854f9000+136000]
    May 11 10:59:48 [kernel] [ 2494.165792]
    May 11 10:59:48 [kernel] [ 2494.165794] =======================================================
    May 11 10:59:48 [kernel] [ 2494.165801] [ INFO: possible circular locking dependency detected ]
    May 11 10:59:48 [kernel] [ 2494.165805] 2.6.26-rc1-00007-g91b3a7a #217
    May 11 10:59:48 [kernel] [ 2494.165807] -------------------------------------------------------
    May 11 10:59:48 [kernel] [ 2494.165809] less/7053 is trying to acquire lock:
    May 11 10:59:48 [kernel] [ 2494.165812]  (tasklist_lock){..??}, at: [<ffffffff80232e95>] is_current_pgrp_orphaned+0x15/0x50
    May 11 10:59:48 [kernel] [ 2494.165821]
    May 11 10:59:48 [kernel] [ 2494.165822] but task is already holding lock:
    May 11 10:59:48 [kernel] [ 2494.165824]  (&tty->ctrl_lock){....}, at: [<ffffffff803d5f31>] tty_check_change+0x61/0x110
    May 11 10:59:48 [kernel] [ 2494.165831]
    May 11 10:59:48 [kernel] [ 2494.165832] which lock already depends on the new lock.
    May 11 10:59:48 [kernel] [ 2494.165833]
    May 11 10:59:48 [kernel] [ 2494.165835]
    May 11 10:59:48 [kernel] [ 2494.165836] the existing dependency chain (in reverse order) is:
    May 11 10:59:48 [kernel] [ 2494.165838]
    May 11 10:59:48 [kernel] [ 2494.165839] -> #2 (&tty->ctrl_lock){....}:
    May 11 10:59:48 [kernel] [ 2494.165843]        [<ffffffff80253796>] __lock_acquire+0xf86/0x1080
    May 11 10:59:48 [kernel] [ 2494.165851]        [<ffffffff80253922>] lock_acquire+0x92/0xc0
    May 11 10:59:48 [kernel] [ 2494.165858]        [<ffffffff804deee0>] _spin_lock_irqsave+0x40/0x60
    May 11 10:59:48 [kernel] [ 2494.165866]        [<ffffffff803d31b5>] __proc_set_tty+0x35/0xe0
    May 11 10:59:48 [kernel] [ 2494.165873]        [<ffffffff803d76d4>] tty_ioctl+0xbf4/0xfe0
    May 11 10:59:48 [kernel] [ 2494.165880]        [<ffffffff802a05e1>] vfs_ioctl+0x31/0x90
    May 11 10:59:48 [kernel] [ 2494.165888]        [<ffffffff802a06b3>] do_vfs_ioctl+0x73/0x2d0
    May 11 10:59:48 [kernel] [ 2494.165895]        [<ffffffff802a095a>] sys_ioctl+0x4a/0x80
    May 11 10:59:48 [kernel] [ 2494.165902]        [<ffffffff8020b5ab>] system_call_after_swapgs+0x7b/0x80
    May 11 10:59:48 [kernel] [ 2494.165910]        [<ffffffffffffffff>] 0xffffffffffffffff
    May 11 10:59:48 [kernel] [ 2494.165924]
    May 11 10:59:48 [kernel] [ 2494.165925] -> #1 (&sighand->siglock){++..}:
    May 11 10:59:48 [kernel] [ 2494.165929]        [<ffffffff80253796>] __lock_acquire+0xf86/0x1080
    May 11 10:59:48 [kernel] [ 2494.165936]        [<ffffffff80253922>] lock_acquire+0x92/0xc0
    May 11 10:59:48 [kernel] [ 2494.165943]        [<ffffffff804dec1f>] _spin_lock+0x2f/0x40
    May 11 10:59:48 [kernel] [ 2494.165951]        [<ffffffff8022d5a3>] copy_process+0x973/0x1210
    May 11 10:59:48 [kernel] [ 2494.165959]        [<ffffffff8022df12>] do_fork+0x82/0x2f0
    May 11 10:59:48 [kernel] [ 2494.165967]        [<ffffffff8020bfe1>] kernel_thread+0x81/0xde
    May 11 10:59:48 [kernel] [ 2494.165974]        [<ffffffff8020c048>] child_rip+0xa/0x12
    May 11 10:59:48 [kernel] [ 2494.165981]        [<ffffffffffffffff>] 0xffffffffffffffff
    May 11 10:59:48 [kernel] [ 2494.166038]
    May 11 10:59:48 [kernel] [ 2494.166039] -> #0 (tasklist_lock){..??}:
    May 11 10:59:48 [kernel] [ 2494.166043]        [<ffffffff802535ab>] __lock_acquire+0xd9b/0x1080
    May 11 10:59:48 [kernel] [ 2494.166050]        [<ffffffff80253922>] lock_acquire+0x92/0xc0
    May 11 10:59:48 [kernel] [ 2494.166057]        [<ffffffff804dede2>] _read_lock+0x32/0x50
    May 11 10:59:48 [kernel] [ 2494.166063]        [<ffffffff80232e95>] is_current_pgrp_orphaned+0x15/0x50
    May 11 10:59:48 [kernel] [ 2494.166071]        [<ffffffff803d5f80>] tty_check_change+0xb0/0x110
    May 11 10:59:48 [kernel] [ 2494.166078]        [<ffffffff803dac5f>] set_termios+0x1f/0x4c0
    May 11 10:59:48 [kernel] [ 2494.166085]        [<ffffffff803db379>] tty_mode_ioctl+0x279/0x3e0
    May 11 10:59:48 [kernel] [ 2494.166092]        [<ffffffff803db51d>] n_tty_ioctl+0x3d/0x260
    May 11 10:59:48 [kernel] [ 2494.166100]        [<ffffffff803d6c34>] tty_ioctl+0x154/0xfe0
    May 11 10:59:48 [kernel] [ 2494.166107]        [<ffffffff802a05e1>] vfs_ioctl+0x31/0x90
    May 11 10:59:48 [kernel] [ 2494.166114]        [<ffffffff802a06b3>] do_vfs_ioctl+0x73/0x2d0
    May 11 10:59:48 [kernel] [ 2494.166121]        [<ffffffff802a095a>] sys_ioctl+0x4a/0x80
    May 11 10:59:48 [kernel] [ 2494.166128]        [<ffffffff8020b5ab>] system_call_after_swapgs+0x7b/0x80
    May 11 10:59:48 [kernel] [ 2494.166135]        [<ffffffffffffffff>] 0xffffffffffffffff
    May 11 10:59:48 [kernel] [ 2494.166142]
    May 11 10:59:48 [kernel] [ 2494.166143] other info that might help us debug this:
    May 11 10:59:48 [kernel] [ 2494.166144]
    May 11 10:59:48 [kernel] [ 2494.166146] 1 lock held by less/7053:
    May 11 10:59:48 [kernel] [ 2494.166148]  #0:  (&tty->ctrl_lock){....}, at: [<ffffffff803d5f31>] tty_check_change+0x61/0x110
    May 11 10:59:48 [kernel] [ 2494.166155]
    May 11 10:59:48 [kernel] [ 2494.166156] stack backtrace:
    May 11 10:59:48 [kernel] [ 2494.166159] Pid: 7053, comm: less Not tainted 2.6.26-rc1-00007-g91b3a7a #217
    May 11 10:59:48 [kernel] [ 2494.166161]
    May 11 10:59:48 [kernel] [ 2494.166162] Call Trace:
    May 11 10:59:48 [kernel] [ 2494.166168]  [<ffffffff80251223>] print_circular_bug_tail+0x83/0x90
    May 11 10:59:48 [kernel] [ 2494.166172]  [<ffffffff80250889>] ? print_circular_bug_entry+0x49/0x60
    May 11 10:59:48 [kernel] [ 2494.166178]  [<ffffffff802535ab>] __lock_acquire+0xd9b/0x1080
    May 11 10:59:48 [kernel] [ 2494.166184]  [<ffffffff80232e95>] ? is_current_pgrp_orphaned+0x15/0x50
    May 11 10:59:48 [kernel] [ 2494.166189]  [<ffffffff80253922>] lock_acquire+0x92/0xc0
    May 11 10:59:48 [kernel] [ 2494.166206]  [<ffffffff803d5f80>] tty_check_change+0xb0/0x110
    May 11 10:59:48 [kernel] [ 2494.166211]  [<ffffffff803dac5f>] set_termios+0x1f/0x4c0
    May 11 10:59:48 [kernel] [ 2494.166216]  [<ffffffff803d3423>] ? tty_ldisc_try+0x23/0x60
    May 11 10:59:48 [kernel] [ 2494.166220]  [<ffffffff803d3444>] ? tty_ldisc_try+0x44/0x60
    May 11 10:59:48 [kernel] [ 2494.166224]  [<ffffffff804df2c5>] ? _spin_unlock_irqrestore+0x65/0x80
    May 11 10:59:48 [kernel] [ 2494.166230]  [<ffffffff803db379>] tty_mode_ioctl+0x279/0x3e0
    May 11 10:59:48 [kernel] [ 2494.166234]  [<ffffffff803d3444>] ? tty_ldisc_try+0x44/0x60
    May 11 10:59:48 [kernel] [ 2494.166239]  [<ffffffff803db51d>] n_tty_ioctl+0x3d/0x260
    May 11 10:59:48 [kernel] [ 2494.166244]  [<ffffffff803d6c34>] tty_ioctl+0x154/0xfe0
    May 11 10:59:48 [kernel] [ 2494.166249]  [<ffffffff80252baa>] ? __lock_acquire+0x39a/0x1080
    May 11 10:59:48 [kernel] [ 2494.166256]  [<ffffffff80252baa>] ? __lock_acquire+0x39a/0x1080
    May 11 10:59:48 [kernel] [ 2494.166263]  [<ffffffff80252baa>] ? __lock_acquire+0x39a/0x1080
    May 11 10:59:48 [kernel] [ 2494.166269]  [<ffffffff802a05e1>] vfs_ioctl+0x31/0x90
    May 11 10:59:48 [kernel] [ 2494.166274]  [<ffffffff802a06b3>] do_vfs_ioctl+0x73/0x2d0
    May 11 10:59:48 [kernel] [ 2494.166280]  [<ffffffff802a095a>] sys_ioctl+0x4a/0x80
    May 11 10:59:48 [kernel] [ 2494.166286]  [<ffffffff8020b5ab>] system_call_after_swapgs+0x7b/0x80
    May 11 10:59:48 [kernel] [ 2494.166292]
    
    Acked-by: Alan Cox <alan at lxorguk.ukuu.org.uk>
    Reported-by: Marcin Slusarz <marcin.slusarz at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit e7e72bf641b1fc7b9df6f40bd2c36dfccd8d647c
Author: Neil Brown <neilb at suse.de>
Date:   Wed May 14 16:05:54 2008 -0700

    Remove blkdev warning triggered by using md
    
    As setting and clearing queue flags now requires that we hold a spinlock
    on the queue, and as blk_queue_stack_limits is called without that lock,
    get the lock inside blk_queue_stack_limits.
    
    For blk_queue_stack_limits to be able to find the right lock, each md
    personality needs to set q->queue_lock to point to the appropriate lock.
    Those personalities which didn't previously use a spin_lock, us
    q->__queue_lock.  So always initialise that lock when allocated.
    
    With this in place, setting/clearing of the QUEUE_FLAG_PLUGGED bit will no
    longer cause warnings as it will be clear that the proper lock is held.
    
    Thanks to Dan Williams for review and fixing the silly bugs.
    
    Signed-off-by: NeilBrown <neilb at suse.de>
    Cc: Dan Williams <dan.j.williams at intel.com>
    Cc: Jens Axboe <jens.axboe at oracle.com>
    Cc: Alistair John Strachan <alistair at devzero.co.uk>
    Cc: Nick Piggin <npiggin at suse.de>
    Cc: "Rafael J. Wysocki" <rjw at sisk.pl>
    Cc: Jacek Luczak <difrost.kernel at gmail.com>
    Cc: Prakash Punnoor <prakash at punnoor.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 4920916f728fe3c51f54c25ab7b3d271254aab5a
Author: Jiri Slaby <jirislaby at gmail.com>
Date:   Wed May 14 16:05:53 2008 -0700

    char: select fw_loader by moxa
    
    Select FW_LOADER since moxa needs it, otherwise we face link problems such
    as:
    
    drivers/built-in.o: In function
    moxa_pci_probe':moxa.c:(.devinit.text+0x76d8): undefined reference to
    request_firmware'
    :moxa.c:(.devinit.text+0x7e6e): undefined reference to release_firmware'
    make: *** [.tmp_vmlinux1] Error 1
    
    Reported-by: Philippe Roussel <p.o.roussel at free.fr>
    Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 76cdd58e558669366adfaded436fda01b30cce3e
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date:   Wed May 14 16:05:52 2008 -0700

    memory_hotplug: always initialize pageblock bitmap
    
    Trying to online a new memory section that was added via memory hotplug
    sometimes results in crashes when the new pages are added via __free_page.
     Reason for that is that the pageblock bitmap isn't initialized and hence
    contains random stuff.  That means that get_pageblock_migratetype()
    returns also random stuff and therefore
    
    	list_add(&page->lru,
    		&zone->free_area[order].free_list[migratetype]);
    
    in __free_one_page() tries to do a list_add to something that isn't even
    necessarily a list.
    
    This happens since 86051ca5eaf5e560113ec7673462804c54284456 ("mm: fix
    usemap initialization") which makes sure that the pageblock bitmap gets
    only initialized for pages present in a zone.  Unfortunately for hot-added
    memory the zones "grow" after the memmap and the pageblock memmap have
    been initialized.  Which means that the new pages have an unitialized
    bitmap.  To solve this the calls to grow_zone_span() and grow_pgdat_span()
    are moved to __add_zone() just before the initialization happens.
    
    The patch also moves the two functions since __add_zone() is the only
    caller and I didn't want to add a forward declaration.
    
    Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
    Cc: Andy Whitcroft <apw at shadowen.org>
    Cc: Dave Hansen <haveblue at us.ibm.com>
    Cc: Gerald Schaefer <gerald.schaefer at de.ibm.com>
    Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
    Cc: Yasunori Goto <y-goto at jp.fujitsu.com>
    Cc: <stable at kernel.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 1c12c4cf9411eb130b245fa8d0fbbaf989477c7b
Author: Venki Pallipadi <venkatesh.pallipadi at intel.com>
Date:   Wed May 14 16:05:51 2008 -0700

    mprotect: prevent alteration of the PAT bits
    
    There is a defect in mprotect, which lets the user change the page cache
    type bits by-passing the kernel reserve_memtype and free_memtype
    wrappers.  Fix the problem by not letting mprotect change the PAT bits.
    
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
    Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Hugh Dickins <hugh at veritas.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 44c81433e8b05dbc85985d939046f10f95901184
Author: Eric Dumazet <dada1 at cosmosbay.com>
Date:   Wed May 14 16:05:51 2008 -0700

    per_cpu: fix DEFINE_PER_CPU_SHARED_ALIGNED for modules
    
    Current module loader lookups ".data.percpu" ELF section to perform
    per_cpu relocation.  But DEFINE_PER_CPU_SHARED_ALIGNED() uses another
    section (".data.percpu.shared_aligned"), currently only handled in
    vmlinux.lds, not by module loader.
    
    To correct this problem, instead of adding logic into module loader, or
    using at build time a module.lds file for all arches to group
    ".data.percpu.shared_aligned" into ".data.percpu", just use ".data.percpu"
    for modules.
    
    Alignment requirements are correctly handled by ld and module loader.
    
    Signed-off-by: Eric Dumazet <dada1 at cosmosbay.com>
    Cc: Rusty Russell <rusty at rustcorp.com.au>
    Cc: Fenghua Yu <fenghua.yu at intel.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit fd8a4221ad76df700ff34875c9fbc42302aa4ba3
Author: Geoff Levand <geoffrey.levand at am.sony.com>
Date:   Wed May 14 16:05:50 2008 -0700

    memory_hotplug: check for walk_memory_resource() failure in online_pages()
    
    Add a check to online_pages() to test for failure of
    walk_memory_resource().  This fixes a condition where a failure
    of walk_memory_resource() can lead to online_pages() returning
    success without the requested pages being onlined.
    
    Signed-off-by: Geoff Levand <geoffrey.levand at am.sony.com>
    Cc: Yasunori Goto <y-goto at jp.fujitsu.com>
    Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
    Cc: Dave Hansen <haveblue at us.ibm.com>
    Cc: Keith Mannthey <kmannth at us.ibm.com>
    Cc: Christoph Lameter <clameter at sgi.com>
    Cc: Paul Jackson <pj at sgi.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 3fc957721d18c93662f7d4dab455b80f53dd2641
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Wed May 14 16:05:49 2008 -0700

    lib: create common ascii hex array
    
    Add a common hex array in hexdump.c so everyone can use it.
    
    Add a common hi/lo helper to avoid the shifting masking that is
    done to get the upper and lower nibbles of a byte value.
    
    Pull the pack_hex_byte helper from kgdb as it is opencoded many
    places in the tree that will be consolidated.
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Acked-by: Paul Mundt <lethal at linux-sh.org>
    Cc: Jason Wessel <jason.wessel at windriver.com>
    Cc: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 122a881c776b7c155bf3f379928cc27aab435288
Author: Robin Getz <robin.getz at analog.com>
Date:   Wed May 14 16:05:48 2008 -0700

    video/logo: add support for Blackfin/Linux logo for framebuffer console
    
    This art design is beautiful, isn't it?  And you can watch our demo on
    YouTube: http://youtube.com/watch?v=fKyQOntPEFs
    
    Signed-off-by: Robin Getz <robin.getz at analog.com>
    Signed-off-by: Bryan Wu <cooloney at kernel.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 7e01c8e5420b6c7f9d85d34c15d8c7a15c9fc720
Author: Tiger Yang <tiger.yang at oracle.com>
Date:   Wed May 14 16:05:47 2008 -0700

    ext3/4: fix uninitialized bs in ext3/4_xattr_set_handle()
    
    This fix the uninitialized bs when we try to replace a xattr entry in
    ibody with the new value which require more than free space.
    
    This situation only happens we format ext3/4 with inode size more than 128 and
    we have put xattr entries both in ibody and block.  The consequences about
    this bug is we will lost the xattr block which pointed by i_file_acl with all
    xattr entires in it.  We will alloc a new xattr block and put that large value
    entry in it.  The old xattr block will become orphan block.
    
    Signed-off-by: Tiger Yang <tiger.yang at oracle.com>
    Cc: <linux-ext4 at vger.kernel.org>
    Cc: Andreas Gruenbacher <agruen at suse.de>
    Acked-by: Andreas Dilger <adilger at sun.com>
    Cc: <stable at kernel.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 0c70814c311581a6c86198db4f982aa683c68fb8
Author: Mirco Tischler <mt-ml at gmx.de>
Date:   Wed May 14 16:05:46 2008 -0700

    cgroups: fix compile warning
    
    Return type of cpu_rt_runtime_write() should be int instead of ssize_t.
    
    Signed-off-by: Mirco Tischler <mt-ml at gmx.de>
    Acked-by: Paul Menage <menage at google.com>
    Cc: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit b7cffc1f29c1bc729bc50c863c87f93f9b70994b
Author: Mike Frysinger <vapier at gentoo.org>
Date:   Wed May 14 16:05:42 2008 -0700

    asm-{alpha,h8300,um,v850,xtensa}/param.h: unbreak HZ for userspace
    
    I noticed this because alpha was broken due to the recent commit commit
    bdc807871d58285737d50dc6163d0feb72cb0dc2 ("avoid overflows in
    kernel/time.c").  Most arches do something like this in their
    asm/param.h:
    
    #ifdef __KERNEL__
    # define HZ CONFIG_HZ
    #else
    # define HZ 100
    #endif
    
    A few arches though (namely alpha/h8300/um/v850/xtensa) either do no set
    HZ at all for !__KERNEL__, or they set it wrongly.  This should bring all
    arches in line by setting up HZ for userspace.
    
    Without this currently perl 5.10 doesn't build on alpha:
    
    perl.c: In function 'perl_construct':
    perl.c:388: error: 'CONFIG_HZ' undeclared (first use in this function)
    -> http://buildd.debian.org/fetch.cgi?pkg=perl;ver=5.10.0-10;arch=alpha;stamp=1210252894
    
    Signed-off-by: Mike Frysinger <vapier at gentoo.org>
    Cc: Richard Henderson <rth at twiddle.net>
    Cc: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
    Cc: Yoshinori Sato <ysato at users.sourceforge.jp>
    Cc: Jeff Dike <jdike at addtoit.com>
    Cc: Chris Zankel <chris at zankel.net>
    Cc: maximilian attems <max at stro.at>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    [ HZ on alpha is 1024 for historical reasons.  - Linus ]
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 772279c5f1dceb58d451dca94b557fd89b1ce890
Author: Mingming Cao <cmm at us.ibm.com>
Date:   Wed May 14 16:05:41 2008 -0700

    jbd: need to hold j_state_lock to updates to transaction t_state to T_COMMIT
    
    Updating the current transaction's t_state is protected by j_state_lock.  We
    need to do the same when updating the t_state to T_COMMIT.
    
    Signed-off-by: Mingming Cao <cmm at us.ibm.com>
    Acked-by: Jan Kara <jack at ucw.cz>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit c3723ca3874a8fc2218c4726d57e3a7da9e83e47
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date:   Wed May 14 16:05:40 2008 -0700

    memory hotplug: memmap_init_zone called twice
    
    __add_zone calls memmap_init_zone twice if memory gets attached to an empty
    zone.  Once via init_currently_empty_zone and once explictly right after that
    call.
    
    Looks like this is currently not a bug, however the call is superfluous and
    might lead to subtle bugs if memmap_init_zone gets changed.  So make sure it
    is called only once.
    
    Cc: Yasunori Goto <y-goto at jp.fujitsu.com>
    Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
    Cc: Dave Hansen <haveblue at us.ibm.com>
    Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 3b7ec117bf6c98f5a845311c4ca5ca020a3d7689
Author: Nate Case <ncase at xes-inc.com>
Date:   Wed May 14 16:05:39 2008 -0700

    ipmi: support I/O resources in OF driver
    
    The current OF probing assumes that the resource is IORESOURCE_MEM.  This
    checks for the IORESOURCE_IO flag and behaves appropriately.  An I/O resource
    can exist with an ipmi device node on a legacy ISA bus.
    
    Signed-off-by: Nate Case <ncase at xes-inc.com>
    Signed-off-by: Corey Minyard <cminyard at mvista.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 90898709dfca860d9550c85f0924007f4c0467ea
Author: Nicolas Ferre <nicolas.ferre at atmel.com>
Date:   Wed May 14 16:05:38 2008 -0700

    atmel_lcdfb: fix initialization of a pre-allocated framebuffer
    
    Fix initialization of framebuffer not calling ioremap_writecombine() function
    and not using internal SRAM for at91sam9rl.
    
    This is a little rework of the "Don't initialize a pre-allocated framebuffer"
    patch that corrects the call to ioremap_writecombine() function.
    
    It also cuts the use of internal SRAM for at91sam9rl : it is a bit small
    for a framebuffer.
    
    Signed-off-by: Nicolas Ferre <nicolas.ferre at atmel.com>
    Cc: Andrew Victor <linux at maxim.org.za>
    Cc: Haavard Skinnemoen <hskinnemoen at atmel.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 3ef0f720e47e895b613b0305eb0a483e3ec11f23
Author: Miklos Szeredi <mszeredi at suse.cz>
Date:   Wed May 14 16:05:37 2008 -0700

    mm: fix infinite loop in filemap_fault
    
    filemap_fault will go into an infinite loop if ->readpage() fails
    asynchronously.
    
    AFAICS the bug was introduced by this commit, which removed the wait after the
    final readpage:
    
       commit d00806b183152af6d24f46f0c33f14162ca1262a
       Author: Nick Piggin <npiggin at suse.de>
       Date:   Thu Jul 19 01:46:57 2007 -0700
    
           mm: fix fault vs invalidate race for linear mappings
    
    Fix by reintroducing the wait_on_page_locked() after ->readpage() to make sure
    the page is up-to-date before jumping back to the beginning of the function.
    
    I've noticed this while testing nfs exporting on fuse.  The patch
    fixes it.
    
    Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
    Cc: Nick Piggin <npiggin at suse.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 3b73a223661ed137c5d3d2635f954382e94f5a43
Author: Rene Herman <rene.herman at keyaccess.nl>
Date:   Wed May 14 16:05:36 2008 -0700

    pnp: add ISAPnP MPU option quirks
    
    The AD181x and AZT230 chips don't support an IRQ-less MPU401 option but
    work fine without one.  This adds (priority functional) IRQ-less options
    for each port option to help systems with few available IRQs.
    
    The AD1815 quirk can't use pnp_register_irq_resource() due to doubly
    penalizing the IRQ.  Also, while not a practical issue due to no IRQ
    option being present for the dependents, this needs to add in front, not
    back.
    
    Doesn't use pnp_register_port_resource() for symetry with above.
    
    This does not delete the AD1815 independent option even though it should
    be empty after the IRQ transfer due to AD1816 coming with an empty but
    still present independent option by default.
    
    Was tested on AD1815, AD1816 and AZT2320.  The ALSA snd-ad1818a driver
    also support the AZT2002 ID for MPU401 but this doesn't as I was unable to
    test it.
    
    Signed-off-by: Rene Herman <rene.herman at gmail.com>
    Tested-by: Uwe Bugla <uwe.bugla at gmx.de>
    Acked-by: Uwe Bugla <uwe.bugla at gmx.de>
    Acked-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
    Cc: Takashi Iwai <tiwai at suse.de>
    Cc: Len Brown <len.brown at intel.com
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit bc033c9b5fd261855278f4ed82c3713cc549afbe
Author: Rene Herman <rene.herman at keyaccess.nl>
Date:   Wed May 14 16:05:34 2008 -0700

    pnp: add pnp_build_option() to the API
    
    The subsequent AD181x quirk patch would like this as part of the API.
    pnp_register_dependent_option() adds to the same dependent chain the quirk is
    walking which is fairly unclean.  This enables a private option chain build
    which it can then just add onto the end when done.
    
    Signed-off-by: Rene Herman <rene.herman at gmail.com>
    Tested-by: Uwe Bugla <uwe.bugla at gmx.de>
    Acked-by: Uwe Bugla <uwe.bugla at gmx.de>
    Acked-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
    Cc: Takashi Iwai <tiwai at suse.de>
    Cc: Len Brown <len.brown at intel.com
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 726a7a3d17f183bd0f93daff4d56953c6af78c57
Author: Rene Herman <rene.herman at gmail.com>
Date:   Wed May 14 16:05:33 2008 -0700

    pnp: clean up pnp_fixup_device()
    
    Make it look a bit more like pci_fixup_device/pci_do_fixups.  Also print
    the PnP ID and delete the () from the "foo+0x0/0x1234()".
    
    Signed-off-by: Rene Herman <rene.herman at gmail.com>
    Tested-by: Uwe Bugla <uwe.bugla at gmx.de>
    Acked-by: Uwe Bugla <uwe.bugla at gmx.de>
    Acked-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
    Cc: Takashi Iwai <tiwai at suse.de>
    Cc: Len Brown <len.brown at intel.com
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 82f55af06af3d9c478292281ac37b48d2c43741e
Author: Jens Rottmann <JRottmann at LiPPERT-AT.de>
Date:   Wed May 14 16:05:32 2008 -0700

    fix "lxfb: extend PLL table to support dotclocks below 25 MHz"
    
    The following patch caused a regression with OLPC panels:
    
     commit 3888d4639e78802c4ec1086127124e890461b9e4
        lxfb: extend PLL table to support dotclocks below 25 MHz
    
        Extends the PLL frequency table of the AMD Geode-LX frame buffer driver to
        make use of the DIV4 bit, thus adding support for dotclocks between 6 and 25
        MHz.  These are needed for small LCDs (e.g.  320x240).  Also inserts some
        intermediate steps between pre-existing frequencies.
    
    The problem was the insertion of intermediate steps into the frequency
    table; they would cause the wrong frequency to be matched.  This patch
    drops those intermediate frequencies while keeping the sub-25MHz
    frequencies.
    
    Signed-off-by: Andres Salomon <dilinger at debian.org>
    Signed-off-by: Jens Rottmann <JRottmann at LiPPERT-AT.de>
    Tested-by: Andres Salomon <dilinger at debian.org>
    Acked-by: Jordan Crouse <jordan.crouse at amd.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 8b8b498836942c0c855333d357d121c0adeefbd9
Author: Eric Dumazet <dada1 at cosmosbay.com>
Date:   Wed May 14 16:05:31 2008 -0700

    oprofile: don't request cache line alignment for cpu_buffer
    
    Alignment was previously requested because cpu_buffer was an [NR_CPUS]
    array, to avoid cache line sharing between CPUS.
    
    After commit 608dfddd845da5ab6accef70154c8910529699f7 (oprofile: change
    cpu_buffer from array to per_cpu variable ), we dont need to force an
    alignement anymore since cpu_buffer sits in per_cpu zone.
    
    Signed-off-by: Eric Dumazet <dada1 at cosmosbay.com>
    Cc: Mike Travis <travis at sgi.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit f7c5a770e6006ae2b5f4fd0491565b69e4d4bb48
Author: Sebastian Siewior <bigeasy at linutronix.de>
Date:   Wed May 14 16:05:30 2008 -0700

    m68knommu: add info about removing mcfserial
    
    Schedule a removal for this driver. Alternative driver is available for
    a while now.
    
    Signed-off-by: Sebastian Siewior <bigeasy at linutronix.de>
    Acked-by: Greg Ungerer <gerg at uclinux.org>
    Acked-by: Alan Cox <alan at redhat.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 57cc097931e2d28a27e19515c549dc301ba6b6b2
Author: Grant Likely <grant.likely at secretlab.ca>
Date:   Wed May 14 16:05:29 2008 -0700

    mpc5200_psc_spi: typo fix in header block
    
    Signed-off-by: Grant Likely <grant.likely at secretlab.ca>
    Acked-by: David Brownell <david-b at pacbell.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

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

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

commit 887b3ece65be7b643dfdae0d433c91a26a3f437d
Author: Eric Van Hensbergen <ericvh at opteron.9grid.us>
Date:   Thu May 8 20:26:37 2008 -0500

    9p: fix error path during early mount
    
    There was some cleanup issues during early mount which would trigger
    a kernel bug for certain types of failure.  This patch reorganizes the
    cleanup to get rid of the bad behavior.
    
    This also merges the 9pnet and 9pnet_fd modules for the purpose of
    configuration and initialization.  Keeping the fd transport separate
    from the core 9pnet code seemed like a good idea at the time, but in
    practice has caused more harm and confusion than good.
    
    Signed-off-by: Eric Van Hensbergen <ericvh at gmail.com>

commit 332c421e67045343de74e644cdf389f559f0d83f
Author: Eric Van Hensbergen <ericvh at opteron.9grid.us>
Date:   Sat May 3 17:29:26 2008 -0500

    9p: make cryptic unknown error from server less scary
    
    Right now when we get an error string from the server that we can't
    map we report a cryptic error that actually makes it look like we are
    reporting a problem with the client.  This changes the text of the log
    message to clarify where the error is coming from.
    
    Signed-off-by: Eric Van Hensbergen <ericvh at gmail.com>

commit d0c447180bfcb1db8d59e6ddb10f0346bd7d29e9
Author: Steven Rostedt <rostedt at goodmis.org>
Date:   Sat May 3 17:29:50 2008 -0500

    9p: fix flags length in net
    
    Some files in the net/9p directory uses "int" for flags. This can
    cause hard to find bugs on some architectures. This patch converts the
    flags to use "long" instead.
    
    This bug was discovered by doing an allyesconfig make on the -rt kernel
    where checks are done to ensure all flags are of size sizeof(long).
    
    Signed-off-by: Steven Rostedt <srostedt at redhat.com>
    Acked-by: Eric Van Hensbergen <ericvh at gmail.com>

commit 728fc4ef17748042d9c71144aa339ed9c68e8b01
Author: Josef 'Jeff' Sipek <jeffpc at josefsipek.net>
Date:   Fri Mar 7 11:40:33 2008 -0600

    9p: Correct fidpool creation failure in p9_client_create
    
    On error, p9_idpool_create returns an ERR_PTR-encoded errno.
    
    Signed-off-by: Josef 'Jeff' Sipek <jeffpc at josefsipek.net>
    Acked-by: Eric Van Hensbergen <ericvh at gmail.com>

commit c1549497e903a1ffa1c5808337a987180e480e7a
Author: Josef 'Jeff' Sipek <jeffpc at josefsipek.net>
Date:   Fri Mar 7 11:39:13 2008 -0600

    9p: use struct mutex instead of struct semaphore
    
    Replace semaphores protecting use flags with a mutex.
    
    Signed-off-by: Josef 'Jeff' Sipek <jeffpc at josefsipek.net>
    Acked-by: Eric Van Hensbergen <ericvh at gmail.com>

commit bb8ffdfc3e3b32ad9fcdb8da289088d3b22794e5
Author: Eric Van Hensbergen <ericvh at ericvh-desktop.(none)>
Date:   Fri Mar 7 10:53:53 2008 -0600

    9p: propagate parse_option changes to client and transports
    
    Propagate changes that were made to the parse_options code to the
    other parse options pieces present in the other modules.  Looks like
    the client parse options was probably corrupting the parse string
    and causing problems for others.
    
    Signed-off-by: Eric Van Hensbergen <ericvh at gmail.com>

commit ab31267dfeddf80b2e483f077c8b03905993722b
Author: Jim Meyering <jim at meyering.net>
Date:   Thu Mar 6 17:10:28 2008 -0600

    fs/9p/v9fs.c (v9fs_parse_options): Handle kstrdup and match_strdup failure. Now that this function can fail, return an int, diagnose other option-parsing failures, and adjust the sole caller: (v9fs_session_init): Handle kstrdup failure. Propagate any new v9fs_parse_options failure "up".
    
    Signed-off-by: Jim Meyering <meyering at redhat.com>
    Cc: Ron Minnich <rminnich at sandia.gov>
    Cc: Latchesar Ionkov <lucho at ionkov.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Acked-by: Eric Van Hensbergen <ericvh at gmail.com>

commit ee443996a35c1e04f210cafd43d5a98d41e46085
Author: Eric Van Hensbergen <ericvh at ericvh-desktop.(none)>
Date:   Wed Mar 5 07:08:09 2008 -0600

    9p: Documentation updates
    
    The kernel-doc comments of much of the 9p system have been in disarray since
    reorganization.  This patch fixes those problems, adds additional documentation
    and a template book which collects the 9p information.
    
    Signed-off-by: Eric Van Hensbergen <ericvh at gmail.com>

commit b32a09db4fb9a87246ba4e7726a979ac4709ad97
Author: Markus Armbruster <armbru at redhat.com>
Date:   Tue Feb 26 09:57:11 2008 -0600

    add match_strlcpy() us it to make v9fs make uname and remotename parsing more robust
    
    match_strcpy() is a somewhat creepy function: the caller needs to make sure
    that the destination buffer is big enough, and when he screws up or
    forgets, match_strcpy() happily overruns the buffer.
    
    There's exactly one customer: v9fs_parse_options().  I believe it currently
    can't overflow its buffer, but that's not exactly obvious.
    
    The source string is a substing of the mount options.  The kernel silently
    truncates those to PAGE_SIZE bytes, including the terminating zero.  See
    compat_sys_mount() and do_mount().
    
    The destination buffer is obtained from __getname(), which allocates from
    name_cachep, which is initialized by vfs_caches_init() for size PATH_MAX.
    
    We're safe as long as PATH_MAX <= PAGE_SIZE.  PATH_MAX is 4096.  As far as
    I know, the smallest PAGE_SIZE is also 4096.
    
    Here's a patch that makes the code a bit more obviously correct.  It
    doesn't depend on PATH_MAX <= PAGE_SIZE.
    
    Signed-off-by: Markus Armbruster <armbru at redhat.com>
    Cc: Latchesar Ionkov <lucho at ionkov.net>
    Cc: Jim Meyering <meyering at redhat.com>
    Cc: "Randy.Dunlap" <rdunlap at xenotime.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Eric Van Hensbergen <ericvh at gmail.com>

commit 3fb2c74ee20b77affd494c6b8ce7928d0ebbb62e
Author: Prarit Bhargava <prarit at redhat.com>
Date:   Wed May 14 12:00:24 2008 -0400

    [IA64] Properly unregister legacy interrupts
    
    acpi_unregister_gsi() should "undo" what acpi_register_gsi() does.
    
    On systems that have legacy interrupts, acpi_unregister_gsi erroneously calls
    iosapci_unregister_intr() which is wrong to do and causes a loud warning.
    
    acpi_unregister_gsi() should just return in these cases.
    
    Signed-off-by: Prarit Bhargava <prarit at redhat.com>
    Signed-off-by: Tony Luck <tony.luck at intel.com>

commit 7af1d7532b6cf905230c72c67ad85a480b122374
Author: Simon Holm Thøgersen <odie at cs.aau.dk>
Date:   Mon May 12 17:40:50 2008 +0200

    [IA64] Remove NULL pointer check for argument never passed as NULL.
    
    There is only palinfo_handle_smp as (indirect) user of palinfo_smp_call (by
    way of smp_call_function_single) and surely palinfo_handle_smp never pass
    NULL as parameter for info.
    
    Signed-off-by: Simon Holm Thøgersen <odie at cs.aau.dk>
    Signed-off-by: Tony Luck <tony.luck at intel.com>

commit 0fb232fdb2a2674003ef4b874034e872b7256aa9
Author: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Date:   Fri May 9 15:27:09 2008 +0900

    [IA64] trivial cleanup for perfmon.c
    
    Fix a typo, and coding style cleanups for pfm_handle_work().
    
    Signed-off-by: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
    Signed-off-by: Tony Luck <tony.luck at intel.com>

commit 2e513fe4903c62450a9f8c3759f75bc4cd7e4dfd
Author: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Date:   Fri May 9 15:26:51 2008 +0900

    [IA64] trivial cleanup for entry.S
    
    This patch does:
     - make comment at next to resched check more robust
     - move "re-check" comments to next to where change predicate regs
    
    Signed-off-by: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
    Signed-off-by: Tony Luck <tony.luck at intel.com>

commit 3633c7308005e8c1dab594f69ef904424f8b639a
Author: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Date:   Fri May 9 15:26:35 2008 +0900

    [IA64] fix interrupt masking for pending works on kernel leave
    
    [Bug-fix for "[BUG?][2.6.25-mm1] sleeping during IRQ disabled"]
    
    This patch does:
     - enable interrupts before calling schedule() as same as others, ex. x86
     - enable interrupts during ia64_do_signal() and ia64_sync_krbs()
     - do_notify_resume_user() is still called with interrupts disabled, since
       we can take short path of fsys_mode if-statement quickly.
     - pfm_handle_work() is also called with interrupts disabled, since
       it can deal interrupt mask within itself.
     - fix/add some comments/notes
    
    Reported-by: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
    Signed-off-by: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
    Signed-off-by: Tony Luck <tony.luck at intel.com>

commit f13ae30e1397e3bfb38feb3b6e889af5d021f13d
Author: Alex Chiang <achiang at hp.com>
Date:   Thu May 8 14:03:23 2008 -0600

    [IA64] allow user to force_pal_cache_flush
    
    The sequence executed in check_sal_cache_flush:
    
    	- pend a timer interrupt
    	- call SAL_CACHE_FLUSH
    	- see if interrupt is still pending
    
    can hang HP machines with buggy SAL_CACHE_FLUSH implementations.
    
    Provide a kernel command-line argument to allow users skip this
    check if desired. Using this parameter will force ia64_sal_cache_flush
    to call ia64_pal_cache_flush() instead of SAL_CACHE_FLUSH.
    
    Signed-off-by: Alex Chiang <achiang at hp.com>
    Signed-off-by: Tony Luck <tony.luck at intel.com>

commit 8a3360f06cd4d3b1d57f73e029f2f8b6057fdcba
Author: Bernhard Walle <bwalle at suse.de>
Date:   Wed May 14 15:40:40 2008 -0700

    [IA64] Don't reserve crashkernel memory > 4 GB
    
    Some IA64 machines map all cell-local memory above 4 GB (32 bit limit).
    However, in most cases, the kernel needs some memory below that limit that is
    DMA-capable. So in this machine configuration, the crashkernel will be reserved
    above 4 GB.
    
    For machines that use SWIOTLB implementation because they lack an I/O MMU
    the low memory is required by the SWIOTLB implementation. In that case,
    it doesn't make sense to reserve the crashkernel at all because it's unusable
    for kdump.
    
    A special case is the "hpzx1" machine vector. In theory, it has a I/O MMU, so
    it can be booted above 4 GB. However, in the kdump case that is not possible
    because of changeset 51b58e3e26ebfb8cd56825c4b396ed251f51dec9:
    
        On HP zx1 machines, the 'machvec=dig' parameter is needed for the kdump
        kernel to avoid problems with the HP sba iommu.  The problem is that during
        the boot of the kdump kernel, the iommu is re-initialized, so in-flight DMA
        from improperly shutdown drivers causes an IOTLB miss which leads to an
        MCA.  With kdump, the idea is to get into the kdump kernel with as little
        code as we can, so shutting down drivers properly is not an option.
    
        The workaround is to add 'machvec=dig' to the kdump kernel boot parameters.
        This makes the kdump kernel avoid using the sba iommu altogether, leaving
        the IOTLB intact.  Any ongoing DMA falls harmlessly outside the kdump
        kernel.  After the kdump kernel reboots, all devices will have been
        shutdown properly and DMA stopped.
    
    This patch pushes that functionality into the sba iommu initialization
    code, so that users won't have to find the obscure documentation telling
    them about 'machvec=dig'.
    
    This means that also for hpzx1 it's not possible to boot when all
    memory is above the 4 GB limit. So the only machine vectors that can handle
    this case are "sn2" and "uv".
    
    Signed-off-by: Bernhard Walle <bwalle at suse.de>
    Signed-off-by: Tony Luck <tony.luck at intel.com>

commit db973ffa11030e032acde47b4d6e958064311166
Merge: dd286422fefdcff784e8d336deeb88ce817e14db cafa027b8cc6f605ccebc43a960644307a12d8dd
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed May 14 14:29:34 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
      cs5520: disable VDMA
      ide/Kconfig: couple of fixes
      alim15x3: remove WDC_ALI15X3 config option
      alim15x3: add "wdc_udma" module parameter
      alim15x3: remove stale warning about ATI RS100 northbridge
      alim15x3: trivial cleanup for ali_set_pio_mode()
      make ide-iops.c:SELECT_MASK() static
      SWARM IDE: Fix up following changes to ide_hwif_t

commit 2224661494278bfc1c35b392cf6ee6f58e1d5e64
Author: Jack Steiner <steiner at sgi.com>
Date:   Tue May 6 15:18:57 2008 -0500

    [IA64] machvec support for SGI UV platform
    
    This patch adds the basic IA64 machvec infrastructure to support
    the SGI "UV" platform.
    
    Signed-off-by: Jack Steiner <steiner at sgi.com>
    Signed-off-by: Tony Luck <tony.luck at intel.com>

commit 7868f1ed84696d3cca83558e8dd459f20a36d077
Author: Jack Steiner <steiner at sgi.com>
Date:   Tue May 6 15:18:55 2008 -0500

    [IA64] Add header files for SGI UV platform
    
    Add new UV-specific header files.
    
    Signed-off-by: Jack Steiner <steiner at sgi.com>
    Signed-off-by: Tony Luck <tony.luck at intel.com>

commit cafa027b8cc6f605ccebc43a960644307a12d8dd
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date:   Wed May 14 23:06:16 2008 +0200

    cs5520: disable VDMA
    
    Disable Virtual DMA support for now (it causes system hangs).
    
    Thanks to TAKADA Yoshihito for the help with debugging the problem.
    
    Reported-by: TAKADA Yoshihito <takada at mbf.nifty.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>

commit 64afc31f8976bda66e82a41aacb1f7e427fb179e
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date:   Wed May 14 23:06:16 2008 +0200

    ide/Kconfig: couple of fixes
    
    * Don't ask to enable no longer existing config options
      ("Use DMA by default when available" and "Special UDMA Feature").
    
    * PIIX host driver doesn't support Victory66 chipset.
    
    * "ide0=cmd640_vlb" -> "cmd640.probe_vlb"
    
    * "ide=doubler" -> "gayle.doubler"
    
    * Amiga IDE doubler support is a feature for gayle host driver
      not a separate host driver.
    
    * Remove Andre's mail.
    
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>

commit e7f379d5cabb2790ecce5d623382fa6085e7686d
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date:   Wed May 14 23:06:16 2008 +0200

    alim15x3: remove WDC_ALI15X3 config option
    
    There is "wdc_udma" module parameter now.
    
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>

commit 63b1623ef0e33160d782fd1b0044e9a8af5d16cf
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date:   Wed May 14 23:06:16 2008 +0200

    alim15x3: add "wdc_udma" module parameter
    
    Add "wdc_udma" module parameter for allowing UDMA transfers
    on M1543C-E chipset for WDC disks.
    
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>

commit 2bf111d97a8c05d3fe436caaf18ba0634c9ab33d
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date:   Wed May 14 23:06:16 2008 +0200

    alim15x3: remove stale warning about ATI RS100 northbridge
    
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>

commit df98668f178c39c54bc7b9cd3adb99cbd7ed8ada
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date:   Wed May 14 23:06:15 2008 +0200

    alim15x3: trivial cleanup for ali_set_pio_mode()
    
    Remove commented out code and stale comment.
    
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>

commit e0b4eb5193fed5c63413b0c137be29b0477d15ca
Author: Adrian Bunk <bunk at kernel.org>
Date:   Wed May 14 23:06:15 2008 +0200

    make ide-iops.c:SELECT_MASK() static
    
    SELECT_MASK() can now become static.
    
    [bart: remove space between function name and open parenthesis]
    
    Signed-off-by: Adrian Bunk <bunk at kernel.org>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>

commit 4d4423caaa1b9ca709ef6a911a030a3b6e68c46b
Author: Maciej W. Rozycki <macro at linux-mips.org>
Date:   Wed May 14 23:06:14 2008 +0200

    SWARM IDE: Fix up following changes to ide_hwif_t
    
     Following recent changes to ide_hwif_t update the SWARM IDE driver to use
    hw_regs_t to initialize port mapping.  Plus minor layout adjustments along
    the lines of other drivers.
    
    Signed-off-by: Maciej W. Rozycki <macro at linux-mips.org>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>

commit dd286422fefdcff784e8d336deeb88ce817e14db
Merge: 4717df58304b60ac26cdb157d57f39ae1e3a336f a58e58fafdff4c25949221e46132e86f709d0b79
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed May 14 13:32:43 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
      RDMA/cxgb3: Wrap the software send queue pointer as needed on flush
      IB/ipath: Change ipath_devdata.ipath_sdma_status to be unsigned long
      IB/ipath: Make ipath_portdata work with struct pid * not pid_t
      IB/ipath: Fix RDMA read response sequence checking
      IB/ipath: Fix many locking issues when switching to error state
      IB/ipath: Fix RC and UC error handling
      RDMA/nes: Fix up nes_lro_max_aggr module parameter

commit 4717df58304b60ac26cdb157d57f39ae1e3a336f
Merge: fc99824c427ed998e3c5e376bd9c640fde1c407c c2b7bbea83b239b1877f3cafe0cdcbbd08e65648
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed May 14 13:31:25 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (70 commits)
      V4L/DVB (7900): pvrusb: Fix Kconfig if DVB=m V4L_core=y
      V4L/DVB (7899): Fixes a few remaining Kbuild issues at common/tuners
      V4L/DVB (7898): Fix VIDEO_MEDIA Kconfig logic
      V4L/DVB (7895): tveeprom: update Hauppauge analog audio and video decoders
      V4L/DVB (7893): xc5000: bug-fix: allow multiple devices in a single system
      V4L/DVB (7891): cx18/ivtv: fix open() kernel oops
      V4L/DVB (7890): cx18: removed bogus and confusing conditional
      V4L/DVB (7889): cx18: improve HVR-1600 detection.
      V4L/DVB (7888): cx18: minor card definition updates.
      V4L/DVB (7887): cx18: fix Compro H900 analog support.
      V4L/DVB (7881): saa7134: fixed a compile warning in saa7134-core.c
      V4L/DVB (7880): saa7134: remove explicit GPIO initialization
      V4L/DVB(7879): Adding cx18 Support for mxl5005s
      V4L/DVB(7878): mxl55005s: Makefile and Kconfig additions
      V4L/DVB(7877): mxl5005s: Ensure debug is off
      V4L/DVB(7876): mxl5005s: Remove incorrect copyright holders
      V4L/DVB(7875): mxl5005s: Remove redundant functions
      V4L/DVB(7874): mxl5005s: Fix function statics
      V4L/DVB(7873): mxl5005s: Fix header includes.
      V4L/DVB(7872): mxl5005s: checkpatch.pl compliance
      ...

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

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

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

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

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

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

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

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

commit fc99824c427ed998e3c5e376bd9c640fde1c407c
Merge: e90a4e475a8b34adbefe189c9d0932fa0b7b750f 0a3ad00ca09632c6d0675f606276e92bdf1b306c
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed May 14 11:13:44 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: struct class remove children list
      block: do_mounts - accept root=<non-existant partition>

commit e90a4e475a8b34adbefe189c9d0932fa0b7b750f
Merge: 6aa5fc434958d15a4d66d922d0416dfb03c07def 405177070614f35133304d4daa1332afeb83ffa2
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed May 14 10:52:40 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: (22 commits)
      USB: atmel_usba_udc fixes, mostly disconnect()
      USB: pxa27x_udc: minor fixes
      usbtest: comment on why this code "expects" negative and positive errnos
      USB: remove PICDEM FS USB demo (04d8:000c) device from ldusb
      USB: option: add new Dell 5520 HSDPA variant
      USB: unusual_devs: Add support for GI 0401 SD-Card interface
      USB: serial gadget: descriptor cleanup
      USB: serial gadget: simplify endpoint handling
      USB: serial gadget: remove needless data structure
      USB: serial gadget: cleanup/reorg
      usb: fix compile warning in isp1760
      USB: do not handle device 1410:5010 in 'option' driver
      USB: Fix unusual_devs.h ordering
      USB: add Zoom Telephonics Model 3095F V.92 USB Mini External modem to cdc-acm
      USB: Support for the ET502HS HDSPA modem in option driver
      USB: Support for the ET502HS HDSPA modem
      usb: fix integer as NULL pointer warnings found by sparse
      USB: isp1760: fix printk format
      USB: add Telstra NextG CDMA id to option driver
      USB: add association.h
      ...

commit 0a3ad00ca09632c6d0675f606276e92bdf1b306c
Author: Dave Young <hidave.darkstar at gmail.com>
Date:   Fri May 9 15:24:08 2008 +0800

    Driver core: struct class remove children list
    
    because of the class_device was removed, now do the children list removing
    
    Signed-off-by: Dave Young <hidave.darkstar at gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 30f2f0eb4bd2c43d10a8b0d872c6e5ad8f31c9a0
Author: Kay Sievers <kay.sievers at vrfy.org>
Date:   Tue May 6 22:31:33 2008 +0200

    block: do_mounts - accept root=<non-existant partition>
    
    Some devices, like md, may create partitions only at first access,
    so allow root= to be set to a valid non-existant partition of an
    existing disk. This applies only to non-initramfs root mounting.
    
    This fixes a regression from 2.6.24 which did allow this to happen and
    broke some users machines :(
    
    Acked-by: Neil Brown <neilb at suse.de>
    Tested-by: Joao Luis Meloni Assirati <assirati at nonada.if.usp.br>
    Cc: stable <stable at kernel.org>
    Signed-off-by: Kay Sievers <kay.sievers at vrfy.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 6aa5fc434958d15a4d66d922d0416dfb03c07def
Merge: 362a61ad61199e19a61b8e432015e2586b288f5b 9ee6b7f1556e7889eff4666483b1b554d4686cd4
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed May 14 10:08:24 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: (73 commits)
      net: Fix typo in net/core/sock.c.
      ppp: Do not free not yet unregistered net device.
      netfilter: xt_iprange: module aliases for xt_iprange
      netfilter: ctnetlink: dump conntrack ID in event messages
      irda: Fix a misalign access issue. (v2)
      sctp: Fix use of uninitialized pointer
      cipso: Relax too much careful cipso hash function.
      tcp FRTO: work-around inorder receivers
      tcp FRTO: Fix fallback to conventional recovery
      New maintainer for Intel ethernet adapters
      DM9000: Use delayed work to update MII PHY state
      DM9000: Update and fix driver debugging messages
      DM9000: Add __devinit and __devexit attributes to probe and remove
      sky2: fix simple define thinko
      [netdrvr] sfc: sfc: Add self-test support
      [netdrvr] sfc: Increment rx_reset when reported as driver event
      [netdrvr] sfc: Remove unused macro EFX_XAUI_RETRAIN_MAX
      [netdrvr] sfc: Fix code formatting
      [netdrvr] sfc: Remove kernel-doc comments for removed members of struct efx_nic
      [netdrvr] sfc: Remove garbage from comment
      ...

commit 362a61ad61199e19a61b8e432015e2586b288f5b
Author: Nick Piggin <npiggin at suse.de>
Date:   Wed May 14 06:37:36 2008 +0200

    fix SMP data race in pagetable setup vs walking
    
    There is a possible data race in the page table walking code. After the split
    ptlock patches, it actually seems to have been introduced to the core code, but
    even before that I think it would have impacted some architectures (powerpc
    and sparc64, at least, walk the page tables without taking locks eg. see
    find_linux_pte()).
    
    The race is as follows:
    The pte page is allocated, zeroed, and its struct page gets its spinlock
    initialized. The mm-wide ptl is then taken, and then the pte page is inserted
    into the pagetables.
    
    At this point, the spinlock is not guaranteed to have ordered the previous
    stores to initialize the pte page with the subsequent store to put it in the
    page tables. So another Linux page table walker might be walking down (without
    any locks, because we have split-leaf-ptls), and find that new pte we've
    inserted. It might try to take the spinlock before the store from the other
    CPU initializes it. And subsequently it might read a pte_t out before stores
    from the other CPU have cleared the memory.
    
    There are also similar races in higher levels of the page tables. They
    obviously don't involve the spinlock, but could see uninitialized memory.
    
    Arch code and hardware pagetable walkers that walk the pagetables without
    locks could see similar uninitialized memory problems, regardless of whether
    split ptes are enabled or not.
    
    I prefer to put the barriers in core code, because that's where the higher
    level logic happens, but the page table accessors are per-arch, and open-coding
    them everywhere I don't think is an option. I'll put the read-side barriers
    in alpha arch code for now (other architectures perform data-dependent loads
    in order).
    
    Signed-off-by: Nick Piggin <npiggin at suse.de>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 73f10281ea96d7e8b4fc1c5d755a7c8eb484155b
Author: Nick Piggin <npiggin at suse.de>
Date:   Wed May 14 06:35:11 2008 +0200

    read_barrier_depends arch fixlets
    
    read_barrie_depends has always been a noop (not a compiler barrier) on all
    architectures except SMP alpha. This brings UP alpha and frv into line with all
    other architectures, and fixes incorrect documentation.
    
    Signed-off-by: Nick Piggin <npiggin at suse.de>
    Acked-by: Paul E. McKenney <paulmck at linux.vnet.ibm.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 405177070614f35133304d4daa1332afeb83ffa2
Author: David Brownell <david-b at pacbell.net>
Date:   Sat May 10 22:46:38 2008 -0700

    USB: atmel_usba_udc fixes, mostly disconnect()
    
    Various fixes to Atmel's high speed UDC driver.
    
      * Issue some missing disconnect() calls.  Currently they are only made
        when VBUS power goes away (on boards where the driver can sense such
        changes), but that's not enough for gadget drivers to clean out all
        the state that's needed.  Missing calls were:
    
          - After USB reset, before starting enumeration.
          - When unregistering a gadget driver, before unbind().
    
      * Don't assume gadget drivers provide disconnect callbacks; make sure
        to not call through a null pointer!
    
      * When the driver doesn't provide an unbind() callback, refuse to
        unregister it.
    
    Also remove two bogus "error" messages:
    
      * Related to mis-handling of disconnect() ... don't emit error messages
        for disconnect() handlers that disable endpoints.  All of them should
        be doing that; the problem is (unfixed) oddness in atmel_usba_udc.
    
      * Don't emit a diagnostic for a curious and transient nonfatal error
        that shows up sometimes with EP0.
    
    Those messages spammed syslog, for no good reason.
    
    Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
    Acked-by: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 5a59bc544d00923ff715e2fe68ea537153f52dda
Author: Robert Jarzmik <rjarzmik at free.fr>
Date:   Mon May 12 10:47:56 2008 -0700

    USB: pxa27x_udc: minor fixes
    
    Minor fixes to pxa27x udc driver :
     - don't clobber driver model bus_id field
     - wrong endianess fix (no functional change; cpu is little-endian)
     - double udc disable fix
     - resume/suspend fix (OTG hold bit)
     - make driver pxa27x dependant (check cpu at runtime)
    
    Signed-off-by: Robert Jarzmik <rjarzmik at free.fr>
    Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 6def755320a214ae149ad6bc69eb8c1d7887e678
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date:   Mon May 12 20:17:25 2008 +0200

    usbtest: comment on why this code "expects" negative and positive errnos
    
    On Mon, May 12, 2008 at 01:02:22AM -0700, David Brownell wrote:
    > On Sunday 11 May 2008, Marcin Slusarz wrote:
    > >
    > > test_ctrl_queue expects (?) positive and negative errnos.
    > > what is going on here?
    >
    > The sign is just a way to flag something:
    >
    >                 /* some faults are allowed, not required */
    >
    > The negative ones are required.  Positive codes are optional,
    > in the sense that, depending on how the peripheral happens
    > to be implemented, they won't necessarily be triggered.
    >
    > For example, the test to fetch a device qualifier desriptor
    > must succeed if the device is running at high speed.  So that
    > test is marked as negative.  But when it's full speed, it
    > could legitimately fail; marked as positive.  And so on for
    > other tests.
    >
    > Look at how the codes are *interpreted* to see it work.
    
    Lets document it.
    
    Based on comment from David Brownell <david-b at pacbell.net>.
    
    Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
    Cc: David Brownell <david-b at pacbell.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 5fc89390f74ac42165db477793fb30f6a200e79c
Author: Xiaofan Chen <xiaofanc at gmail.com>
Date:   Tue May 13 21:52:00 2008 +0800

    USB: remove PICDEM FS USB demo (04d8:000c) device from ldusb
    
    Microchip has changed the PICDEM FS USB demo device (0x04d8:000c)
    to use bulk transfer and not interrupt transfer. So I've updated the libusb
    based program here (Post #31).
    	http://forum.microchip.com/tm.aspx?m=106426&mpage=2
    
    So I believe that the in-kernel ldusb driver will no longer work with the
    demo firmware.  It should be removed.
    
    
    Signed-off-by: Xiaofan Chen <xiaofanc at gmail.com>
    Cc: Michael Hund <MHund at LD-Didactic.de>
    Cc: stable <stable at kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 96cb15cf977356d9d3117dd88f3fe187d6024f4b
Author: Dan Williams <dcbw at redhat.com>
Date:   Tue May 13 12:53:45 2008 -0400

    USB: option: add new Dell 5520 HSDPA variant
    
    New variant of the 5520 found by Luke Sheldrick.
    
    Signed-off-by: Dan Williams <dcbw at redhat.com>
    Cc: stable <stable at kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit e7c6f80fd733218aa1e79efa5d9ece9f76966160
Author: Filip Aben <f.aben at option.com>
Date:   Thu May 8 10:48:12 2008 -0700

    USB: unusual_devs: Add support for GI 0401 SD-Card interface
    
    Enables the SD-Card interface on the GI 0401 HSUPA card from Option.
    
    The unusual_devs.h entry is necessary because the device descriptor is
    vendor-specific. That prevents usb-storage from binding to it as an
    interface driver.
    
    This revised patch adds a small comment explaining why and reduces the
    rev range.
    
    T:  Bus=02 Lev=01 Prnt=01 Port=06 Cnt=01 Dev#=  3 Spd=480 MxCh= 0
    D:  Ver= 2.00 Cls=ff(vend.) Sub=ff Prot=ff MxPS=64 #Cfgs=  1
    P:  Vendor=0af0 ProdID=7401 Rev= 0.00
    S:  Manufacturer=Option N.V.
    S:  Product=Globetrotter HSUPA Modem
    C:* #Ifs=10 Cfg#= 1 Atr=80 MxPwr=500mA
    I:* If#= 0 Alt= 0 #EPs= 0 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    I:  If#= 0 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    E:  Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
    E:  Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms
    I:* If#= 1 Alt= 0 #EPs= 0 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    I:  If#= 1 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    E:  Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
    E:  Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms
    I:* If#= 2 Alt= 0 #EPs= 0 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    I:  If#= 2 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    E:  Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
    E:  Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms
    I:* If#= 3 Alt= 0 #EPs= 0 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    I:  If#= 3 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    E:  Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
    E:  Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms
    I:* If#= 4 Alt= 0 #EPs= 0 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    I:  If#= 4 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    E:  Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
    E:  Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms
    I:* If#= 5 Alt= 0 #EPs= 0 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    I:  If#= 5 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    E:  Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
    E:  Ad=06(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms
    I:* If#= 6 Alt= 0 #EPs= 0 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    I:  If#= 6 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    E:  Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
    E:  Ad=07(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms
    I:* If#= 7 Alt= 0 #EPs= 0 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    I:  If#= 7 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    E:  Ad=88(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
    E:  Ad=08(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms
    I:* If#= 8 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
    E:  Ad=89(I) Atr=03(Int.) MxPS=  64 Ivl=2ms
    E:  Ad=8a(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
    E:  Ad=09(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms
    I:* If#= 9 Alt= 0 #EPs= 2 Cls=08(stor.) Sub=06 Prot=50 Driver=usb-storage
    E:  Ad=0a(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
    E:  Ad=8b(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
    
    Signed-off-by: Filip Aben <f.aben at option.com>
    Signed-off-by: Phil Dibowitz <phil at ipom.com>
    Cc: stable <stable at kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit b9370332f4879360ef7126f7a19c660e87084290
Author: David Brownell <david-b at pacbell.net>
Date:   Wed May 7 14:27:37 2008 -0700

    USB: serial gadget: descriptor cleanup
    
    Bugfix some serial gadget descriptors:
    
     - Stop mangling the low bits (controller type ID) of bcdDevice;
       just use the high bits for a driver revision code.
    
     - Serial numbers that aren't specific to individual devices
       are useless; stop reporting "0" for this.
    
     - Since it's not part of a CDC-conformant function, the "bulk only"
       configuration shouldn't be using "CDC Data" as its interface class.
       Switch over to using CLASS_VENDOR_SPEC (different value, 0xff).
    
    Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
    Cc: Al Borchers <alborchers at steinerpoint.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 734d37c654569f03156f8603a9761c402a73aa20
Author: David Brownell <david-b at pacbell.net>
Date:   Wed May 7 14:25:24 2008 -0700

    USB: serial gadget: simplify endpoint handling
    
    Switch serial gadget away from a *very* old idiom:  just remember
    the endpoints we'll be using, instead of looking them up by name
    each time.  This is a net code and data (globals) shrink.
    
    Also fix a small memory leak in the rmmod path, by working the
    same as the disconnect code.
    
    Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
    Cc: Al Borchers <alborchers at steinerpoint.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 2c2d28a015f0dd36c5d1a06e16923e3142574066
Author: David Brownell <david-b at pacbell.net>
Date:   Wed May 7 14:24:10 2008 -0700

    USB: serial gadget: remove needless data structure
    
    This removes a needless data structure from the serial gadget code;
    it's a small code shrink, and a larger data shrink.
    
    Since "struct usb_request" already has a "struct list_head" reserved
    for use by gadget drivers, the serial gadget code doesn't need to
    allocate wrapper structs to hold that list ... it can (and should!)
    just use the list_head provided for that exact use.
    
    Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
    Cc: Al Borchers <alborchers at steinerpoint.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 9079e91b5b5a84836e65cdc9128d2602e3beaef2
Author: David Brownell <david-b at pacbell.net>
Date:   Wed May 7 16:00:36 2008 -0700

    USB: serial gadget: cleanup/reorg
    
    Some cleanup/reorg of g_serial ... simplifying it, and disentangling
    its structure so morphing it into a "function" driver (combinable with
    other interfaces) should be less painful.
    
     - Remove most forward declarations
         * put tty and gadget driver structs after their contents
         * snug module init/exit decls next to their functions
         * reordered some functions
    
     - Other cleanup:
         * convert a funky macro to an inline function
         * snug up module params next to their declarations
         * add missing driver.owner
         * add separator lines between major driver sections
    
     - Add comments re potential parameter/#define changes:
         * only supports one port (shrank GS_NUM_PORTS)
         * changing from 9600-8-N-1 affects multiple sites
    
     - Remove net2280-specific optimization ... it was being done
       way too late, can be done by net2280 module options, and in
       any case doesn't matter at any sane serial data rates.
    
    There are no behavioral changes, but the macro thing saves I-space.
    
    Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
    Cc: Al Borchers <alborchers at steinerpoint.com>
    Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit fe312e77f0ed4349e908b1575be0d4308f0b2ce4
Author: Sebastian Siewior <bigeasy at linutronix.de>
Date:   Mon May 5 09:31:50 2008 +0200

    usb: fix compile warning in isp1760
    
    drivers/usb/host/isp1760-if.c:275: warning: 'ret' is used uninitialized in this function
    
    Signed-off-by: Sebastian Siewior <bigeasy at linutronix.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit cdafc37a7b727b75ced65e31e47dafbd8b70f97f
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date:   Mon May 5 01:24:38 2008 +0200

    USB: do not handle device 1410:5010 in 'option' driver
    
    This device is not a serial port, but a virtual CD-ROM device. For
    example with my Novatel MC950D:
    
    lsusb -v -d 1410:5010 | grep InterfaceClass
          bInterfaceClass         8 Mass Storage
    
    After some time (ca. 5min) or if virtual CD is ejected, device id
    changes to 1410:4400:
    
    % lsusb -v -d 1410:4400 | grep InterfaceClass
          bInterfaceClass       255 Vendor Specific Class
          bInterfaceClass       255 Vendor Specific Class
    
    Variable name says that 0x5010 is a Novatel U727, but searching in
    internet shows, that this device also provides virtual CD that should be
    ejected before use. Product id for serial port in this case is 0x4100.
    
    Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
    Cc: stable <stable at kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit ed3e8fcaeb67b7c2c96eb9c30d5b98816a08a1a2
Author: Phil Dibowitz <phil at ipom.com>
Date:   Sat May 3 18:04:30 2008 -0700

    USB: Fix unusual_devs.h ordering
    
    This patch fixes ordering problems with entries in unusual_devs.h.
    
    Signed-off-by: Phil Dibowitz <phil at ipom.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 6149ed5e3a6207595bd7362af7724d64f44af216
Author: Iain McFarlane <iain at imcfarla.homelinux.net>
Date:   Sun May 4 00:13:49 2008 +0100

    USB: add Zoom Telephonics Model 3095F V.92 USB Mini External modem to cdc-acm
    
    The patch below is a necessary workaround to support the Zoom Telephonics Model 3095F V.92 USB Mini External modem, which fails to initialise properly during normal probing thus:
    
    May  3 22:53:00 imcfarla kernel: drivers/usb/class/cdc-acm.c: Zero length descriptor references
    May  3 22:53:00 imcfarla kernel: cdc_acm: probe of 5-2:1.0 failed with error -22
    
    Adding the patch below causes the probing section to be skipped, and the modem
    then initialises correctly.
    
    Signed-off-by: Iain McFarlane <iain at imcfarla.homelinux.net>
    Acked-by: Oliver Neukum <oneukum at suse.de>
    Cc: stable <stable at kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 4c7d3137fe4fce634d55a6e99c95dff4c6306702
Author: andreoli at samba.ing.unimo.it <andreoli at samba.ing.unimo.it>
Date:   Thu May 1 19:26:16 2008 +0200

    USB: Support for the ET502HS HDSPA modem in option driver
    
    the proposed patch allows the ET502HS HDSPA modem to be handled by the
    "option" driver. It has been tested for 1 month and works reliably (no
    oopses, no hangs, 300KB/s throughput).
    
    Signed-off-by: Mauro Andreolini <andreoli at weblab.ing.unimo.it>
    Signed-off-by: Matthias Urlichs <matthias at urlichs.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit dddcb8b7d419b6726ba07efe53e6bb216a9e86cb
Author: andreoli at samba.ing.unimo.it <andreoli at samba.ing.unimo.it>
Date:   Thu May 1 19:17:28 2008 +0200

    USB: Support for the ET502HS HDSPA modem
    
    The attached patch allows to bypass the ZeroCD mechanism for the ET502HS
    HDSPA modem, so that it can be mounted as a network device.
    
    Signed-off-by: Mauro Andreolini <andreoli at weblab.ing.unimo.it>
    Acked-by: Alan Stern <stern at rowland.harvard.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit af3d305ca71fea5dfdeba4bcecf2f91fa16dfa9d
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Wed Apr 30 15:03:41 2008 -0700

    usb: fix integer as NULL pointer warnings found by sparse
    
    drivers/usb/host/ohci-sm501.c:93:24: warning: Using plain integer as NULL pointer
    drivers/usb/gadget/amd5536udc.c:3254:9: warning: Using plain integer as NULL pointer
    drivers/usb/gadget/amd5536udc.c:3267:9: warning: Using plain integer as NULL pointer
    drivers/usb/gadget/amd5536udc.c:3277:9: warning: Using plain integer as NULL pointer
    drivers/usb/gadget/amd5536udc.c:3285:9: warning: Using plain integer as NULL pointer
    drivers/usb/gadget/amd5536udc.c:3293:9: warning: Using plain integer as NULL pointer
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 220264733d3fb126c5ffd71ce897d918ce491c62
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date:   Wed Apr 30 13:53:54 2008 -0700

    USB: isp1760: fix printk format
    
    Fix printk format warnings in isp1760 (in linux-next):
    
    next-20080430/drivers/usb/host/isp1760-hcd.c:994: warning: format '%d' expects type 'int', but argument 6 has type 'size_t'
    next-20080430/drivers/usb/host/isp1760-hcd.c:1092: warning: format '%d' expects type 'int', but argument 3 has type 'size_t'
    
    Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 23cacd65f65956426bbca25964a68c174db83a31
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Thu May 8 23:03:04 2008 +0200

    USB: add Telstra NextG CDMA id to option driver
    
    As reported by Magnus Boman <captain.magnus at opensuse.org>
    
    Cc: Magnus Boman <captain.magnus at opensuse.org>
    Cc: stable <stable at kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit d23039eec77473124c9635c01378314f196f2211
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Fri Apr 25 19:23:16 2008 -0700

    USB: add association.h
    
    This will be used by the wireless usb code, as well as potentially other
    USB code.
    
    Originally based on some .c code written by Inaky Perez-Gonzalez
    <inaky.perez-gonzalez at intel.com>
    
    Cc: Inaky Perez-Gonzalez <inaky.perez-gonzalez at intel.com>
    Cc: David Brownell <david-b at pacbell.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 2e5f10e4f0a9649186d8a8c793822b2e0dae8373
Author: Alan Stern <stern at rowland.harvard.edu>
Date:   Wed Apr 30 15:37:19 2008 -0400

    USB: create attributes before sending uevent
    
    This patch (as1087d) fixes a long-standing problem in usbcore: Device,
    interface, and endpoint attributes aren't added until _after_ the
    creation uevent has already been broadcast.
    
    Unfortunately there are a few attributes which cannot be created that
    early.  The "descriptors" attribute is binary and so must be created
    separately.  The power-management attributes can't be created until
    the dev/power/ group exists.  And the interface string can vary from
    one altsetting to another, so it has to be created dynamically.
    
    Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
    Cc: Kay Sievers <kay.sievers at vrfy.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 6986a978eec70c867717fe6bee736f0bd1db1508
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Fri May 2 12:02:20 2008 -0700

    USB: add new moto_modem driver for some Morotola phones
    
    This should work on a KRZR K1m, and some other Motorola phones that do
    not use the "standard" cdc ACM protocol to talk to USB hosts.
    
    Tested-by: Jeff Garzik <jeff at garzik.org>
    Cc: Jiang Dejun <a5652c at motorola.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 9ee6b7f1556e7889eff4666483b1b554d4686cd4
Author: Rami Rosen <ramirose at gmail.com>
Date:   Wed May 14 03:50:03 2008 -0700

    net: Fix typo in net/core/sock.c.
    
    In sock_queue_rcv_skb()  (net/core/sock.c) it should be:
    "Cast sk->rcvbuf ..." instead of: "Cast skb->rcvbuf ..."
    
    Signed-off-by: Rami Rosen <ramirose at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 4b95ede6f6116ae1c0ed9605ec97d856c4814569
Author: Pavel Emelyanov <xemul at openvz.org>
Date:   Tue May 13 23:51:18 2008 -0700

    ppp: Do not free not yet unregistered net device.
    
    An error path in ppp_create_interface() lacks one and may
    BUG in free_netdev() checking for proper dev->reg_state.
    
    Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 01b7a314291b2ef56ad718ee1374a1bac4768b29
Author: Phil Oester <kernel at linuxace.com>
Date:   Tue May 13 23:27:48 2008 -0700

    netfilter: xt_iprange: module aliases for xt_iprange
    
    Using iptables 1.3.8 with kernel 2.6.25, rules which include '-m
    iprange' don't automatically pull in xt_iprange module.  Below patch
    adds module aliases to fix that.  Patch against latest -git, but seems
    like a good candidate for -stable also.
    
    Signed-off-by: Phil Oester <kernel at linuxace.com>
    Signed-off-by: Patrick McHardy <kaber at trash.net>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 1eedf69993d4016428fd99ffd619e73b374be3c1
Author: Eric Leblond <eric at inl.fr>
Date:   Tue May 13 23:27:11 2008 -0700

    netfilter: ctnetlink: dump conntrack ID in event messages
    
    Conntrack ID is not put (anymore ?) in event messages. This causes
    current ulogd2 code to fail because it uses the ID to build a hash in
    userspace. This hash is used to be able to output the starting time of
    a connection.
    
    Conntrack ID can be used in userspace application to maintain an easy
    match between kernel connections list and userspace one. It may worth
    to add it if there is no performance related issue.
    
    [ Patrick: it was never included in events, but really should be ]
    
    Signed-off-by: Eric Leblond <eric at inl.fr>
    Signed-off-by: Patrick McHardy <kaber at trash.net>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 332223831e86b2e17b48b4afafad07d8e3b73861
Author: Graf Yang <graf.yang at analog.com>
Date:   Tue May 13 23:25:57 2008 -0700

    irda: Fix a misalign access issue. (v2)
    
    Replace u16ho with put/get_unaligned functions
    
    Signed-off-by: Graf Yang <graf.yang at analog.com>
    Signed-off-by: Bryan Wu <cooloney at kernel.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit c1cc678adaa78ae2aab6a6d699241ad516d84476
Author: Patrick McHardy <kaber at trash.net>
Date:   Tue May 13 23:25:00 2008 -0700

    sctp: Fix use of uninitialized pointer
    
    Introduced by c4492586 (sctp: Add address type check while process
    paramaters of ASCONF chunk):
    
    net/sctp/sm_make_chunk.c: In function 'sctp_process_asconf':
    net/sctp/sm_make_chunk.c:2828: warning: 'addr_param' may be used uninitialized in this function
    net/sctp/sm_make_chunk.c:2828: note: 'addr_param' was declared here
    
    Signed-off-by: Patrick McHardy <kaber at trash.net>
    Acked-by: Vlad Yasevich <vladislav.yasevich at hp.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 5e0f8923f350ff522f8f6aecf198df045af3615f
Author: Pavel Emelyanov <xemul at openvz.org>
Date:   Tue May 13 23:23:55 2008 -0700

    cipso: Relax too much careful cipso hash function.
    
    The cipso_v4_cache is allocated to contain CIPSO_V4_CACHE_BUCKETS
    buckets. The CIPSO_V4_CACHE_BUCKETS = 1 << CIPSO_V4_CACHE_BUCKETBITS,
    where CIPSO_V4_CACHE_BUCKETBITS = 7.
    
    The bucket-selection function for this hash is calculated like this:
    
      bkt = hash & (CIPSO_V4_CACHE_BUCKETBITS - 1);
                                         ^^^
    
    i.e. picking only 4 buckets of possible 128 :)
    
    Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
    Acked-by: Paul Moore <paul.moore at hp.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit c2b7bbea83b239b1877f3cafe0cdcbbd08e65648
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date:   Wed May 14 05:08:19 2008 -0300

    V4L/DVB (7900): pvrusb: Fix Kconfig if DVB=m V4L_core=y
    
    As reported by Ingo Molnar:
    
    x86.git testing found the following build failure:
    
      drivers/built-in.o: In function `pvr2_dvb_feed_thread':
      pvrusb2-dvb.c:(.text+0x127e78): undefined reference to `dvb_dmx_swfilter'
      drivers/built-in.o: In function `pvr2_dvb_adapter_exit':
      pvrusb2-dvb.c:(.text+0x128357): undefined reference to `dvb_net_release'
      pvrusb2-dvb.c:(.text+0x12836f): undefined reference to `dvb_dmxdev_release'
      [...]
    
    with this config:
    
      CONFIG_VIDEO_PVRUSB2=y
      CONFIG_DVB_CORE=m
    
    i.e. pvrusb2 is built-in, dvb-core is modular.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 2ea336dc117098ef917ca9a19e911d15490587cc
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date:   Wed May 14 04:57:36 2008 -0300

    V4L/DVB (7899): Fixes a few remaining Kbuild issues at common/tuners
    
    - MEDIA_ATTACH now applies also for V4L;
    
    - select a FW_LOADER dependent driver should happen only if HOTPLUG;
    
    - apply the common tuner dependency to all tuners. This helps to avoid latter
      issues.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 039d40019f3c5e26ea50ec5af4270189f63365e1
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date:   Wed May 14 04:36:22 2008 -0300

    V4L/DVB (7898): Fix VIDEO_MEDIA Kconfig logic
    
    If one of DVB_CORE or VIDEO_DEV is a module, the modules that can be used by
    both DVB and V4L cores should also be a module, otherwise, it will break its
    dependencies. This Kconfig logic implements the following:
    
    CONFIG_VIDEO_DEV        CONFIG_DVB_CORE         CONFIG_VIDEO_MEDIA
            N                       N                       N
            N                       M                       M
            N                       Y                       Y
            M                       N                       M
            M                       M                       M
            M                       Y                       M
            Y                       N                       Y
            Y                       M                       M
            Y                       Y                       Y
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit ee04e0faad386141f52dd812f220a2f0d128f1c6
Author: Michael Krufky <mkrufky at linuxtv.org>
Date:   Tue May 13 01:25:24 2008 -0300

    V4L/DVB (7895): tveeprom: update Hauppauge analog audio and video decoders
    
    Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 48723543aff1f46091840222490ded5fe09c0e37
Author: Michael Krufky <mkrufky at linuxtv.org>
Date:   Sat May 10 14:34:09 2008 -0300

    V4L/DVB (7893): xc5000: bug-fix: allow multiple devices in a single system
    
    The current code passes a context pointer in the xc5000_config struct.
    This context pointer is used in the tuner_callback function, used to
    reset the device after firmware download.
    
    The xc5000_config struct is a static structure, whose .priv member was
    being assigned before calling xc5000_attach().  If there are more than
    one of the same device type installed on a single system, the last one
    to assign xc5000_config.priv will "win", and all others will cease to
    function properly.
    
    This patch passes the context pointer in xc5000_attach() rather that
    storing it within the static struct xc5000_config.
    
    Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 07c87a833e9ef92280ed24ab85cd4eb49cbca9c0
Author: Andy Walls <awalls at radix.net>
Date:   Mon May 12 15:01:27 2008 -0300

    V4L/DVB (7891): cx18/ivtv: fix open() kernel oops
    
    Upon error conditions in cx18/ivtv_probe(), the code at the 'err:' label
    leaves a NULL entry in cx18/ivtv_cards[]. This can cause a NULL pointer
    de-reference in cx18/ivtv_v4l2_open() which is fixed by this patch.
    
    Signed-off-by: Andy Walls <awalls at radix.net>
    Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit cba627a51a26eaed3526c423f5fd0410dd721ae2
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date:   Mon May 12 14:48:26 2008 -0300

    V4L/DVB (7890): cx18: removed bogus and confusing conditional
    
    Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 1d081601315f5c9b9537b702bcb2c8d96fc089ef
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date:   Mon May 12 14:45:19 2008 -0300

    V4L/DVB (7889): cx18: improve HVR-1600 detection.
    
    Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 6b13cf164958a18436075fdae31f8bd9442353fa
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date:   Mon May 12 14:00:33 2008 -0300

    V4L/DVB (7888): cx18: minor card definition updates.
    
    Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 9dcbf35afb7359466efdf7fb81ee32f3ae2d56a3
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date:   Mon May 12 13:57:18 2008 -0300

    V4L/DVB (7887): cx18: fix Compro H900 analog support.
    
    Tuner, S-Video and Composite are all working for the Compro H900.
    
    Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 6db6ae2165863e26b7f41af54a8cf1ef9051a608
Author: Hartmut Hackmann <hartmut.hackmann at t-online.de>
Date:   Mon May 12 20:34:02 2008 -0300

    V4L/DVB (7881): saa7134: fixed a compile warning in saa7134-core.c
    
    patch 779169257208 made the variable mask unnecessary.
    This patch just removes the declaration.
    
    Signed-off-by: Hartmut Hackmann <hartmut.hackmann at t-online.de>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit c1d6861b5178c184d78ae5f239cbaa9c2c63dd72
Author: Hartmut Hackmann <hartmut.hackmann at t-online.de>
Date:   Thu May 8 22:57:20 2008 -0300

    V4L/DVB (7880): saa7134: remove explicit GPIO initialization
    
    This causes a problem with the audio mute on some cards and is done
    implictly in the audio initialization code.
    
    Signed-off-by: Hartmut Hackmann <hartmut.hackmann at t-online.de>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 671294719628f1671faefd4882764886f8ad08cb
Author: Steven Toth <stoth at hauppauge.com>
Date:   Thu May 1 07:23:23 2008 -0300

    V4L/DVB(7879): Adding cx18 Support for mxl5005s
    
    Adding cx18 Support
    
    Signed-off-by: Steven Toth <stoth at hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 9426954277aa57e0417d89bfe3e0964d6901cfa3
Author: Steven Toth <stoth at hauppauge.com>
Date:   Thu May 8 12:14:40 2008 -0300

    V4L/DVB(7878): mxl55005s: Makefile and Kconfig additions
    
    Makefile and Kconfig additions
    
    Signed-off-by: Steven Toth <stoth at hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 77ad55ec2159735b1b88a006a90f8dd2ffe291ca
Author: Steven Toth <stoth at hauppauge.com>
Date:   Sat May 3 14:28:43 2008 -0300

    V4L/DVB(7877): mxl5005s: Ensure debug is off
    
    Ensure debug is off
    
    Signed-off-by: Steven Toth <stoth at hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 7fa2a1462fe0a258fb629f8447f31c1b3a6d6c68
Author: Steven Toth <stoth at hauppauge.com>
Date:   Sat May 3 14:25:55 2008 -0300

    V4L/DVB(7876): mxl5005s: Remove incorrect copyright holders
    
    I was informed by Jan Hoogenraad that two people needed to be removed
    from the original copyright comments.
    
    Signed-off-by: Steven Toth <stoth at hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 90257e787faaf5ebfaa1839917e4dc6c5c104c14
Author: Steven Toth <stoth at hauppauge.com>
Date:   Sat May 3 14:21:58 2008 -0300

    V4L/DVB(7875): mxl5005s: Remove redundant functions
    
    Remove redundant functions
    
    Signed-off-by: Steven Toth <stoth at hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit c6c34b1ffd40e00191e05bf0ef543a35ccd7d75d
Author: Steven Toth <stoth at hauppauge.com>
Date:   Sat May 3 14:14:54 2008 -0300

    V4L/DVB(7874): mxl5005s: Fix function statics
    
    Fix function statics
    
    Signed-off-by: Steven Toth <stoth at hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 66321ba94f59ea7ba6f4451c51e171f5b30f1fd7
Author: Steven Toth <stoth at hauppauge.com>
Date:   Sat May 3 13:51:11 2008 -0300

    V4L/DVB(7873): mxl5005s: Fix header includes.
    
    Ensure we have the correct .h dependencies included.
    
    Signed-off-by: Steven Toth <stoth at hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit d211017b954436bfc516e93d839e8746ec2bbbfe
Author: Steven Toth <stoth at hauppauge.com>
Date:   Thu May 1 19:35:54 2008 -0300

    V4L/DVB(7872): mxl5005s: checkpatch.pl compliance
    
    4 exceptions where the code would read very ugly otherwise.
    
    Signed-off-by: Steven Toth <stoth at hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 48937295a63b4e81db907605afcbd81e0464b00f
Author: Steven Toth <stoth at hauppauge.com>
Date:   Thu May 1 07:15:38 2008 -0300

    V4L/DVB(7871): mxl5005s: Re-org code and update copyrights
    
    Re-org code and update copyrights
    
    Signed-off-by: Steven Toth <stoth at hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 5c1b20514f592af19974166f130b85346c1fbf3a
Author: Steven Toth <stoth at hauppauge.com>
Date:   Thu May 1 07:04:09 2008 -0300

    V4L/DVB (7870): mxl5005s: Basic digital support.
    
    ATSC and QAM should be working but basic testing is required.
    
    Signed-off-by: Steven Toth <stoth at hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 7f5c3affef2883f49e820db62413e1dff1d4cebb
Author: Steven Toth <stoth at hauppauge.com>
Date:   Thu May 1 06:51:36 2008 -0300

    V4L/DVB(7869): mxl5005s: Cleanup #6
    
    Cleanup #6
    
    Signed-off-by: Steven Toth <stoth at hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 8c66a19d45fb5b88abf10678db353f35179a2cde
Author: Steven Toth <stoth at hauppauge.com>
Date:   Thu May 1 06:35:48 2008 -0300

    V4L/DVB (7868): mxl5005s: Cleanup #5
    
    Cleanup #5
    
    Signed-off-by: Steven Toth <stoth at hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 85d220d03b70180b9958b29d43e99c7135f00654
Author: Steven Toth <stoth at hauppauge.com>
Date:   Thu May 1 05:48:14 2008 -0300

    V4L/DVB (7867): mxl5005s: Cleanup #4
    
    Cleanup #4
    
    Signed-off-by: Steven Toth <stoth at hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 3935c25484bc632b12c447e19c4eacbf5de5f7ae
Author: Steven Toth <stoth at hauppauge.com>
Date:   Thu May 1 05:45:44 2008 -0300

    V4L/DVB (7866): mxl5005s: Cleanup #3
    
    Cleanup #3
    
    Signed-off-by: Steven Toth <stoth at hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit a8214d48e6d41f3a16c1023ca4f30bbd140ba756
Author: Steven Toth <stoth at hauppauge.com>
Date:   Thu May 1 05:02:58 2008 -0300

    V4L/DVB (7865): mxl5005s: Cleanup #2
    
    Cleanup #2
    
    Signed-off-by: Steven Toth <stoth at hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 2637d5b498b979b46a01690d22ecca1e5b79b903
Author: Steven Toth <stoth at hauppauge.com>
Date:   Thu May 1 05:01:31 2008 -0300

    V4L/DVB (7864): mxl5005s: Cleanup #1
    
    Cleanup #1
    
    Signed-off-by: Steven Toth <stoth at hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 52c99bda04d8bb1fb390821695b0f9efc1e1db44
Author: Steven Toth <stoth at hauppauge.com>
Date:   Thu May 1 04:57:01 2008 -0300

    V4L/DVB (7862): Add mxl5505s driver for MaxiLinear 5505 chipsets
    
    Initial check-in of the original driver to establish history.
    
    Signed-off-by: Chia-Ling Lu Developer <chialing at realtek.com.tw>
    Signed-off-by: Steven Toth <stoth at hauppauge.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit e4671b6bc0b5b488adc5acbcfcbfa6661abec94e
Author: Matthias Schwarzott <zzam at gentoo.org>
Date:   Wed Apr 30 12:21:04 2008 -0300

    V4L/DVB (7861): mt312: Prefix functions only with mt312_, Add zl10313 to kconfig description
    
    This patch does some small cleanup to mt312.
    It changes kconfig description to also list the ZL10313.
    
    It does change some strange symbol names to be consistent with
    module name mt312 and naming of all other functions in there.
    * vp310_mt312_ops -> mt312_ops
    * vp310_mt312_attach -> mt312_attach
    
    Adds a MODULE_AUTHOR for me
    
    Signed-off-by: Matthias Schwarzott <zzam at gentoo.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 6d8425b1e38f69e349818299f245d35fb5c3a7d5
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date:   Mon May 5 18:25:22 2008 -0300

    V4L/DVB (7860a): Add MAINTAINERS for cx18
    
    Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
    Signed-off-by: Andy Walls <awalls at radix.net>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 7fb0fd05b2f03065ca4743e8c7446ec86329c4c8
Author: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
Date:   Mon May 5 14:12:30 2008 -0300

    V4L/DVB (7859): mt9v022: fix a copy-paste error in comment
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 91e64c884295c7347f9ea78347d5a5e2df2441f6
Author: Ingo Molnar <mingo at elte.hu>
Date:   Mon May 5 13:57:50 2008 -0300

    V4L/DVB (7858): video: build fix for drivers/media/video/mt9v022.c
    
    x86.git testing found the following build bug on latest -git:
    
      CC [M]  drivers/media/video/mt9v022.o
      drivers/media/video/mt9v022.c: In function 'bus_switch_request':
      drivers/media/video/mt9v022.c:199: error: implicit declaration of function 'gpio_is_valid'
      drivers/media/video/mt9v022.c:201: error: implicit declaration of function 'gpio_request'
      drivers/media/video/mt9v022.c:207: error: implicit declaration of function 'gpio_direction_output'
      drivers/media/video/mt9v022.c:211: error: implicit declaration of function 'gpio_free'
      drivers/media/video/mt9v022.c: In function 'bus_switch_act':
      drivers/media/video/mt9v022.c:237: error: implicit declaration of function 'gpio_set_value_cansleep'
      make[2]: *** [drivers/media/video] Error 2
      make[1]: *** [drivers/media] Error 2
      make[1]: *** Waiting for unfinished jobs....
      make: *** [drivers] Error 2
    
    with this config:
    
       http://redhat.com/~mingo/misc/config-Sat_May__3_16_08_39_CEST_2008.bad
    
    the bug was that the driver uses GPIO functionality but only includes
    the GPIO interface definitions for the CONFIG_MT9M001_PCA9536_SWITCH
    case, which was not set in this config.
    
    The quick fix seems to be to include linux/gpio.h unconditionally. (this
    seems like a small cleanup as well as it removes and #ifdef is more
    robust than an inclusion of asm/gpio.h) Not tested too much yet, so
    please have another look in any case.
    
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 4ed83b51d3669628d970c2fea604064d2e0ac6af
Author: Adrian Bunk <bunk at kernel.org>
Date:   Mon Apr 28 15:39:09 2008 -0300

    V4L/DVB (7857): make itd1000_fre_values[] static const
    
    itd1000_fre_values[] can become static const.
    
    Signed-off-by: Adrian Bunk <bunk at kernel.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 50510993e0452e0941fd03f63aa08256dd9c7fdc
Author: Adrian Bunk <bunk at kernel.org>
Date:   Mon May 5 18:25:22 2008 -0300

    V4L/DVB (7856): cx18/: possible cleanups
    
    This patch contains the following possible cleanups:
    - cx18-i2c.c should #include "cx18-i2c.h" for getting the prototypes of
      it's global functions
    - make the following needlessly global functions static:
      - cx18-fileops.c:cx18_claim_stream()
      - cx18-fileops.c:cx18_release_stream()
      - cx18-queue.c:cx18_queue_move()
    - remove the following unused functions:
      - cx18-driver.c:cx18_waitq()
      - cx18-queue.c:cx18_buf_copy_from_user()
    
    Signed-off-by: Adrian Bunk <bunk at kernel.org>
    Reviewed-by: Hans Verkuil <hverkuil at xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 3f98387efa9333c5765d36e144c47c107d6ba64a
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date:   Thu May 1 10:31:12 2008 -0300

    V4L/DVB (7854): cx18/ivtv: improve and fix out-of-memory handling
    
    - don't show kernel backtrace when the allocation of the buffers fails: the
      normal ivtv/cx18 messages are clear enough and the backtrace scares users.
    - fix cleanup after the buffer allocation fails (caused kernel panic).
    
    Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 6a4a79355bfa9ae6977556595a68f2e3a0e143f7
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date:   Thu May 1 09:34:54 2008 -0300

    V4L/DVB (7853): ivtv/cx18: fix compile warnings
    
    Fix compile warnings if MODULE is not defined.
    
    Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit feb5bce24ed4d90c0a5710a669072c778a2c5148
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date:   Thu May 1 09:22:13 2008 -0300

    V4L/DVB (7852): ivtv: prefix ivtv external functions with ivtv_
    
    Fix conflict with cx18 driver.
    
    Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 755a18baad393836c88ce92c3b7198c70e2e3205
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date:   Tue May 6 14:09:01 2008 -0300

    V4L/DVB (7851): Fix FW_LOADER depencency at v4l/dvb
    
    Since:
    1) FW_LOADER is defined as:
    
    config FW_LOADER
            tristate "Userspace firmware loading support"
            depends on HOTPLUG
    
    2) several V4L/DVB driver just selects it;
    
    3) select is not smart enough to auto-select HOTPLUG, if select FW_LOADER.
    
    So, All drivers that select FW_LOADER should also depend on HOTPLUG.
    
    An easier solution (for the end-user perspective) would be to "select HOTPLUG".
    However, live is not simple. This would cause recursive dependency issues like
    this one:
    
    drivers/usb/Kconfig:62:error: found recursive dependency: USB -> USB_OHCI_HCD
    -> I2C -> MEDIA_TUNER -> MEDIA_TUNER_XC2028 -> HOTPLUG -> PCCARD -> PCMCIA ->
    USB_ARCH_HAS_HCD -> MOUSE_APPLETOUCH -> USB
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit ec44c9aed0eddceaef3c6b4d23f6d7702ec57b4d
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date:   Tue May 6 13:46:12 2008 -0300

    V4L/DVB (7849): cx88: fix Kconfig depencencies for FW_LOADER
    
    cx88 doesn't need support for FW_LOADER. Instead, this is required only for
    cx88-blackbird.
    
    Also, cx88-blackbird depends on HOTPLUG, due to FW_LOADER dependency.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit eabcaf32041fcd04672049e76124bd4cd63b1cbf
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date:   Tue May 6 13:44:03 2008 -0300

    V4L/DVB (7848): Fix dependencies for tuner-xc2028 and em28xx-dvb
    
    em28xx-dvb doesn't need FW_LOADER. Instead, tuner-xc2028 needs to select
    FW_LOADER.
    
    Also, this can happen only if HOTPLUG is selected, since FW_LOADER
    is dependent on HOTPLUG.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 3929c0f9acc62a2fee99387b3cb58fd2a3668cd3
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date:   Tue May 6 12:38:24 2008 -0300

    V4L/DVB (7847): Simplifies Kconfig rules
    
    Since all tuners are dependent of I2C, move I2C dependency to MEDIA_TUNER.
    Also, simplifies the dependencies for the other Kconfig items.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit fdbbfb092cee0d826cba96df51f56c0e22cae579
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date:   Tue May 6 12:35:58 2008 -0300

    V4L/DVB (7846): Re-creates VIDEO_TUNER
    
    VIDEO_TUNER is responsible for compilation of tuners.ko module. This were the
    previous behaviour before the creation of MEDIA_TUNER.
    
    Before this patch, tuner.ko were created even for drivers that don't need a
    tuner (like webcam drivers).
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 4bd5d1071ddbb35ae545c7738e6411e50ce28b17
Author: Michael Krufky <mkrufky at linuxtv.org>
Date:   Sun May 4 21:32:21 2008 -0300

    V4L/DVB (7844): tda18271: add tda_fail macro to log error cases
    
    Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 10ed0bf4af00c25590e8bfca344d8dec5c3637ae
Author: Michael Krufky <mkrufky at linuxtv.org>
Date:   Sun May 4 20:26:47 2008 -0300

    V4L/DVB (7843): tda18271: fix error handling in tda18271c1_rf_tracking_filter_calibration
    
    Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 20f4206379260e3ca02c8ee57bc3da9b0c7d09da
Author: Michael Krufky <mkrufky at linuxtv.org>
Date:   Sun May 4 19:57:06 2008 -0300

    V4L/DVB (7842): tda18271: fix error handling in tda18271c2_rf_tracking_filters_correction
    
    Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 31940e3966b6cf3bb3e535ffa1cb97b16edd555b
Author: Michael Krufky <mkrufky at linuxtv.org>
Date:   Sun May 4 19:37:27 2008 -0300

    V4L/DVB (7841): tda18271: fix error handling in tda18271_channel_configuration
    
    Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 9c41d456e2936ea3aafa07d431c5963799f9659e
Author: Michael Krufky <mkrufky at linuxtv.org>
Date:   Sun May 4 18:18:48 2008 -0300

    V4L/DVB (7840): tda18271: make tda18271_set_standby_mode less verbose for basic debug
    
    Only show debug from tda18271_set_standby_mode if DBG_ADV is set.
    
    Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit c151c32fd7d8f5ca7dcd35430f2e625181c48d66
Author: Michael Krufky <mkrufky at linuxtv.org>
Date:   Sun May 4 17:54:23 2008 -0300

    V4L/DVB (7839): tda18271: abort rf band calibration loop on errors
    
    Abort rf band calibration loop for the TDA18271HD/C2 if an error is detected.
    
    Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 24124f784bfec447f5cb9e64ed337afb57f0fca5
Author: Michael Krufky <mkrufky at linuxtv.org>
Date:   Sat May 3 19:28:00 2008 -0300

    V4L/DVB (7838): tda18271: fix error handling in tda18271c2_rf_cal_init path
    
    fix error handling in tda18271c2_rf_cal_init immediate path
    
    Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit d35fccaffd095e79691cd07a49a36867cb275b72
Author: Michael Krufky <mkrufky at linuxtv.org>
Date:   Sat May 3 18:20:21 2008 -0300

    V4L/DVB (7837): tda18271: fix error handling in init and sleep paths
    
    Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit dc9d522a1358bfb87e9ed8718cc1e4d5141a5468
Author: Ingo Molnar <mingo at elte.hu>
Date:   Sun May 4 20:32:45 2008 -0300

    V4L/DVB (7836): cinergyT2 build fix
    
    x86.git testing found the following build bug in v2.6.26-rc1:
    
      drivers/built-in.o: In function `cinergyt2_probe':
      cinergyT2.c:(.text+0xb6117): undefined reference to `input_allocate_device'
      cinergyT2.c:(.text+0xb6230): undefined reference to `input_register_device'
      cinergyT2.c:(.text+0xb623d): undefined reference to `input_free_device'
    
    with the following config:
    
      http://redhat.com/~mingo/misc/config-Sun_May__4_22_06_54_CEST_2008.bad
    
    The reason for the bug is that the cinergyT2 driver depends on
    CONFIG_INPUT functionality, but if INPUT is modular it's still possible
    to build CONFIG_DVB_CINERGYT2=y - which leads to missing symbols.
    
    The solution is to make DVB_CINERGYT2 dependent on INPUT.
    
    [ This solves the build problem - i have not tested the driver on this card. ]
    
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 696b9562df15795facf9ffbd470983e776fa6c19
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date:   Mon May 5 19:20:42 2008 -0300

    V4L/DVB (7835): multimedia/video: fix au0828 Kconfig
    
    Fix undefined references in au0828:
      depends on USB and select VIDEO_TVEEPROM
    
    Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 28dd15b4334c2ded53d7738160861aa16304b8fd
Author: Ingo Molnar <mingo at elte.hu>
Date:   Sat May 3 21:23:51 2008 -0300

    V4L/DVB (7834): build fix for drivers/media/video/au0828
    
    x86.git testing found the following build failure in v2.6.26-rc1:
    
      MODPOST 424 modules
      ERROR: "tveeprom_hauppauge_analog" [drivers/media/video/au0828/au0828.ko] undefined!
      ERROR: "tveeprom_read" [drivers/media/video/au0828/au0828.ko] undefined!
    
    with this config:
    
      http://redhat.com/~mingo/misc/config-Sat_May__3_22_28_58_CEST_2008.bad
    
    this patch does what other video drivers do to utilize the
    VIDEO_TVEEPROM functionality (and this resolves the build problem) - but
    i have not checked it on real hardware and i have not checked whether
    the fix is complete.
    
    selections, so some items might still be missing - just not triggered
    with this specific config.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit f686d8c3b53c7b105330b5292ff5d44bb04e4971
Author: Michael Krufky <mkrufky at linuxtv.org>
Date:   Mon May 5 21:08:28 2008 -0300

    V4L/DVB (7832): xc5000: MEDIA_TUNER_XC5000 must select FW_LOADER
    
    Fix the following build error:
    
    drivers/built-in.o: In function `xc_load_fw_and_init_tuner':
    xc5000.c:(.text+0x2dacd): undefined reference to `request_firmware'
    xc5000.c:(.text+0x2daf0): undefined reference to `release_firmware'
    xc5000.c:(.text+0x2db85): undefined reference to `release_firmware'
    make[1]: *** [.tmp_vmlinux1] Error 1
    
    Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 71a35fe2a345eb3704e1f1b4da65451d3e2b8c2e
Author: Robert Schedel <r.schedel at yahoo.de>
Date:   Sat May 3 12:58:36 2008 -0300

    V4L/DVB (7830): dvb_ca_en50221: Fix High CPU load in 'top' due to budget_av slot polling
    
    This change addresses kernel bug #10459: In kernel 2.6.25 the
    budget_av driver polls for an CI slot in 100ms intervals (because no
    interrupt solution for budget_av cards is feasible due to HW reasons).
    If no CI/CAM is connected to the DVB card, polling times out only after 250ms.
    This periodic polling leads to high CPU load.
    
    The change increases the polling interval for empty slots from 100ms to 5s.
    Intervals for remaining slot states (invalid, in progress, ready) are unchanged,
    as they are either temporary conditions or no timeout should occur.
    
    Signed-off-by: Robert Schedel <r.schedel at yahoo.de>
    Signed-off-by: Oliver Endriss <o.endriss at gmx.de>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit fa146c6dceffa68fa12f8d0b797ab9753fa1c792
Author: Michael Krufky <mkrufky at linuxtv.org>
Date:   Fri May 2 16:20:10 2008 -0300

    V4L/DVB (7829): cx23885: remove remaining references to dvb-pll
    
    The cx23885 driver used to use dvb-pll for LG-TDVS-H064F support on the
    FusionHDTV5 Express.  This has since been converted to use tuner-simple
    instead, once digital tuning support was added to tuner-simple.
    
    Since cx23885 no longer uses dvb-pll, remove the #include "dvb-pll.h",
    and the DVB_PLL Kconfig selection.
    
    Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 36396c893272a577eafad40630a609ccd36d20ea
Author: Michael Krufky <mkrufky at linuxtv.org>
Date:   Fri May 2 16:14:33 2008 -0300

    V4L/DVB (7828): cx23885: update model matrix for Hauppauge WinTV HVR-1200 & WinTV HVR-1700
    
    Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 3c3852cda6e0c557f5e0915b5451510c1acd64a2
Author: Michael Krufky <mkrufky at linuxtv.org>
Date:   Fri May 2 16:12:44 2008 -0300

    V4L/DVB (7827): cx23885: add missing subsystem ID for Hauppauge HVR-1200 OEM
    
    Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 74ee05109c9d6ae2dfe1b462592d3854ddbf1f6a
Author: Michael Krufky <mkrufky at linuxtv.org>
Date:   Thu May 1 18:02:30 2008 -0300

    V4L/DVB (7823): em28xx: add additional usb subids for Hauppauge HVR-950
    
    Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit ef69c8e88bafdeb896395fa5379a4b8c6a10bb08
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date:   Thu May 1 02:17:24 2008 -0300

    V4L/DVB (7813): Fix compilation, when V4L1_COMPAT is disabled
    
    This driver uses some sysfs helper functions that are available only for legacy
    drivers. It also requires linux/mm.h.
    
    This patch fixes compiliation when not in compat mode.
    
    Thanks to Ingo Molnar for identifying this issue.
    
    Acked-by: Jaime Velasco Juan <jsagarribay at gmail.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit b7eccc404f399ab93ed128e51ca5d6e0e5115dd2
Author: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
Date:   Wed Apr 30 09:21:33 2008 -0300

    V4L/DVB (7810): soc_camera: mt9v022 and mt9m001 depend on I2C
    
    Both mt9v022 and mt9m001 cameras are controlled over the I2C bus.
    Respectively, their drivers require I2C to be built successfully.
    Thanks to Ingo Molnar for reporting the build-breakage.
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit b4edcc9083af9444b288ee9e14cab28b29dc3636
Author: Michael Krufky <mkrufky at linuxtv.org>
Date:   Wed Apr 30 12:36:09 2008 -0300

    V4L/DVB (7808): cx23885: fix kbuild dependencies
    
    Thanks to Ingo Molnar for finding this.
    
    Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 0590d91c413fb5144608d69f50710064360aeec8
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date:   Wed Apr 30 18:14:36 2008 -0300

    V4L/DVB (7807): cx88: Fix error handling, when dvb_attach() fails
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 6430a5a368208ae6c4bcd13e1f06460c96af66be
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date:   Wed Apr 30 18:13:46 2008 -0300

    V4L/DVB (7806): em28xx: dvb_unregister_frontend() shouldn't be called, if not registered yet
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit f50090fc947e82464b4a033c9eff1898cb0676b5
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date:   Wed Apr 30 18:13:05 2008 -0300

    V4L/DVB (7805): saa7134: dvb_unregister_frontend() shouldn't be called, if not registered yet
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit b538d28c2e326ed226096408dce4d9469d7ffa39
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date:   Wed Apr 30 15:45:00 2008 -0300

    V4L/DVB (7804): tea5767: Fix error logic
    
    As pointed by Andrew Morton, the error testing were wrong. After reviewing
    tea5767, it were returning a positive value for errors.
    
    So, the double errors were cancelling each other.
    
    This patch fix it properly. It also considers any positive value as ok, on
    tuner-core.
    
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 09fee5f8211fc0a586187c4a0db7f5f42a4e333f
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date:   Wed Apr 30 15:29:57 2008 -0300

    V4L/DVB (7802): tuner: Failures at tuner_attach were producing OOPS
    
    As reported by Mike Galbraith <efault at gmx.de>:
    
    [   13.666587] TUNER: Unable to find symbol tda829x_probe()
    [   13.674638] tuner' 1-004b: chip found @ 0x96 (saa7133[0])
    [   13.691175] DVB: Unable to find symbol tda9887_attach()
    [   13.698968] BUG: unable to handle kernel NULL pointer dereference at 0000000000000000
    [   13.709509] IP: [<ffffffff80302934>] strlcpy+0x11/0x36
    [   13.711135] PGD be167067 PUD be140067 PMD 0
    [   13.711137] Oops: 0000 [1] SMP
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit d557dab5de82edfe5bab9a1964dfc5cf2b2b6833
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date:   Wed Apr 30 15:27:55 2008 -0300

    V4L/DVB (7801): saa7134: detach frontend, if tuner or Diseqc attach fails
    
    Before this patch, an error at tuner or diseqc were discarded by the driver.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit a1355e530173021099d0401f3294414382189dbd
Author: Andrew Morton <akpm at linux-foundation.org>
Date:   Wed Apr 30 11:40:17 2008 -0300

    V4L/DVB (7800): tuner_symbol_probe(): don't do symbol_put() if symbol_request() failed
    
    Because it goes BUG.
    
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Acked-by: Michael Krufky <mkrufky at linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 1930479c4b6bbcb6f164a5b3498e0d98329967f4
Author: Valerie Clement <valerie.clement at bull.net>
Date:   Tue May 13 19:31:14 2008 -0400

    ext4: mballoc fix mb_normalize_request algorithm for 1KB block size filesystems
    
    In case of inode preallocation, the number of blocks to allocate depends
    on the file size and it is calculated in ext4_mb_normalize_request().
    Each group in the filesystem is then checked to find one that can be
    used for allocation; this is done in ext4_mb_good_group().
    
    When a file bigger than 4MB is created, the requested number of blocks
    to preallocate, calculated by ext4_mb_normalize_request is 4096.
    However for a filesystem with 1KB block size, the maximum size of the
    block buddies used by the multiblock allocator is 2048, so none of
    groups in the filesystem satisfies the search criteria in
    ext4_mb_good_group(). Scanning all the filesystem groups impacts
    performance.
    
    This was demonstrated by using a freshly created, 70GB, 1k block
    filesystem, with caches dropped write before the test via
    /proc/sys/vm/drop_caches, and with the filesystem mounted with
    nodelalloc and nodealloc,nomballoc.  The time to write an 8 megabyte
    file using "dd if=/dev/zero of=/mnt/test/fo bs=8k count=1k conv=fsync"
    took 35.5091 seconds (236kB/s) with nodellaloc, and 0.233754 seconds
    (35.9 MB/s) with the nodelloc,nomballoc options.  With a 1TB partition,
    it took several minutes to write 8MB!
    
    This patch modifies the algorithm in ext4_mb_normalize_group_request to
    calculate the number of blocks to allocate by taking into account the
    maximum size of free blocks chunks handled by the multiblock allocator.
    
    It has also been tested for filesystems with 2KB and 4KB block sizes to
    ensure that those cases don't regress.
    
    Reviewed-by: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>
    Signed-off-by: Valerie Clement <valerie.clement at bull.net>
    Signed-off-by: Mingming Cao <cmm at us.ibm.com>
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>

commit 2c8be6b222f76c332d9faeb00c047996d340632c
Author: Jan Kara <jack at suse.cz>
Date:   Tue May 13 21:27:55 2008 -0400

    ext4: fix typos in messages and comments (journalled -> journaled)
    
    Cc: <linux-ext4 at vger.kernel.org>
    Signed-off-by: Jan Kara <jack at suse.cz>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Mingming Cao <cmm at us.ibm.com>
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>

commit 0623543b3335c8e439cacf21af99bbf45da42c5a
Author: Jan Kara <jack at suse.cz>
Date:   Tue May 13 19:11:51 2008 -0400

    ext4: fix synchronization of quota files in journal=data mode
    
    In journal=data mode, it is not enough to do write_inode_now as done in
    vfs_quota_on() to write all data to their final location (which is
    needed for quota_read to work correctly).  Calling journal_flush() does
    its job.
    
    Cc: <linux-ext4 at vger.kernel.org>
    Signed-off-by: Jan Kara <jack at suse.cz>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Mingming Cao <cmm at us.ibm.com>
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>

commit cd59e7b9781a35716b8a3e8c4aa2d48081d7daf7
Author: Jan Kara <jack at suse.cz>
Date:   Tue May 13 19:11:51 2008 -0400

    ext4: Fix mount messages when quota disabled
    
    When quota is disabled, we should not print 'journaled quota not
    supported' when user tried to mount non-journaled quota. Also fix typo
    in the message.
    
    Signed-off-by: Jan Kara <jack at suse.cz>
    Signed-off-by: Mingming Cao <cmm at us.ibm.com>
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>

commit dfc5d03f12e706c19ee37734184ea96582ef931d
Author: Jan Kara <jack at suse.cz>
Date:   Tue May 13 19:11:51 2008 -0400

    ext4: correct mount option parsing to detect when quota options can be changed
    
    We should not allow user to change quota mount options when quota is
    just suspended.  It would make mount options and internal quota state
    inconsistent.  Also we should not allow user to change quota format when
    quota is turned on.  On the other hand we can just silently ignore when
    some option is set to the value it already has (mount does this on
    remount).
    
    Cc: <linux-ext4 at vger.kernel.org>
    Signed-off-by: Jan Kara <jack at suse.cz>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Mingming Cao <cmm at us.ibm.com>
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>

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

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

commit 4ef7e3e90f56c74b2a17e12d49ed35c3767d66c2
Merge: 9604006d283fb67dda5ee9e0e15b7cc6c62e1557 1f465f4e475454b8bb590846c50a9d16e8046f3d
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue May 13 12:33:56 2008 -0700

    Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86: user_regset_view table fix for ia32 on 64-bit
      x86: arch/x86/mm/pat.c - fix warning
      x86: fix csum_partial() export
      x86: early_init_centaur(): use set_cpu_cap()
      x86: fix app crashes after SMP resume
      x86: wakeup.lds.S - section ordering fix
      x86: [VOYAGER] fix duplicate phys_cpu_present_map symbol
      x86/pci: fix broken ISA DMA

commit a58e58fafdff4c25949221e46132e86f709d0b79
Author: Steve Wise <swise at opengridcomputing.com>
Date:   Tue May 13 11:52:55 2008 -0700

    RDMA/cxgb3: Wrap the software send queue pointer as needed on flush
    
    cxio_flush_sq() was failing to wrap around the software send queue
    causing garbage completion entries on a flush operation.
    
    Signed-off-by: Steve Wise <swise at opengridcomputing.com>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit f018c7e177a50390f6fcb137f1a28a6027d8ba50
Author: Roland Dreier <rolandd at cisco.com>
Date:   Tue May 13 11:51:23 2008 -0700

    IB/ipath: Change ipath_devdata.ipath_sdma_status to be unsigned long
    
    Andrew Morton <akpm at linux-foundation.org> pointed out that bitops
    should take an unsigned long * arg.  However, the ipath driver was
    doing bitops on struct ipath_devdata.ipath_sdma_status, which is u64.
    Change this member to unsigned long to avoid tons of warnings when x86
    fixes the bitops to take unsigned long * instead of void *.
    
    Also, change the IPATH_SDMA_RUNNING and IPATH_SDMA_SHUTDOWN bit
    numbers to 30 and 31 (instead of 62 and 63) so that we're not setting
    another booby trap for someone who tries to make ipath work on a
    32-bit architecture.
    
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit 40d97692fbfe52ef68fa771d8121394b2210fd67
Author: Pavel Emelyanov <xemul at openvz.org>
Date:   Tue May 13 11:45:32 2008 -0700

    IB/ipath: Make ipath_portdata work with struct pid * not pid_t
    
    The official reason is "with the presence of pid namespaces in the
    kernel using pid_t-s inside one is no longer safe."
    
    But the reason I fix this right now is the following:
    
    About a month ago (when 2.6.25 was not yet released) there still was a
    one last caller of a to-be-deprecated-soon function find_pid() - the
    kill_proc() function, which in turn was only used by nfs callback
    code.
    
    During the last merge window, this last caller was finally eliminated
    by some NFS patch(es) and I was about to finally kill this kill_proc()
    and find_pid(), but found, that I was late and the kill_proc is now
    called from the ipath driver since commit 58411d1c ("IB/ipath: Head of
    Line blocking vs forward progress of user apps").
    
    So here's a patch that fixes this code to use struct pid * and (!)
    the kill_pid routine.
    
    Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit 74116f580b7279543340dd716a2af642f5c1c2c7
Author: Ralph Campbell <ralph.campbell at qlogic.com>
Date:   Tue May 13 11:42:20 2008 -0700

    IB/ipath: Fix RDMA read response sequence checking
    
    If an out of sequence RDMA read response middle or last packet is
    received, we should only resend the RDMA read request on the first
    out of sequence packet and drop subsequent out of sequence packets
    otherwise, we get "too many retries".
    
    Signed-off-by: Ralph Campbell <ralph.campbell at qlogic.com>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit e509be898d8937634437caa474b57ac12795e5bc
Author: Ralph Campbell <ralph.campbell at qlogic.com>
Date:   Tue May 13 11:41:29 2008 -0700

    IB/ipath: Fix many locking issues when switching to error state
    
    The send DMA hardware queue voided a number of prior assumptions about
    when a send is complete which led to completions being generated out of
    order.  There were also a number of locking issues when switching the QP
    to the error or reset states, and we implement the IB_QPS_SQD state.
    
    Signed-off-by: Ralph Campbell <ralph.campbell at qlogic.com>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit 53dc1ca194c062aa9771e194047f27ec1ca592df
Author: Ralph Campbell <ralph.campbell at qlogic.com>
Date:   Tue May 13 11:40:25 2008 -0700

    IB/ipath: Fix RC and UC error handling
    
    When errors are detected in RC, the QP should transition to the
    IB_QPS_ERR state, not the IB_QPS_SQE state. Also, when the error is on
    the responder side, the receive work completion error was incorrect
    (remote vs. local).
    
    Signed-off-by: Ralph Campbell <ralph.campbell at qlogic.com>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit dd37818dbdf8e51d0288c0197c351c005ffcdbdb
Author: Roland Dreier <rolandd at cisco.com>
Date:   Tue May 13 11:27:25 2008 -0700

    RDMA/nes: Fix up nes_lro_max_aggr module parameter
    
    Fix some bugs with the max_aggr module parameter added with LRO support:
    
     - The module parameter value ignored and not actually used to set
       lro_mgr.max_aggr.
     - MODULE_PARM_DESC had a typo "_mro_" instead of "_lro_" so it didn't
       end up describing the actual module parameter.
     - The nes_lro_max_aggr variable was declared as unsigned, but the
       module_param line said "int" instead of "uint" for the type.
     - The default value for the parameter was stuck in the permissions
       field of module_param, which led to nonsensical permissions for the
       file under /sys/module/iw_nes/param.
     - The parameter was used in only one file but defined in another, which
       led to the variable being global for no good reason.  Move everything
       related to the parameter to the file nes_hw.c where it is actually
       used.
    
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit 9604006d283fb67dda5ee9e0e15b7cc6c62e1557
Merge: 25c55d97209090db1a5f601815433f085bd1af78 af5741c6de4f4a1d8608b0f00867c77cb7123635
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue May 13 11:24:51 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
      [SCSI] qla1280: Fix queue depth problem
      [SCSI] aha152x: Fix oops on module removal
      [SCSI] aha152x: fix init suspiciously returned 1, it should follow 0/-E convention
      [SCSI] libiscsi regression in 2.6.25: fix setting of recv timer
      [SCSI] libiscsi regression in 2.6.25: fix nop timer handling
      [SCSI] gdth: fix Error: Driver 'gdth' is already registered, aborting...
      [SCSI] gdth: fix timer handling

commit 25c55d97209090db1a5f601815433f085bd1af78
Merge: 5dc93cf4576125f07cfc1b29cab0c9344c5b3d2b c4e5fadd2a6fc0da465dcde761877d9a87313b33
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue May 13 10:48:35 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:
      ACPI/PCI: another multiple _OSC memory leak fix
      x86/PCI: X86_PAT & mprotect
      PCI: enable nv_msi_ht_cap_quirk for ALi bridges
      PCI: Make the intel-iommu_wait_op macro work when jiffies are not running
      ACPI/PCI: handle multiple _OSC
      ACPI/PCI: handle multiple _OSC
      x86/PCI: fix broken ISA DMA
      PCI ACPI: fix uninitialized variable in __pci_osc_support_set

commit 1f465f4e475454b8bb590846c50a9d16e8046f3d
Author: Roland McGrath <roland at redhat.com>
Date:   Fri May 9 15:43:44 2008 -0700

    x86: user_regset_view table fix for ia32 on 64-bit
    
    The user_regset_view table for the 32-bit regsets on the 64-bit build had
    the wrong sizes for the FP regsets.  This bug had no user-visible effect
    (just on kernel modules using the user_regset interfaces and the like).
    But the fix is trivial and risk-free.
    
    Signed-off-by: Roland McGrath <roland at redhat.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit afc85343807bc2c488b7372cd7547875dfe03fe5
Author: Pranith Kumar <bobby.prani at gmail.com>
Date:   Mon May 12 14:52:26 2008 +0530

    x86: arch/x86/mm/pat.c - fix warning
    
    fix this warning:
    
     arch/x86/mm/pat.c: In function `phys_mem_access_prot_allowed':
     arch/x86/mm/pat.c:558: warning: long long unsigned int format, long
     unsigned int arg (arg 6)
     arch/x86/mm/pat.c: In function `map_devmem':
     arch/x86/mm/pat.c:580: warning: long long unsigned int format, long
     unsigned int arg (arg 6)
    
    Signed-off-by: D Pranith Kumar <bobby.prani at gmail.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 89804c022fe32541f5dd40a69e48ff4678d9ad24
Author: Ingo Molnar <mingo at elte.hu>
Date:   Tue May 13 10:36:22 2008 +0200

    x86: fix csum_partial() export
    
    Fix this symbol export problem:
    
        Building modules, stage 2.
        MODPOST 193 modules
        ERROR: "csum_partial" [fs/reiserfs/reiserfs.ko] undefined!
        make[1]: *** [__modpost] Error 1
        make: *** [modules] Error 2
    
    This is due to a known weakness of symbol exports: if a symbol's
    only in-core user is an EXPORT_SYMBOL from a lib-y section, the
    symbol is not linked in.
    
    The solution is to move the export to x8664_ksyms_64.c - but the real
    solution would be to fix kbuild.
    
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 8c45a4e4f2b9bed6b6c54aaafc89e906284ccdf2
Author: Andrew Morton <akpm at linux-foundation.org>
Date:   Mon May 12 19:31:20 2008 -0700

    x86: early_init_centaur(): use set_cpu_cap()
    
    arch/x86/kernel/setup_64.c:954: warning: passing argument 2 of 'set_bit' from incompatible pointer type
    
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 61165d7a035f6571c7576e7f51e7230157724c8d
Author: Hugh Dickins <hugh at veritas.com>
Date:   Tue May 13 14:26:57 2008 +0100

    x86: fix app crashes after SMP resume
    
    After resume on a 2cpu laptop, kernel builds collapse with a sed hang,
    sh or make segfault (often on 20295564), real-time signal to cc1 etc.
    
    Several hurdles to jump, but a manually-assisted bisect led to -rc1's
    d2bcbad5f3ad38a1c09861bca7e252dde7bb8259 x86: do not zap_low_mappings
    in __smp_prepare_cpus.  Though the low mappings were removed at bootup,
    they were left behind (with Global flags helping to keep them in TLB)
    after resume or cpu online, causing the crashes seen.
    
    Reinstate zap_low_mappings (with local __flush_tlb_all) for each cpu_up
    on x86_32.  This used to be serialized by smp_commenced_mask: that's now
    gone, but a low_mappings flag will do.  No need for native_smp_cpus_done
    to repeat the zap: let mem_init zap BSP's low mappings just like on UP.
    
    (In passing, fix error code from native_cpu_up: do_boot_cpu returns a
    variety of diagnostic values, Dprintk what it says but convert to -EIO.
    And save_pg_dir separately before zap_low_mappings: doesn't matter now,
    but zapping twice in succession wiped out resume's swsusp_pg_dir.)
    
    That worked well on the duo and one quad, but wouldn't boot 3rd or 4th
    cpu on P4 Xeon, oopsing just after unlock_ipi_call_lock.  The TLB flush
    IPI now being sent reveals a long-standing bug: the booting cpu has its
    APIC readied in smp_callin at the top of start_secondary, but isn't put
    into the cpu_online_map until just before that unlock_ipi_call_lock.
    
    So native_smp_call_function_mask to online cpus would send_IPI_allbutself,
    including the cpu just coming up, though it has been excluded from the
    count to wait for: by the time it handles the IPI, the call data on
    native_smp_call_function_mask's stack may well have been overwritten.
    
    So fall back to send_IPI_mask while cpu_online_map does not match
    cpu_callout_map: perhaps there's a better APICological fix to be
    made at the start_secondary end, but I wouldn't know that.
    
    Signed-off-by: Hugh Dickins <hugh at veritas.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit af5741c6de4f4a1d8608b0f00867c77cb7123635
Author: Jeremy Higdon <jeremy at sgi.com>
Date:   Sun May 11 23:17:03 2008 -0700

    [SCSI] qla1280: Fix queue depth problem
    
    The qla1280 driver was ANDing the output value of mailbox register
    0 with (1 << target-number) to determine whether to enable queueing
    on the target in question.
    
    But mailbox register 0 has the status code for the mailbox command
    (in this case, Set Target Parameters).  Potential values are:
    /*
     * ISP mailbox command complete status codes
     */
    
    So clearly that is in error.  I can't think what the author of that
    line was looking for in a mailbox register, so I just eliminated the
    AND.  flag is used later in the function, and I think that the later
    usage was also wrong, though it was used to set values that aren't
    used.  Oh well, an overhaul of this driver is not what I want to do
    now -- just a bugfix.
    
    After the fix, I found that my disks were getting a queue depth of
    255, which is far too many.  Most SCSI disks are limited to 32 or
    64.  In any case, there's no point, queueing up a bunch of commands
    to the adapter that will just result in queue full or starve other
    targets from being issued commands due to running out of internal
    memory.  So I dropped default queue depth to 32 (from which 1 is
    subtracted elsewhere, giving net of 31).
    
    I tested with a Seagate ST336753LC, and results look good, so
    I'm satisfied with this patch.
    
    Signed-off-by: Jeremy Higdon <jeremy at sgi.com>
    Acked-by: Jes Sorensen <jes at sgi.com>
    Cc: Stable Tree <stable at kernel.org>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit c4e5fadd2a6fc0da465dcde761877d9a87313b33
Author: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Date:   Tue May 13 16:48:50 2008 +0900

    ACPI/PCI: another multiple _OSC memory leak fix
    
    The acpi_query_osc() function can be called for the ACPI object that
    doesn't have _OSC method. In this case, acpi_get_osc_data() would
    allocate a useless memory region. To avoid this, we need to check the
    existence of _OSC before calling acpi_get_osc_data() in acpi_query_osc().
    
    Signed-off-by: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>

commit 77db9885646f8a88214ea482988d41f8f73630f4
Author: Venki Pallipadi <venkatesh.pallipadi at intel.com>
Date:   Fri May 9 13:05:19 2008 -0700

    x86/PCI: X86_PAT & mprotect
    
    Some versions of X used the mprotect workaround to change caching type from UC
    to WB, so that it can then use mtrr to program WC for that region [1].  Change
    the mmap of pci space through /sys or /proc interfaces from UC to UC_MINUS.
    With this change, X will not need to use mprotect workaround to get WC type
    since the MTRR mapping type will be honored.
    
    The bug in mprotect that clobbers PAT bits is fixed in a follow on patch. So,
    this X workaround will stop working as well.
    
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
    Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>

commit 439a7733e8fcbaee39979c10246101565834d6b2
Author: Björn Krombholz <fox.box at gmail.com>
Date:   Mon May 12 00:24:27 2008 +0200

    PCI: enable nv_msi_ht_cap_quirk for ALi bridges
    
    This applies the NVidia MSI enabled flag for HT capable devices quirk
    to ALi bridges as well.
    
    As described in more detail in http://bugzilla.kernel.org/show_bug.cgi?id=10667
    this is required for my board which is using an nForce 3 250Gb chipset with an
    ALi M1695 northbridge.
    
    It fixes a regression introduced in 2.6.24 that made the internal NIC of the
    board unusable (MSI initialisation of the NIC but disabled MSI on the
    northbridge devices.
    
    Signed-off-by: Björn Krombholz <fox.box at gmail.com>
    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>

commit a7eb08c2a14f28cb652ea6ad1a8e2b8efc55fb9a
Author: mark gross <mgross at linux.intel.com>
Date:   Mon May 12 13:41:57 2008 -0700

    PCI: Make the intel-iommu_wait_op macro work when jiffies are not running
    
    The following patch changes the intel-iommu.c code to use the TSC
    instead of jiffies for detecting bad DMAR functionality.  Some systems
    with bad bios's have been seen to hang in early boot spinning in the
    IOMMU_WAIT_IO macro.  This patch will replace the infinite loop with a call to
    panic.
    
    Signed-off-by: Mark Gross <mgross at linux.intel.com>
    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>

commit 34a65055e5e7304b3d6ad0f7542bf66308eae50a
Author: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Date:   Mon May 12 22:55:45 2008 +0900

    ACPI/PCI: handle multiple _OSC
    
    The pci_osc_control_set() function can be called for the ACPI object
    that doesn't have _OSC method. In this case, acpi_get_osc_data() would
    allocate a useless memory region. To avoid this, we need to check the
    existence of _OSC before calling acpi_get_osc_data(). Here is a patch
    to fix this problem in pci_osc_control_set.
    
    Signed-off-by: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>

commit a5d1c8798309a384c2776e5ff472f8ceb6d9065d
Author: Shaohua Li <shaohua.li at intel.com>
Date:   Mon May 12 10:48:10 2008 +0800

    ACPI/PCI: handle multiple _OSC
    
    There is an IA64 system here which have two pci root bridges with _OSC.
    One _OSC disables SHPC control bit but the other not. Below patch makes
    _OSC data per-device instead of one global, otherwise linux takes both
    root bridges don't support SHPC.
    
    Signed-off-by: Shaohua Li <shaohua.li at intel.com>
    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>

commit 4a367f3a9dbf2e7ffcee4702203479809236ee6e
Author: Takashi Iwai <tiwai at suse.de>
Date:   Fri May 9 08:06:55 2008 +0200

    x86/PCI: fix broken ISA DMA
    
    Rene Herman reported:
    
    > commit 8779f2fc3b84ebb6c5181fb13d702e9944c16069
    >
    > "x86: don't try to allocate from DMA zone at first"
    >
    > breaks all of ISA DMA. Or all of ALSA ISA DMA at least. All
    > ISA soundcards are silent following that commit -- no error
    > messages, everything appears fine, just silence.
    
    That patch is buggy. We had an implicit assumption that
    dev = NULL for ISA devices that require 24bit DMA.
    
    The recent work on x86 dma_alloc_coherent() breaks the ISA DMA buffer
    allocation, which is represented by "dev = NULL" and requires 24bit
    DMA implicitly.
    
    Bisected-by: Rene Herman <rene.herman at keyaccess.nl>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>

commit 21e2b0a5efb3a01de58e7cb630f2eb70894da352
Author: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Date:   Thu May 8 14:37:25 2008 +0900

    PCI ACPI: fix uninitialized variable in __pci_osc_support_set
    
    Fix uninitialized variable in __pci_osc_support_set().
    
    If the ACPI namespace doesn't have any device object corresponding to
    the specified hid, 'retval' in __pci_osc_support_set() is not changed
    by the acpi_query_osc() callback. Since 'retval' is not initizlized in
    the current implementation, the contents of 'retval' is undefined in
    this case. This causes a mis-handling of ctrlset_buf[OSC_SUPPORT_TYPE]
    and will cause an unexpected result in the subsequent
    pci_osc_control_set() call as a result.
    
    Signed-off-by: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>

commit 5dc93cf4576125f07cfc1b29cab0c9344c5b3d2b
Merge: 43f14d856f013a4cc63da2c765617c665274338c 3c17279137bf8318438510b48229d4236f773da4
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue May 13 09:49:06 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      [ALSA] ASoC: Fix wrong enum count for jack_function in N810 machine driver
      [ALSA] ASoC: build fix for snd_soc_info_bool_ext
      [ALSA] ASoC: Fix TLV320AIC3X mono line output interconnect
      [ALSA] soc - fsl_ssi.c fix "BUG: scheduling while atomic"
      [ALSA] emux midi synthesizer doesn't honor SOFT_PEDAL-release event

commit 43f14d856f013a4cc63da2c765617c665274338c
Author: Cyrill Gorcunov <gorcunov at gmail.com>
Date:   Mon May 12 14:02:40 2008 -0700

    eCryptFS: fix imbalanced mutex locking
    
    Fix imbalanced calls for mutex lock/unlock on ecryptfs_daemon_hash_mux
    Revealed by Ingo Molnar: http://lkml.org/lkml/2008/5/7/260
    
    Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
    Cc: Michael Halcrow <mhalcrow at us.ibm.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit d850a2fac11e4dd45d1d3d493a5a071b06c58c99
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Mon May 12 14:02:39 2008 -0700

    vt/fbcon: fix background color on line feed
    
    Another addendum to commit c9e587abfdec2c2aaa55fab83bcb4972e2f84f9b
    ("vt: fix background color on line feed").
    
    fbcon still was not doing the right thing (read: continued to do old
    behavior).  fbcon_clear() seems to clear the new line (e.g.  where your new
    prompt appears after doing echo -en "\e[42mfoo\n"), while scr_memsetw clears
    the previous one only (where "foo" appears).  So just temporarily set the
    video_erase_char to the scrl_erase_char so that fbcon_clear does the right
    thing.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 7fe3915a492503a9199af475a433b50258303806
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Mon May 12 14:02:38 2008 -0700

    vt/fbcon: update scrl_erase_char after 256/512-glyph font switch
    
    Addendum to commit c9e587abfdec2c2aaa55fab83bcb4972e2f84f9b ("vt: fix
    background color on line feed").
    
    vc->vc_scrl_erase_char was not updated when fbcon switches between
    256- and 512-glyph fonts.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
    Acked-by: David S. Miller <davem at davemloft.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 9fb1f68d40d9dd99fdbf65349c9c6af760e19e6e
Author: Maciej W. Rozycki <macro at linux-mips.org>
Date:   Mon May 12 14:02:38 2008 -0700

    rtc: m41t80: include <linux/kernel.h> for printk()
    
    The driver uses printk(), but does not include <linux/kernel.h> -- add it.
    
    Signed-off-by: Maciej W. Rozycki <macro at linux-mips.org>
    Cc: Alessandro Zummo <a.zummo at towertech.it>
    Cc: Alexander Bigga <ab at mycable.de>
    Cc: Wim Van Sebroeck <wim at iguana.be>
    Cc: David Brownell <david-b at pacbell.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 417607d05f41dbe2acccdb7a298a81d30ba1d22b
Author: Maciej W. Rozycki <macro at linux-mips.org>
Date:   Mon May 12 14:02:35 2008 -0700

    RTC/watchdog: M41T80: fix a potential use of unitialized data
    
    Watchdog handlers within the driver make use of "save_client" -- make sure it
    has been initalized before the handlers are registered.
    
    Signed-off-by: Maciej W. Rozycki <macro at linux-mips.org>
    Cc: Alessandro Zummo <a.zummo at towertech.it>
    Cc: Alexander Bigga <ab at mycable.de>
    Cc: Wim Van Sebroeck <wim at iguana.be>
    Cc: David Brownell <david-b at pacbell.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 6c82c4150910dedd449194cb6d286b80478f3542
Author: Andrew Morton <akpm at linux-foundation.org>
Date:   Mon May 12 14:02:34 2008 -0700

    drivers/char/synclink_gt.c: don't return an uninitialised local
    
    drivers/char/synclink_gt.c: In function 'put_char':
    drivers/char/synclink_gt.c:919: warning: 'ret' may be used uninitialized in this function
    
    The compiler speaketh truth.
    
    Cc: Paul Fulghum <paulkf at microgate.com>
    Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit f36f21ecca9ee688301174e5f2e0827827a7a7ff
Author: Jean Delvare <khali at linux-fr.org>
Date:   Mon May 12 14:02:33 2008 -0700

    Fix misuses of bdevname()
    
    bdevname() fills the buffer that it is given as a parameter, so calling
    strcpy() or snprintf() on the returned value is redundant (and probably not
    guaranteed to work - I don't think strcpy and snprintf support overlapping
    buffers.)
    
    Signed-off-by: Jean Delvare <khali at linux-fr.org>
    Cc: Stephen Tweedie <sct at redhat.com>
    Cc: Jens Axboe <axboe at kernel.dk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 78bb6cb9a890d3d50ca3b02fce9223d3e734ab9b
Author: Miklos Szeredi <mszeredi at suse.cz>
Date:   Mon May 12 14:02:32 2008 -0700

    fuse: add flag to turn on big writes
    
    Prior to 2.6.26 fuse only supported single page write requests.  In theory all
    fuse filesystem should be able support bigger than 4k writes, as there's
    nothing in the API to prevent it.  Unfortunately there's a known case in
    NTFS-3G where big writes cause filesystem corruption.  There could also be
    other filesystems, where the lack of testing with big write requests would
    result in bugs.
    
    To prevent such problems on a kernel upgrade, disable big writes by default,
    but let filesystems set a flag to turn it on.
    
    Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
    Cc: Szabolcs Szakacsits <szaka at ntfs-3g.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 0f146a764ff08c4c210c04239c5e6784b4b77485
Author: Dhaval Giani <dhaval at linux.vnet.ibm.com>
Date:   Mon May 12 14:02:31 2008 -0700

    cgroups: fix documentation
    
    Correct the cgroups documentation to reflect the correct file names.
    
    Signed-off-by: Dhaval Giani <dhaval at linux.vnet.ibm.com>
    Cc: Sudhir Kumar <skumar at linux.vnet.ibm.com>
    Cc: Balbir Singh <balbir at in.ibm.com>
    Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
    Acked-by: Paul Menage <menage at google.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 4cd1a8fc3d3cd740416b14ece2693dbb5d065eaf
Author: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
Date:   Mon May 12 14:02:31 2008 -0700

    memcg: fix possible panic when CONFIG_MM_OWNER=y
    
    When mm destruction happens, we should pass mm_update_next_owner() the old mm.
     But unfortunately new mm is passed in exec_mmap().
    
    Thus, kernel panic is possible when a multi-threaded process uses exec().
    
    Also, the owner member comment description is wrong.  mm->owner does not
    necessarily point to the thread group leader.
    
    [akpm at linux-foundation.org: coding-style fixes]
    Signed-off-by: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
    Acked-by: Balbir Singh <balbir at linux.vnet.ibm.com>
    Cc: "Paul Menage" <menage at google.com>
    Cc: "KAMEZAWA Hiroyuki" <kamezawa.hiroyu at jp.fujitsu.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit c9bfcb3151040cff6714542d1da04ccd7e2d3efc
Author: Joakim Tjernlund <Joakim.Tjernlund at transmode.se>
Date:   Mon May 12 14:02:30 2008 -0700

    spi_mpc83xx: much improved driver
    
    The current driver may cause glitches on SPI CLK line since one must disable
    the SPI controller before changing any HW settings.  Fix this by implementing
    a local spi_transfer function that won't change speed and/or word size while
    CS is active.
    
    While doing that heavy lifting a few other issues were addressed too:
     - Make word size 16 and 32 work too.
     - Honor bits_per_word and speed_hz in spi transaction.
     - Optimize the common path.
    
    This also stops using the "bitbang" framework (except for a few constants).
    
    [Roel Kluin <12o3l at tiscali.nl>: "irq" needs to be signed]
    Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund at transmode.se>
    Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit f4ed0deae8983591264d0e194e168ef65f4775f5
Author: Paul Jackson <pj at sgi.com>
Date:   Mon May 12 14:02:29 2008 -0700

    cpumask: remove bitmap_scnprintf_len and cpumask_scnprintf_len
    
    They aren't used.  They were briefly used as part of some other patches to
    provide an alternative format for displaying some /proc and /sys cpumasks.
    They probably should have been removed when those other patches were dropped,
    in favor of a different solution.
    
    Signed-off-by: Paul Jackson <pj at sgi.com>
    Cc: "Mike Travis" <travis at sgi.com>
    Cc: "Bert Wesarg" <bert.wesarg at googlemail.com>
    Cc: Alexey Dobriyan <adobriyan at gmail.com>
    Cc: WANG Cong <xiyou.wangcong at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 53c78dd1718b99dc365ff8a2244d7d4504b070a5
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date:   Mon May 12 14:02:28 2008 -0700

    fbdev: do not let CONFIG_FB_DEFERRED_IO default to y
    
    CONFIG_FB_DEFERRED_IO can not be turned off, while it's already selected
    automatically by the drivers that need it.
    
    Although it's nice to have more compile-coverage, not being able to disable a
    rarely used feature is annoying.
    
    Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
    Acked-by: Jaya Kumar <jayakumar.lkml at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit baf6332a238a680ef3add9cfb0729f136da886b8
Author: Nicolas Ferre <nicolas.ferre at atmel.com>
Date:   Mon May 12 14:02:25 2008 -0700

    atmel_lcdfb: fix pixclock divider calculation
    
    Fix divider calculation and allow CLKVAL = 0 (divisor 2)
    
    It was not possible to get the clock value 0 (divisor 2) because
    the test "<=0" force the BYPASS bit to be activated instead.
    
    [akpm at linux-foundation.org: coding-style fixes]
    Signed-off-by: Nicolas Ferre <nicolas.ferre at atmel.com>
    Cc: Per Hedblom <per.hedblom at abem.se>
    Cc: Roel Kluin <12o3l at tiscali.nl>
    Cc: Jan Weber <jw022609 at uni-greifswald.de>
    Cc: Andrew Victor <linux at maxim.org.za>
    Cc: Haavard Skinnemoen <hskinnemoen at atmel.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 945185a69daa457c4c5e46e47f4afad7dcea734f
Author: Maciej W. Rozycki <macro at linux-mips.org>
Date:   Mon May 12 14:02:24 2008 -0700

    rtc: rtc_time_to_tm: use unsigned arithmetic
    
    The input argument to rtc_time_to_tm() is unsigned as well as are members of
    the output structure.  However signed arithmetic is used within for
    calculations leading to incorrect results for input values outside the signed
    positive range.  If this happens the time of day returned is out of range.
    
    Found the problem when fiddling with the RTC and the driver where year was set
    to an unexpectedly large value like 2070, e.g.:
    
    rtc0: setting system clock to 2070-01-01 1193046:71582832:26 UTC (3155760954)
    
    while it should be:
    
    rtc0: setting system clock to 2070-01-01 00:15:54 UTC (3155760954)
    
    Changing types to unsigned fixes the problem.
    
    [akpm at linux-foundation.org: remove old-fashioned `register' keyword]
    Signed-off-by: Maciej W. Rozycki <macro at linux-mips.org>
    Cc: Alessandro Zummo <a.zummo at towertech.it>
    Cc: David Brownell <david-b at pacbell.net>
    Cc: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
    Cc: <stable at kernel.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit f38c84312748de9d04562c12af57080c6901f931
Author: Greg Ungerer <gerg at snapgear.com>
Date:   Mon May 12 14:02:23 2008 -0700

    m68knommu: missing sections for linker script
    
    Include the missing kcrctab and kcrctab_unused sections into the m68knommu
    linker script.
    
    Signed-off-by: Greg Ungerer <gerg at uclinux.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit e662e1cfd434aa234b72fbc781f1d70211cb785b
Author: Cyrill Gorcunov <gorcunov at gmail.com>
Date:   Mon May 12 14:02:22 2008 -0700

    init: don't lose initcall return values
    
    There is an ability to lose an initcall return value if it happened with irq
    disabled or imbalanced preemption (and if we debug initcall).
    
    Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 67d7671036e6cae24ded112e079926d55ffe9580
Author: Jordan Crouse <jordan.crouse at amd.com>
Date:   Mon May 12 14:02:22 2008 -0700

    Update Geode mailing list in MAINTAINERS
    
    Update the Geode list location in the MAINTAINERS file.
    
    Signed-off-by: Jordan Crouse <jordan.crouse at amd.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 706322496b3a58af3cf258db2b553d6933656eef
Author: Eric Sesterhenn <snakebyte at gmx.de>
Date:   Mon May 12 14:02:21 2008 -0700

    Fix hfsplus oops on image without extents
    
    Fix an oops with a corrupted hfs+ image.
    
    See http://bugzilla.kernel.org/show_bug.cgi?id=10548 for details.
    
    Problem is that we call hfs_btree_open() from hfsplus_fill_super() to set
    HFSPLUS_SB(sb).[ext_tree|cat_tree] Both trees are still NULL at this moment.
    If hfs_btree_open() fails for any reason it calls iput() on the page, which
    gets to hfsplus_releasepage() which tries to access HFSPLUS_SB(sb).* which is
    still NULL and oopses while dereferencing it.
    
    [akpm at linux-foundation.org: build fix]
    Signed-off-by: Eric Sesterhenn <snakebyte at gmx.de>
    Cc: Roman Zippel <zippel at linux-m68k.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 4413a0f637df4e59b934909ac388a21cfdd90e69
Author: Mel Gorman <mel at csn.ul.ie>
Date:   Mon May 12 14:02:19 2008 -0700

    parisc: fix DISCONTIGMEM compile breakage
    
    PA-RISC to aid debugging prints out the zonelists setup by the system.  A
    bad call to node_zonelist() breaks at compile-time.  This patch fixes it.
    
    Signed-off-by: Mel Gorman <mel at csn.ul.ie>
    Cc: Christoph Lameter <clameter at sgi.com>
    Cc: Lee Schermerhorn <lee.schermerhorn at hp.com>
    Cc: Kyle McMartin <kyle at mcmartin.ca>
    Cc: Grant Grundler <grundler at parisc-linux.org>
    Cc: James Bottomley <James.Bottomley at HansenPartnership.com>
    Cc: Adrian Bunk <bunk at kernel.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit f2a5f24a279a21229e8c42198e21e2c8ce289129
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date:   Mon May 12 14:02:18 2008 -0700

    PNP: set IRQ index in sysfs "set irq" interface
    
    We have to set the ISAPNP register index when setting an IRQ via the sysfs
    interface.  We already do it for IO, MEM, and DMA resources; I just missed the
    IRQ one.
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
    Cc: Len Brown <lenb at kernel.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 460817b9d45be7b2a50e1e24eb91b4aa0c435a09
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date:   Mon May 12 14:02:17 2008 -0700

    mn10300: replace deprecated "TOPDIR" with newer "srctree"
    
    This would appear to be the last reference to TOPDIR in the entire tree, after
    which i'm guessing that variable can be dropped.
    
    Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
    Acked-by: David Howells <dhowells at redhat.com>
    Cc: Sam Ravnborg <sam at ravnborg.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 7a6278e5e4bce72ace681ae3cf48209fb63a5420
Author: Julia Lawall <julia at diku.dk>
Date:   Mon May 12 14:02:16 2008 -0700

    drivers/video/pnx4008: eliminate double free
    
    The function framebuffer_release just calls kfree, so calling kfree
    subsequently on the same argument represents a double free.  The comments with
    the definition of framebuffer_release in drivers/video/fbsysfs.c suggest that
    a more elaborate definition of this function is planned, such that the
    splitting up of framebuffer_release and kfree as done in the second instance
    might someday make sense, but it does not make sense now.
    
    This was found using the following semantic match.
    (http://www.emn.fr/x-info/coccinelle/)
    
    // <smpl>
    @@
    expression E;
    @@
    
    * kfree(E);
    ...
    * framebuffer_release(E);
    
    @@
    expression E;
    @@
    
    * framebuffer_release(E);
    ...
    * kfree(E);
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia at diku.dk>
    Cc: Vitaly Wool <vitalywool at gmail.com>
    Cc: Krzysztof Helt <krzysztof.h1 at wp.pl>
    Cc: Grigory Tolstolytkin <gtolstolytkin at ru.mvista.com>
    Cc: Antonino Daplas <adaplas at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 5aecd559871d23a3cc297e544c9d63f0b8441cf4
Author: Denis Cheng <crquan at gmail.com>
Date:   Mon May 12 14:02:14 2008 -0700

    mm/pdflush.c: merge the same code in two path
    
    Signed-off-by: Denis Cheng <crquan at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 241937b863c8a3ef10511712f53285f41ab05308
Author: Darrick J. Wong <djwong at us.ibm.com>
Date:   Mon May 12 14:02:13 2008 -0700

    adt7473: minor documentation update
    
    Add a sentence about when fan speed increases to maximum.
    
    Signed-off-by: Darrick J. Wong <djwong at us.ibm.com>
    Acked-by: Jean Delvare <khali at linux-fr.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 289f8e27ed435dcbefad132def06f4e84351e94f
Author: Serge E. Hallyn <