development kernel tree: Changes to 'mokopatches-tracking'

git at git.openmoko.org git at git.openmoko.org
Wed May 7 19:14:43 CEST 2008


Rebased ref, commits from common ancestor:
commit 02abd63f844a2c1678035b1ce53b538924e8daca
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:02:02 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 20b476bf7f2df0a066068a61f34bbcd158140ac7
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:02:02 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 b2e1c865fb24afdafcff3b9829c257b93ee95e41
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:02:02 2008 +0100

    suspend-prelim1.patch

commit a38a2868b2e03b11ffb90b942d436ae61ecfaba7
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:02:02 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 02d5e2101e0bf7aec719400a590f48932e096207
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:02:02 2008 +0100

    fix-pcf50633-LOWBAT-kill-init.patch

commit e55f0421342b239ca64249a674d233cea2633cc7
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:02:02 2008 +0100

    fix-pcf50606-LOWBAT-kill-init.patch

commit 546745f231ef1a8b2b4834dad520c3b64e35689e
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:02:02 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 6ef321de4072662b343a7a7d20b1cd32411584f6
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:02:01 2008 +0100

    atheros_2_0_sdio_stack.patch

commit 6a072b37d8feb962b708c5cc0fe5034265f0b74e
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:02:01 2008 +0100

    atheros_2_0_hcd.patch

commit a4179eaca7ae1e50454d39d2c89f6c91ab0ed1b4
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:02:01 2008 +0100

    atheros_2_0_function.patch

commit b28d7eb7224fb1a94ecb684c81bdf91cd917ab6c
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:02:01 2008 +0100

    pnp_fixes.patch

commit e5fc94f196881915bcbc6bc3b3b36d19ace23b52
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:02:01 2008 +0100

    s3c2410-usb-switch.patch

commit 974fd2f80cc30dadb6ec9897272b2e44f7cf0f1e
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:02:01 2008 +0100

    fix-EVIOCGRAB-semantics.patch

commit 5237cbd482ca63657d56c0e93a80402fc199f711
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:02:01 2008 +0100

    bq27000-battery-driver.patch

commit 4c9020924759ad7b632dc129d20faa289e1eb246
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:02:01 2008 +0100

    fiq-hdq.patch

commit af709139397a378025b7f9f9f2b607effdd0927e
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:02:01 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 26577a9f27e270e681bcab6db49da4563053190c
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:02:00 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 29a7f8b285eb724c02cb3e86adba2dad24f411eb
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:02:00 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 1f3f605646aa24ab9fc40997e2c5bcf713452d87
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:02:00 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 9b86786646ad76b62fa96bd643e8306d5918c4b3
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:02:00 2008 +0100

    s3c2410-qt2410-buttons.patch

commit e0f18e9e7ed7ca61bd3c9b967c0798fe0fbacb44
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:02:00 2008 +0100

    qt2410-cs8900.patch

commit 72c2f7b035b2c87322476383fa80269ab47b84a9
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:02:00 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 036e86edea9fcaebf059472a77c63d70aab7a5c2
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:02:00 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 1bb3a167c3cb975a86ca5feb106369424ffee3f1
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:02:00 2008 +0100

    s3c2410_serial-nodebug.patch

commit 87e402cb68d5c4cfcbd0c756e569d9ef32c6af24
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:02:00 2008 +0100

    pm-debug_less_verbose.patch

commit 70f629f49d2d7ee0a67afa526996575e2b12cbb1
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:59 2008 +0100

    config-nr-tty-devices.patch

commit a6ab5abecd2cf13cc7c3939282f0f2cc816ac489
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:59 2008 +0100

    openmoko-logo.patch

commit 920bf78f48c0640f6ecb63072ace716d3b934a86
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:59 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 9c81992cddeb1842db09368a7b54fd8eb32b6059
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:59 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 fa831a45c6801b8ff5f171712d63a203c4e1bd9a
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:59 2008 +0100

    gta02-acc.patch

commit 068528327bced58a967d52d8106792fb129a7a4d
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:59 2008 +0100

    gta02-leds.patch

commit cd62c482f69eacce1b6a6256bfe9c86fa6579325
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:59 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 14d3d4fca8e30298630c9729fef2cc9b6a41f542
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:59 2008 +0100

    gta02-sound.patch

commit 23612f215ff2b2e0f84596d1e9dd20cda5797a6f
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:58 2008 +0100

    gta02-power_control.patch

commit ec69a59874db4e69e7d09b350bbaf516ecc48f8d
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:58 2008 +0100

    gta02-core.patch

commit 6e7b6e7ecabb18492c2088b3bd769f93bb3b7a01
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:58 2008 +0100

    glamo-mmc.patch

commit 28909ca54fe20395ac087aa89a9249524334e19e
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:57 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 f091108d00403bf12797cdbfa4b7f56e97655b99
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:57 2008 +0100

    pcf50633-suspend-hacks.patch

commit 21137a5a0bad73250c2e8db11ecbaed84c682924
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:57 2008 +0100

    pcf50633.patch

commit 8cf8f698ef37e11bc1d62d32a4f9168afdba1d10
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:57 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 43ea0ca64cfef628dfd082e3afbfe46dda4dfc1e
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:57 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 226b9de7976216b97bb8fae8496a2928b0a5afcf
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:57 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 36f4780f874c06d67453f10ceadbfdd00e578114
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:57 2008 +0100

    s3c_mci-gta01.patch

commit 373c74eab32eed963dd4c7d21732ab1a71899f57
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:57 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 f05c9a5f9bde4a10dc80a6ec9a7c8fda83303b21
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:57 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 03fa56dc447838f61c856d91f4d7a3f9c61af50e
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:57 2008 +0100

    g_ether-highpower.patch

commit 7415ac3c03ee7ba8a1376660ef1b54508c11f130
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:56 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 8fb5176ff19e43e664896cf908d59f7ee552cca0
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:56 2008 +0100

    s3c2410_ts-gta01.patch

commit 2b7fffd04c4d546badc109732e2e8f0fafea80c2
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:56 2008 +0100

    s3c2410_touchscreen.patch

commit e5cf6ebc06129cea18e40e0f59426b9c6be9aca3
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:56 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 7056da8eab7f0c963c9d1281ee31e66e0aed83c9
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:56 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 96c49fe0826eedaff5890e13ca4513827d64ffd0
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:56 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 ecb8004ee5c8452ca3ea55ff7c5f70312947001b
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:56 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 013890bfc5ffbbc0154341084e1b1126be69f9c9
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:56 2008 +0100

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

commit 585a57176d8ae8ba22ab5c789241f2a65d7f2945
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:56 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 b1bcc68042d029b12abfd18271723b2b64842ad3
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:56 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 8e77a0b54930b970ee2e78c44fbe2f677982c6d1
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:55 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 f3a2d01929716d9949d20742f7647ce9eeda9d96
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:55 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 fd86e24d7ef53030fd9c47b1a337b8f647736a90
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:55 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 8e6994e8ea2197da77f2a3b9f9c38ca0583d9d6a
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 16:01:55 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 87fd266a6f1669e314b27c2734ed0638e797b366
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 15:55:48 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 1d207c71d918f8e1415464b7d9a592587a366e83
Author: mokopatches <mokopatches at openmoko.org>
Date:   Wed May 7 15:55:48 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 c0a18111e571138747a98af18b3a2124df56a0d1
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue May 6 17:09:27 2008 -0700

    Revert "uml: fix gcc problem"
    
    This reverts commit 22eecde2f9034764a3fd095eecfa3adfb8ec9a98.  Uli
    reports that it breaks UML on x86-64 with the Fedora 8 gcc (gcc 4.1.2),
    causing a crash on startup. See
    
    	http://marc.info/?l=linux-kernel&m=121011722806093&w=2
    
    for a trace.
    
    Reported-by: Ulrich Drepper <drepper at redhat.com>
    Cc: Ingo Molnar <mingo at elte.hu>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Cc: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit db176c6ed8974fae94328ad5ac9e70b094ff22fd
Author: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Date:   Wed May 7 04:02:53 2008 +0900

    Fix bogus warning in sysdev_driver_register()
    
            if ((drv->entry.next != drv->entry.prev) ||
                (drv->entry.next != NULL)) {
    
    warns list_empty(&drv->entry).
    
    Signed-off-by: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
    Cc: Greg KH <gregkh at suse.de>
    Cc: Len Brown <lenb at kernel.org>
    [ Version 2 totally redone based on suggestions from Linus & Greg ]
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 6ce07c7b61e74af35a05060a2d6341f68fd92c9e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue May 6 13:13:37 2008 -0700

    VFS: fix unused variable warning
    
    Commit 33dcdac2df54e66c447ae03f58c95c7251aa5649 ("kill ->put_inode")
    removed the final use of i_op->put_inode, but left the now totally
    unused "op" variable in iput().
    
    Get rid of it.
    
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit aeed5fce37196e09b4dac3a1c00d8b7122e040ce
Author: Hugh Dickins <hugh at veritas.com>
Date:   Tue May 6 20:49:23 2008 +0100

    x86: fix PAE pmd_bad bootup warning
    
    Fix warning from pmd_bad() at bootup on a HIGHMEM64G HIGHPTE x86_32.
    
    That came from 9fc34113f6880b215cbea4e7017fc818700384c2 x86: debug pmd_bad();
    but we understand now that the typecasting was wrong for PAE in the previous
    version: pagetable pages above 4GB looked bad and stopped Arjan from booting.
    
    And revert that cded932b75ab0a5f9181ee3da34a0a488d1a14fd x86: fix pmd_bad
    and pud_bad to support huge pages.  It was the wrong way round: we shouldn't
    weaken every pmd_bad and pud_bad check to let huge pages slip through - in
    part they check that we _don't_ have a huge page where it's not expected.
    
    Put the x86 pmd_bad() and pud_bad() definitions back to what they have long
    been: they can be improved (x86_32 should use PTE_MASK, to stop PAE thinking
    junk in the upper word is good; and x86_64 should follow x86_32's stricter
    comparison, to stop thinking any subset of required bits is good); but that
    should be a later patch.
    
    Fix Hans' good observation that follow_page() will never find pmd_huge()
    because that would have already failed the pmd_bad test: test pmd_huge in
    between the pmd_none and pmd_bad tests.  Tighten x86's pmd_huge() check?
    No, once it's a hugepage entry, it can get quite far from a good pmd: for
    example, PROT_NONE leaves it with only ACCESSED of the KERN_PGTABLE bits.
    
    However... though follow_page() contains this and another test for huge
    pages, so it's nice to keep it working on them, where does it actually get
    called on a huge page?  get_user_pages() checks is_vm_hugetlb_page(vma) to
    to call alternative hugetlb processing, as does unmap_vmas() and others.
    
    Signed-off-by: Hugh Dickins <hugh at veritas.com>
    Earlier-version-tested-by: Ingo Molnar <mingo at elte.hu>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Cc: Jeff Chua <jeff.chua.linux at gmail.com>
    Cc: Hans Rosenfeld <hans.rosenfeld at amd.com>
    Cc: Arjan van de Ven <arjan at linux.intel.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit bb78be8397d3b0900af3d717672218ee3ea07985
Merge: 31d9168d27fac127d449cb9fa252d880de872c7f 0b2bac2f1ea0d33a3621b27ca68b9ae760fca2e9
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue May 6 11:39:57 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] fix SMP ordering hole in fcntl_setlk()
      [PATCH] kill ->put_inode
      [PATCH] fix reservation discarding in affs

commit 0b2bac2f1ea0d33a3621b27ca68b9ae760fca2e9
Author: Al Viro <viro at zeniv.linux.org.uk>
Date:   Tue May 6 13:58:34 2008 -0400

    [PATCH] fix SMP ordering hole in fcntl_setlk()
    
    fcntl_setlk()/close() race prevention has a subtle hole - we need to
    make sure that if we *do* have an fcntl/close race on SMP box, the
    access to descriptor table and inode->i_flock won't get reordered.
    
    As it is, we get STORE inode->i_flock, LOAD descriptor table entry vs.
    STORE descriptor table entry, LOAD inode->i_flock with not a single
    lock in common on both sides.  We do have BKL around the first STORE,
    but check in locks_remove_posix() is outside of BKL and for a good
    reason - we don't want BKL on common path of close(2).
    
    Solution is to hold ->file_lock around fcheck() in there; that orders
    us wrt removal from descriptor table that preceded locks_remove_posix()
    on close path and we either come first (in which case eviction will be
    handled by the close side) or we'll see the effect of close and do
    eviction ourselves.  Note that even though it's read-only access,
    we do need ->file_lock here - rcu_read_lock() won't be enough to
    order the things.
    
    Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>

commit 33dcdac2df54e66c447ae03f58c95c7251aa5649
Author: Christoph Hellwig <hch at lst.de>
Date:   Tue Apr 29 17:46:26 2008 +0200

    [PATCH] kill ->put_inode
    
    And with that last patch to affs killing the last put_inode instance we
    can finally, after many years of transition kill this racy and awkward
    interface.
    
    (It's kinda funny that even the description in
    Documentation/filesystems/vfs.txt was entirely wrong..)
    
    Also remove a very misleading comment above the defintion of
    struct super_operations.
    
    Signed-off-by: Christoph Hellwig <hch at lst.de>
    Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>

commit dca3c33652e437ed02c30ed3eca3cecd0cc00838
Author: Roman Zippel <zippel at linux-m68k.org>
Date:   Tue Apr 29 17:02:20 2008 +0200

    [PATCH] fix reservation discarding in affs
    
    - remove affs_put_inode, so preallocations aren't discared unnecessarily
      often.
    - remove affs_drop_inode, it's called with a spinlock held, so it can't
      use a mutex.
    - make i_opencnt atomic
    - avoid direct b_count manipulations
    - a few allocation failure fixes, so that these are more gracefully
      handled now.
    Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
    Signed-off-by: Christoph Hellwig <hch at lst.de>
    Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>

commit 31d9168d27fac127d449cb9fa252d880de872c7f
Merge: 4880d10927c93d858d40e297361fff375ee98492 05177f178efe1459d2d0ac05430027ba201889a4
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue May 6 09:17:03 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: (27 commits)
      pata_atiixp: Don't disable
      sata_inic162x: update intro comment, up the version and drop EXPERIMENTAL
      sata_inic162x: add cardbus support
      sata_inic162x: kill now unused SFF related stuff
      sata_inic162x: use IDMA for ATAPI commands
      sata_inic162x: use IDMA for non DMA ATA commands
      sata_inic162x: kill now unused bmdma related stuff
      sata_inic162x: use IDMA for ATA_PROT_DMA
      sata_inic162x: update TF read handling
      sata_inic162x: add / update constants
      sata_inic162x: misc clean ups
      sata_mv use hweight16() for bit counting (V2)
      sata_mv NCQ-EH for FIS-based switching
      sata_mv delayed eh handling
      libata: export ata_eh_analyze_ncq_error
      sata_mv new mv_port_intr function
      sata_mv fix mv_host_intr bug for hc_irq_cause
      sata_mv NCQ and SError fixes for mv_err_intr
      sata_mv rearrange mv_config_fbs
      sata_mv errata workaround for sata25 part 1
      ...

commit 05177f178efe1459d2d0ac05430027ba201889a4
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Fri May 2 15:13:39 2008 -0700

    pata_atiixp: Don't disable
    
    A couple of distributions (Fedora, Ubuntu) were having weird problems with the
    ATI IXP series PATA controllers being reported as simplex.  At the heart of
    the problem is that both distros ignored the recommendations to load pata_acpi
    and ata_generic *AFTER* specific host drivers.
    
    The underlying cause however is that if you D3 and then D0 an ATI IXP it
    helpfully throws away some configuration and won't let you rewrite it.
    
    Add checks to ata_generic and pata_acpi to pin ATIIXP devices.  Possibly the
    real answer here is to quirk them and pin them, but right now we can't do that
    before they've been pcim_enable()'d by a driver.
    
    I'm indebted to David Gero for this.  His bug report not only reported the
    problem but identified the cause correctly and he had tested the right values
    to prove what was going on
    
    [If you backport this for 2.6.24 you will need to pull in the 2.6.25
    removal of the bogus WARN_ON() in pcim_enagle]
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Tested-by: David Gero <davidg at havidave.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 22bfc6d5e19b72d50535ce32fd6dee2ce2e75775
Author: Tejun Heo <htejun at gmail.com>
Date:   Wed Apr 30 16:35:17 2008 +0900

    sata_inic162x: update intro comment, up the version and drop EXPERIMENTAL
    
    sata_inic162x is now ready for production use.  Bump the version,
    explain what's working and what's not and drop EXPERIMENTAL.
    
    Signed-off-by: Tejun Heo <htejun at gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit ba66b242b1c3432b44d893c64124522b3bdce71e
Author: Tejun Heo <htejun at gmail.com>
Date:   Wed Apr 30 16:35:16 2008 +0900

    sata_inic162x: add cardbus support
    
    When attached to cardbus, mmio region is at BAR 1.  Other than that,
    everything else is the same.  Add support for it.
    
    Signed-off-by: Tejun Heo <htejun at gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit f8b0685a8ea8e3974f8953378ede2111f8d49d22
Author: Tejun Heo <htejun at gmail.com>
Date:   Wed Apr 30 16:35:15 2008 +0900

    sata_inic162x: kill now unused SFF related stuff
    
    sata_inic162x now doesn't use any SFF features.  Remove all SFF
    related stuff.
    
    * Mask unsolicited ATA interrupts.  This removes our primary source of
      spurious interrupts and spurious interrupt handling can be tightened
      up.  There's no need to clear ATA interrupts by reading status
      register either.
    
    * Don't dance with IDMA_CTL_ATA_NIEN and simplify accesses to
      IDMA_CTL.
    
    * Inherit from sata_port_ops instead of ata_sff_port_ops.
    
    * Don't initialize or use ioaddr.  There's no need to map BAR0-4
      anymore.
    
    Signed-off-by: Tejun Heo <htejun at gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit b3f677e501a494aa1582d4ff35fb3ac6f0a59b08
Author: Tejun Heo <htejun at gmail.com>
Date:   Wed Apr 30 16:35:14 2008 +0900

    sata_inic162x: use IDMA for ATAPI commands
    
    Use IDMA for ATAPI commands.  Write and some misc commands time out
    when executed using ATAPI_PROT_DMA but ATAPI_PROT_PIO works fine.  As
    PIO is driven by DMA too, it doesn't make any noticeable difference
    for native SATA devices.  inic_check_atapi_dma() is implemented to
    force PIO for those ATAPI commands.
    
    After this change, sata_inic162x issues all commands using IDMA.
    
    Signed-off-by: Tejun Heo <htejun at gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 049e8e04986bde66df9648d88d0960ab4cbd6992
Author: Tejun Heo <htejun at gmail.com>
Date:   Wed Apr 30 16:35:13 2008 +0900

    sata_inic162x: use IDMA for non DMA ATA commands
    
    Use IDMA for PIO and non-data commands.  This allows sata_inic162x to
    safely drive LBA48 devices.  Kill inic_dev_config() which contains
    code to reject LBA48 devices.
    
    With this change, status checking in inic_qc_issue() to avoid hard
    lock up after hotplug can go away too.
    
    Signed-off-by: Tejun Heo <htejun at gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit ab5b0235c4e819c9bc45fa62c99f9fe49e73e701
Author: Tejun Heo <htejun at gmail.com>
Date:   Wed Apr 30 16:35:12 2008 +0900

    sata_inic162x: kill now unused bmdma related stuff
    
    sata_inic162x doesn't use BMDMA anymore.  Kill bmdma related stuff.
    
    * prdctl manipulation
    
    * port IRQ mask manipulation
    
    * inherit ATA_BASE_SHT instead of ATA_BMDMA_SHT
    
    * BMDMA methods
    
    Signed-off-by: Tejun Heo <htejun at gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 3ad400a92e9c7d2f7caa6c6f811dad9b7d3f333c
Author: Tejun Heo <htejun at gmail.com>
Date:   Wed Apr 30 16:35:11 2008 +0900

    sata_inic162x: use IDMA for ATA_PROT_DMA
    
    The modified driver on initio site has enough clue on how to use IDMA.
    Use IDMA for ATA_PROT_DMA.
    
    * LBA48 now works as long as it uses DMA (LBA48 devices still aren't
      allowed as it can destroy data if PIO is used for any reason).
    
    * No need to mask IRQs for read DMAs as IDMA_DONE is properly raised
      after transfer to memory is actually completed.  There will be some
      spurious interrupts but host_intr will handle it correctly and
      manipulating port IRQ mask interacts badly with the other port for
      some reason, so command type dependent port IRQ masking is not used
      anymore.
    
    Signed-off-by: Tejun Heo <htejun at gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 364fac0e56b9bd379330ef9e39d3761f0b491e2c
Author: Tejun Heo <htejun at gmail.com>
Date:   Thu May 1 23:55:58 2008 +0900

    sata_inic162x: update TF read handling
    
    inic162x can't reliably read back TF or at least we don't know how to
    do it yet.  The only values which seem reliable are status and error.
    This patch updates access to TF.
    
    * implement inic_tf_read() which reads the TF area in mmio area
    
    * implement custom inic_qc_fill_rtf() which only returns true if
      status indicates device error.  it'll be returning bogus addresses
      for device errors but it'll be able to report why it failed at
      least.
    
    * implement custom inic_check_ready() and use ata_wait_after_reset()
      instead of the SFF version.
    
    * use inic_tf_read() for classification.
    
    This is not perfect but it fixes hotplug detection failure and at
    least makes the driver report 0's instead of random garbages while
    reporting valid status and error for device errors.
    
    Signed-off-by: Tejun Heo <htejun at gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit b0dd9b8ef985291a8b40118c5f33b7935e273dcb
Author: Tejun Heo <htejun at gmail.com>
Date:   Wed Apr 30 16:35:09 2008 +0900

    sata_inic162x: add / update constants
    
    * add a bunch of constants, most are from the datasheet, a few
      undocumented ones are from initio's modified driver
    
    * HCTL_PWRDWN is bit 12 not 13
    
    This is in preparation of further inic162x updates.
    
    Signed-off-by: Tejun Heo <htejun at gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 36f674d9a65264d3826ca7300bed441e22a624b2
Author: Tejun Heo <htejun at gmail.com>
Date:   Wed Apr 30 16:35:08 2008 +0900

    sata_inic162x: misc clean ups
    
    * use larger indents for structure member definitions
    
    * kill unused variable @addr in inic_scr_write()
    
    * kill unnecessary flushes in inic_freeze/thaw()
    
    * kill buggy explicit kfree() on devres managed port private data
    
    This is in preparation of further inic162x updates.
    
    Signed-off-by: Tejun Heo <htejun at gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit c46938ccfe35a58a0873715ee4c26fc9eb8d87b3
Author: Mark Lord <liml at rtr.ca>
Date:   Fri May 2 14:02:28 2008 -0400

    sata_mv use hweight16() for bit counting (V2)
    
    Some tidying as suggested by Grant Grundler.
    
    Nuke local bit-counting function from sata_mv in favour of using hweight16().
    Also add a short explanation for the 15msec timeout used when waiting for empty/idle.
    
    Signed-off-by: Mark Lord <mlord at pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 4c299ca3649ccf666819e7d4a27a68c39fa174f1
Author: Mark Lord <liml at rtr.ca>
Date:   Fri May 2 02:16:20 2008 -0400

    sata_mv NCQ-EH for FIS-based switching
    
    Convert sata_mv's EH for FIS-based switching (FBS) over to the
    sequence recommended by Marvell.  This enables us to catch/analyze
    multiple failed links on a port-multiplier when using NCQ.
    
    To do this, we clear the ERR_DEV bit in the EDMA Halt-Conditions register,
    so that the EDMA engine doesn't self-disable on the first NCQ error.
    
    Our EH code sets the MV_PP_FLAG_DELAYED_EH flag to prevent new commands
    being queued while we await completion of all outstanding NCQ commands
    on all links of the failed PM.
    
    The SATA Test Control register tells us which links have failed,
    so we must only wait for any other active links to finish up
    before we stop the EDMA and run the .error_handler afterward.
    
    The patch also includes skeleton code for handling of non-NCQ FBS operation.
    This is more for documentation purposes right now, as that mode is not yet
    enabled in sata_mv.
    
    Signed-off-by: Mark Lord <mlord at pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 29d187bb1e30682e228ce461c487d78d945c3e4f
Author: Mark Lord <liml at rtr.ca>
Date:   Fri May 2 02:15:37 2008 -0400

    sata_mv delayed eh handling
    
    Introduce a new "delayed error handling" mechanism in sata_mv,
    to enable us to eventually deal with multiple simultaneous NCQ
    failures on a single host link when a PM is present.
    
    This involves a port flag (MV_PP_FLAG_DELAYED_EH) to prevent new
    commands being queued, and a pmp bitmap to indicate which pmp links
    had NCQ errors.
    
    The new mv_pmp_error_handler() uses those values to invoke
    ata_eh_analyze_ncq_error() on each failed link, prior to freezing
    the port and passing control to sata_pmp_error_handler().
    
    This is based upon a strategy suggested by Tejun.
    
    For now, we just implement the delayed mechanism.
    The next patch in this series will add the multiple-NCQ EH code
    to take advantage of it.
    
    Signed-off-by: Mark Lord <mlord at pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 10acf3b0d3b46c6ef5d6f0722f72ad9b743ea848
Author: Mark Lord <liml at rtr.ca>
Date:   Fri May 2 02:14:53 2008 -0400

    libata: export ata_eh_analyze_ncq_error
    
    Export ata_eh_analyze_ncq_error() for subsequent use by sata_mv,
    as suggested by Tejun.
    
    Signed-off-by: Mark Lord <mlord at pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit a90103298fd5ccd9a9df6d47bde9a3f371707037
Author: Mark Lord <liml at rtr.ca>
Date:   Fri May 2 02:14:02 2008 -0400

    sata_mv new mv_port_intr function
    
    Separate out the inner loop body of mv_host_intr()
    into it's own function called mv_port_intr().
    
    This should help maintainabilty.
    
    Signed-off-by: Mark Lord <mlord at pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit eabd5eb1cb59bfb162e7aa23007248f2bb480816
Author: Mark Lord <liml at rtr.ca>
Date:   Fri May 2 02:13:27 2008 -0400

    sata_mv fix mv_host_intr bug for hc_irq_cause
    
    Remove the unwanted reads of hc_irq_cause from mv_host_intr(),
    thereby removing a bug whereby we were not always reading it when needed..
    
    Signed-off-by: Mark Lord <mlord at pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 37b9046a3e433a0b0c39ad1e81ec187d5be800ba
Author: Mark Lord <liml at rtr.ca>
Date:   Fri May 2 02:12:34 2008 -0400

    sata_mv NCQ and SError fixes for mv_err_intr
    
    Sigh.  Undo some earlier changes to mv_port_intr(),
    so that we now read/clear SError again in all cases.
    
    Arrange the top of the function to be as close as possible
    to what we need for a later update (in this series) for ERR_DEV handling.
    
    Fix things so that libata-eh can attempt a READ_LOG_EXT_10H
    in response to a failed NCQ command, by just doing a local
    mv_eh_freeze() rather than ata_port_freeze().
    
    This will now fully handle NCQ errors much of the time,
    but more fixes are needed for FBS/PMP, and for certain chip errata.
    
    Signed-off-by: Mark Lord <mlord at pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 00f42eabb204c68fa64ef72de834e74aca15c81f
Author: Mark Lord <liml at rtr.ca>
Date:   Fri May 2 02:11:45 2008 -0400

    sata_mv rearrange mv_config_fbs
    
    Rearrange mv_config_fbs() to more closely follow the (corrected) datasheet
    recommendations for NCQ and FIS-based switching (FBS).
    
    Also, maintain a port flag to let us know when FBS is enabled.
    We will make more use of that flag later in this patch series.
    
    Signed-off-by: Mark Lord <mlord at pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit dd2890f60f8e15f14c8eb132779b2f15c49d1203
Author: Mark Lord <liml at rtr.ca>
Date:   Fri May 2 02:10:56 2008 -0400

    sata_mv errata workaround for sata25 part 1
    
    Part 1 of workaround for errata "sata#25" for the 60x1 series
    (the second half of this errata workaround is still in development.
    
    Bit22 of the GPIO port has to be set "on" when in NCQ mode.
    
    Signed-off-by: Mark Lord <mlord at pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 3e4a139107e497a741c26f8a377a10f214d63ec1
Author: Mark Lord <liml at rtr.ca>
Date:   Fri May 2 02:10:02 2008 -0400

    sata_mv new mv_qc_defer method
    
    The EDMA engine cannot tolerate a mix of NCQ/non-NCQ commands,
    and cannot be used for PIO at all.  So we need to prevent libata
    from trying to feed us such mixtures.
    
    Introduce mv_qc_defer() for this purpose, and use it for all chip versions.
    
    Signed-off-by: Mark Lord <mlord at pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 9b2c4e0bae854fb5e88c9cacc0dacf21631c5cb0
Author: Mark Lord <liml at rtr.ca>
Date:   Fri May 2 02:09:14 2008 -0400

    sata_mv wait for empty+idle
    
    When performing EH, it is recommended to wait for the EDMA engine
    to empty out requests-in-progress before disabling EDMA.
    
    Introduce code to poll the EDMA_STATUS register for idle/empty bits
    before disabling EDMA.  For non-EH operation, this will normally exit
    without delay, other than the register read.
    
    A later series of patches may focus on eliminating this and various
    other register reads (when possible) throughout the driver,
    but for now we're focussing on solid reliablity.
    
    Signed-off-by: Mark Lord <mlord at pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 616d4a98ad8749ebe17a8fcac67df65c321350ac
Author: Mark Lord <liml at rtr.ca>
Date:   Fri May 2 02:08:32 2008 -0400

    sata_mv pci features
    
    Some of the GenIIe EDMA optimizations should not be used
    for non-PCI (SOC) devices, and nor for certain configurations
    of conventional PCI (non PCI-X, PCIe) buses.
    
    Logic taken/simplified from that in the Marvell proprietary driver.
    
    Signed-off-by: Mark Lord <mlord at pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 8e7decdb8b132ee970a2636931b7653dec6af472
Author: Mark Lord <liml at rtr.ca>
Date:   Fri May 2 02:07:51 2008 -0400

    sata_mv more cosmetic changes
    
    More cosmetic changes; no code changes.
    
     -- try and improve consistency of naming.
     -- add missing _OFS to tails of register offset definitions.
     -- rename mv_setup_ifctl() to mv_setup_ifcfg(), since that's what it really does.
     -- remove/move some dead comments
    
    Signed-off-by: Mark Lord <mlord at pobox.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 07ab85de4d960b6f39395e51c1853485ad120de5
Author: Alek Du <alek.du at intel.com>
Date:   Tue May 6 21:31:41 2008 +0800

    libata: Add Intel SCH PATA driver
    
    This patch adds Intel SCH chipsets (AF82US15W, AF82US15L, AF82UL11L)
    PATA controller support.
    
    Signed-off-by: Alek Du <alek.du at intel.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit cb6716c879ecf49e2af344926c6a476821812061
Author: Tejun Heo <htejun at gmail.com>
Date:   Thu May 1 10:03:08 2008 +0900

    ata_piix: verify SIDPR access before enabling it
    
    On certain configurations (certain macbooks), even though all the
    conditions for SIDPR access described in the datasheet are met,
    actually reading those registers just returns 0 and have no effect on
    write.  Verify SIDPR is actually working before enabling it.
    
    This is reported by Ryan Roth in bz#10512.
    
    Signed-off-by: Tejun Heo <htejun at gmail.com>
    Cc: Ryan Roth <ryan.roth at ch2m.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 78ab88f04f44bed566d51dce0c7cbfeff6449a06
Author: Tejun Heo <htejun at gmail.com>
Date:   Thu May 1 23:41:41 2008 +0900

    libata: improve post-reset device ready test
    
    Some controllers (jmb and inic162x) use 0x77 and 0x7f to indicate that
    the device isn't ready yet.  It looks like they use 0xff if device
    presence is detected but connection isn't established.  0x77 or 0x7f
    after connection is established and use the value from signature FIS
    after receiving it.
    
    This patch implements ata_check_ready(), which takes TF status value
    and determines whether the port is ready or not considering the above
    and other conditions, and use it in @check_ready() functions.  This is
    safe as both 0x77 and 0x7f aren't valid ready status value even though
    they have BSY bit cleared.
    
    This fixes hot plug detection failures which can be triggered with
    certain drives if they aren't already spun up when the data connector
    is hot plugged.
    
    Tested on sil, sil24, ahci (jmb/ich), piix and inic162x combined with
    eight drives from all major vendors.
    
    Signed-off-by: Tejun Heo <htejun at gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 4880d10927c93d858d40e297361fff375ee98492
Merge: a15306365a16380f3bafee9e181ba01231d4acd7 9d1045ad68fcccfaf1393cc463ab6357693e8d1d
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue May 6 07:49: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:
      net_cls_act: act_simple dont ignore realloc code
      iwlwifi: make IWLWIFI a tristate
      Revert "atm: Do not free already unregistered net device."
      dccp: return -EINVAL on invalid feature length
      irda: fix !PNP support for drivers/net/irda/smsc-ircc2.c
      irda: fix !PNP support in drivers/net/irda/nsc-ircc.c
      net_cls_act: Make act_simple use of netlink policy.
      ip: Use inline function dst_metric() instead of direct access to dst->metric[]
      ip: Make use of the inline function dst_metric_locked()
      atm: Bad locking on br2684_devs modifications.
      atm: Do not free already unregistered net device.
      mac80211: Do not free net device after it is unregistered.
      bridge: Consolidate error paths in br_add_bridge().
      bridge: Net device leak in br_add_bridge().
      niu: Fix probing regression for maramba on-board chips.
      lapbeth: Release ->ethdev when unregistering device.
      xfrm: convert empty xfrm_audit_* macros to functions
      net: Fix useless comment reference loop.
      sch_htb: remove from event queue in htb_parent_to_leaf()

commit 9d1045ad68fcccfaf1393cc463ab6357693e8d1d
Author: Jamal Hadi Salim <hadi at cyberus.ca>
Date:   Tue May 6 00:10:24 2008 -0700

    net_cls_act: act_simple dont ignore realloc code
    
    reallocation of the policy data was being ignored. It could fail.
    Simplify so that there is no need for reallocating.
    
    Signed-off-by: Jamal Hadi Salim <hadi at cyberus.ca>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 1da5ea1a8bf4ddb82831528223c853821cb1c9ab
Author: Adrian Bunk <bunk at kernel.org>
Date:   Tue May 6 00:04:47 2008 -0700

    iwlwifi: make IWLWIFI a tristate
    
    IWLWIFI should be a tristate so that if IWLCORE and/or IWL3945 are m
    and none of them is y kbuild doesn't create an empty
    drivers/net/wireless/built-in.o
    
    This patch also removes the pointless "default n".
    
    Signed-off-by: Adrian Bunk <bunk at kernel.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 5f6b1ea41b46bc63f667f9b30d939b49734c20b0
Author: David S. Miller <davem at davemloft.net>
Date:   Tue May 6 00:00:16 2008 -0700

    Revert "atm: Do not free already unregistered net device."
    
    This reverts commit 65e4113684e50cee75357ce10dc9026b0929e4e9.
    
    Unlike the other cases Pavel fixed, this case did not
    setup a netdev->destructor of free_netdev, therefore this
    change was not correct.
    
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit a15306365a16380f3bafee9e181ba01231d4acd7
Merge: bb896afe2089575ca1bb1fbf3f07b934e1ba999b c5057ddccbcb4bf363af628d7963a7475f4114a7
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Mon May 5 17:31:41 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:
      mlx4_core: Support creation of FMRs with pages smaller than 4K
      IB/ehca: Fix function return types
      RDMA/cxgb3: Bump up the MPA connection setup timeout.
      RDMA/cxgb3: Silently ignore close reply after abort.
      RDMA/cxgb3: QP flush fixes
      IB/ipoib: Fix transmit queue stalling forever
      IB/mlx4: Fix off-by-one errors in calls to mlx4_ib_free_cq_buf()

commit bb896afe2089575ca1bb1fbf3f07b934e1ba999b
Merge: 2e83fc4df5f27dfc1b53044c4f142b2f9d1db08c aac6abca858386438d9a7233c3471d2ecfa2f704
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Mon May 5 17:31:14 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-fixes
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-fixes:
      sched: default to n for GROUP_SCHED and FAIR_GROUP_SCHED
      sched: add optional support for CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
      sched, x86: add HAVE_UNSTABLE_SCHED_CLOCK
      sched: fix cpu clock
      sched: fair-group: fix a Div0 error of the fair group scheduler
      sched: fix missing locking in sched_domains code
      sched: make clock sync tunable by architecture code
      sched: fix debugging
      sched: fix sched_info_switch not being called according to documentation
      sched: fix hrtick_start_fair and CPU-Hotplug
      sched: fix SCHED_FAIR wake-idle logic error
      sched: fix RT task-wakeup logic
      sched: add statics, don't return void expressions
      sched: add debug checks to idle functions
      sched: remove old sched doc
      sched: make rt_sched_class, idle_sched_class static
      sched: optimize calc_delta_mine()
      sched: fix normalized sleeper

commit c5057ddccbcb4bf363af628d7963a7475f4114a7
Author: Oren Duer <oren at mellanox.co.il>
Date:   Mon May 5 15:56:52 2008 -0700

    mlx4_core: Support creation of FMRs with pages smaller than 4K
    
    Don't hard code a test against a minimum page shift of 12, since the
    device may support smaller pages.  Test against the actual smallest
    page size from the device capabilities.
    
    Signed-off-by: Oren Duer <oren at mellanox.co.il>
    Signed-off-by: Jack Morgenstein <jackm at dev.mellanox.co.il>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit cf04690885972eaba830ee761de545a6956197e6
Author: Stefan Roscher <ossrosch at linux.vnet.ibm.com>
Date:   Mon May 5 15:51:49 2008 -0700

    IB/ehca: Fix function return types
    
    Also remove duplicate assignment of local_ca_ack_delay and change
    min_t check for local_ca_ack_delay to u8 instead of int.
    
    Signed-off-by: Stefan Roscher <stefan.roscher at de.ibm.com>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit 2e83fc4df5f27dfc1b53044c4f142b2f9d1db08c
Merge: 17aa7e034416e3080bc57a786d09ba0a4a044561 9185ef6787f1c8f1c06aa0cb3c7746fb4f101f50
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Mon May 5 15:48:53 2008 -0700

    Merge branch 'powerpc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
    
    * 'powerpc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
      [POWERPC] Assign PDE->data before gluing PDE into /proc tree
      [POWERPC] devres: Add devm_ioremap_prot()
      [POWERPC] macintosh: ADB driver: adb_handler_sem semaphore to mutex
      [POWERPC] macintosh: windfarm_smu_sat: semaphore to mutex
      [POWERPC] macintosh: therm_pm72: driver_lock semaphore to mutex

commit 17aa7e034416e3080bc57a786d09ba0a4a044561
Author: Stephen Rothwell <sfr at canb.auug.org.au>
Date:   Mon May 5 13:54:19 2008 +1000

    dev_name introduction fall out fix
    
    Commit 06916639e2fed9ee475efef2747a1b7429f8fe76 ("driver-core: add
    dev_name() to help transition away from using bus_id") added a static
    inline dev_name() and used it in dev_printk.
    
    Unfortunately, drivers/edac/edac_core.h defines a macro called
    dev_name().  Rename the latter.
    
    Diagnosis by Tony Breeds and Michael Ellerman.
    
    Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
    Acked-by: Doug Thompson <dougthompson at xmission.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit aac6abca858386438d9a7233c3471d2ecfa2f704
Author: Parag Warudkar <parag.warudkar at gmail.com>
Date:   Sat May 3 20:42:34 2008 -0400

    sched: default to n for GROUP_SCHED and FAIR_GROUP_SCHED
    
    GROUP_SCHED is confirmed to cause unacceptable latencies, see:
    
       http://lkml.org/lkml/2008/5/2/370.
    
    Mark it EXPERIMENTAL and default to no for now.
    
    Signed-off-by: Parag Warudkar <parag.warudkar at gmail.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 3e51f33fcc7f55e6df25d15b55ed10c8b4da84cd
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date:   Sat May 3 18:29:28 2008 +0200

    sched: add optional support for CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
    
    this replaces the rq->clock stuff (and possibly cpu_clock()).
    
     - architectures that have an 'imperfect' hardware clock can set
       CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
    
     - the 'jiffie' window might be superfulous when we update tick_gtod
       before the __update_sched_clock() call in sched_clock_tick()
    
     - cpu_clock() might be implemented as:
    
         sched_clock_cpu(smp_processor_id())
    
       if the accuracy proves good enough - how far can TSC drift in a
       single jiffie when considering the filtering and idle hooks?
    
    [ mingo at elte.hu: various fixes and cleanups ]
    
    Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit a5574cf65b5f03ce9ade3918764fe22e5e2371e3
Author: Ingo Molnar <mingo at elte.hu>
Date:   Mon May 5 23:19:50 2008 +0200

    sched, x86: add HAVE_UNSTABLE_SCHED_CLOCK
    
    add the HAVE_UNSTABLE_SCHED_CLOCK, for architectures to select.
    
    the next change utilizes it.
    
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit dfbf4a1bc319f0f9a31e39b2da1fa5c55e85af89
Author: Ingo Molnar <mingo at elte.hu>
Date:   Wed Apr 23 09:24:06 2008 +0200

    sched: fix cpu clock
    
    David Miller pointed it out that nothing in cpu_clock() sets
    prev_cpu_time. This caused __sync_cpu_clock() to be called
    all the time - against the intention of this code.
    
    The result was that in practice we hit a global spinlock every
    time cpu_clock() is called - which - even though cpu_clock()
    is used for tracing and debugging, is suboptimal.
    
    While at it, also:
    
    - move the irq disabling to the outest layer,
      this should make cpu_clock() warp-free when called with irqs
      enabled.
    
    - use long long instead of cycles_t - for platforms where cycles_t
      is 32-bit.
    
    Reported-by: David Miller <davem at davemloft.net>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit cb4ad1ffc7c0d8ea7dc8cd8ba303d83551716d46
Author: Miao Xie <miaox at cn.fujitsu.com>
Date:   Mon Apr 28 12:54:56 2008 +0800

    sched: fair-group: fix a Div0 error of the fair group scheduler
    
    When I echoed 0 into the "cpu.shares" file, a Div0 error occured.
    
    We found it is caused by the following calling.
    
       sched_group_set_shares(tg, shares)
           set_se_shares(tg->se[i], shares/nr_cpu_ids)
               __set_se_shares(se, shares)
                   div64_64((1ULL<<32), shares)
    
    When the echoed value was less than the number of processores, the result of the
    sentence "shares/nr_cpu_ids" was 0, and then the system called div64() to divide
    the result, the Div0 error occured.
    
    It is unnecessary that the shares value is divided by nr_cpu_ids, I think.
    Because in the function  __update_group_shares_cpu() and init_tg_cfs_entry(),
    the shares value isn't divided by nr_cpu_ids when setting shares of the sched
    entity.
    
    This patch fixes this bug. And echoing ULONG_MAX value into cpu.shares also
    causes Div0 error, so we set a macro MAX_SHARES to limit the max value of
    shares.
    
    Signed-off-by: Miao Xie <miaox at cn.fujitsu.com>
    Acked-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 712555ee4f873515612f89554ad1a3fda5fa887e
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date:   Mon Apr 28 11:33:07 2008 +0200

    sched: fix missing locking in sched_domains code
    
    Concurrent calls to detach_destroy_domains and arch_init_sched_domains
    were prevented by the old scheduler subsystem cpu hotplug mutex. When
    this got converted to get_online_cpus() the locking got broken.
    Unlike before now several processes can concurrently enter the critical
    sections that were protected by the old lock.
    
    So use the already present doms_cur_mutex to protect these sections again.
    
    Cc: Gautham R Shenoy <ego at in.ibm.com>
    Cc: Paul Jackson <pj at sgi.com>
    Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 690229a0912ca2fef8b542fe4d8b73acfcdc6e24
Author: Ingo Molnar <mingo at elte.hu>
Date:   Wed Apr 23 09:31:35 2008 +0200

    sched: make clock sync tunable by architecture code
    
    make time_sync_thresh tunable to architecture code.
    
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit d7dcdc11cfa6a8860a29b09f985467b89224699d
Author: Mike Galbraith <efault at gmx.de>
Date:   Tue Apr 29 12:23:09 2008 +0200

    sched: fix debugging
    
    Revert debugging commit 7ba2e74ab5a0518bc953042952dd165724bc70c9.
    print_cfs_rq_tasks() can induce live-lock if a task is dequeued
    during list traversal.
    
    Signed-off-by: Mike Galbraith <efault at gmx.de>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 673a90a1e05c8127886f7659d1a457169378371f
Author: David Simner <djs203 at srcf.ucam.org>
Date:   Tue Apr 29 10:08:59 2008 +0100

    sched: fix sched_info_switch not being called according to documentation
    
    http://bugzilla.kernel.org/show_bug.cgi?id=10545
    
    sched_stats.h says that __sched_info_switch is "called when prev !=
    next" in the comment.  sched.c should therefore do that.
    
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit b328ca182f01c2a04b85e0ee8a410720b104fbcc
Author: Peter Zijlstra <peterz at infradead.org>
Date:   Tue Apr 29 10:02:46 2008 +0200

    sched: fix hrtick_start_fair and CPU-Hotplug
    
    Gautham R Shenoy reported:
    
     > While running the usual CPU-Hotplug stress tests on linux-2.6.25,
     > I noticed the following in the console logs.
     >
     > This is a wee bit difficult to reproduce. In the past 10 runs I hit this
     > only once.
     >
     > ------------[ cut here ]------------
     >
     > WARNING: at kernel/sched.c:962 hrtick+0x2e/0x65()
     >
     > Just wondering if we are doing a good job at handling the cancellation
     > of any per-cpu scheduler timers during CPU-Hotplug.
    
    This looks like its indeed not cancelled at all and migrates the it to
    another cpu. Fix it via a proper hotplug notifier mechanism.
    
    Reported-by: Gautham R Shenoy <ego at in.ibm.com>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
    Cc: stable at kernel.org
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 104f64549c961a797ff5f7c59946a7caa335c5b0
Author: Gregory Haskins <ghaskins at novell.com>
Date:   Mon Apr 28 12:40:01 2008 -0400

    sched: fix SCHED_FAIR wake-idle logic error
    
    We currently use an optimization to skip the overhead of wake-idle
    processing if more than one task is assigned to a run-queue.  The
    assumption is that the system must already be load-balanced or we
    wouldnt be overloaded to begin with.
    
    The problem is that we are looking at rq->nr_running, which may include
    RT tasks in addition to CFS tasks.  Since the presence of RT tasks
    really has no bearing on the balance status of CFS tasks, this throws
    the calculation off.
    
    This patch changes the logic to only consider the number of CFS tasks
    when making the decision to optimze the wake-idle.
    
    Signed-off-by: Gregory Haskins <ghaskins at novell.com>
    CC: Peter Zijlstra <peterz at infradead.org>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 8ae121ac8666b0421aa20fd80d4597ec66fa54bc
Author: Gregory Haskins <ghaskins at novell.com>
Date:   Wed Apr 23 07:13:29 2008 -0400

    sched: fix RT task-wakeup logic
    
    Dmitry Adamushko pointed out a logic error in task_wake_up_rt() where we
    will always evaluate to "true".  You can find the thread here:
    
    http://lkml.org/lkml/2008/4/22/296
    
    In reality, we only want to try to push tasks away when a wake up request is
    not going to preempt the current task.  So lets fix it.
    
    Note: We introduce test_tsk_need_resched() instead of open-coding the flag
    check so that the merge-conflict with -rt should help remind us that we
    may need to support NEEDS_RESCHED_DELAYED in the future, too.
    
    Signed-off-by: Gregory Haskins <ghaskins at novell.com>
    CC: Dmitry Adamushko <dmitry.adamushko at gmail.com>
    CC: Steven Rostedt <rostedt at goodmis.org>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 983ed7a66bcec9dc307d89dc7af47cdf209e56af
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Thu Apr 24 18:17:55 2008 -0700

    sched: add statics, don't return void expressions
    
    Noticed by sparse:
    kernel/sched.c:760:20: warning: symbol 'sched_feat_names' was not declared. Should it be static?
    kernel/sched.c:767:5: warning: symbol 'sched_feat_open' was not declared. Should it be static?
    kernel/sched_fair.c:845:3: warning: returning void-valued expression
    kernel/sched.c:4386:3: warning: returning void-valued expression
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit d478c2cfaa2476f8b6876f9eb4d8fddcfa986479
Author: Andrew Morton <akpm at linux-foundation.org>
Date:   Sat Apr 26 11:30:34 2008 -0700

    sched: add debug checks to idle functions
    
    Cc: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
    Cc: "Justin Mattock" <justinmattock at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 733a0771df46af942b8355cd8bb15780106b4353
Author: Ingo Molnar <mingo at elte.hu>
Date:   Mon Apr 28 14:05:18 2008 +0200

    sched: remove old sched doc
    
    Fabio Checconi noticed that Documentation/scheduler/sched-design.txt was
    a stale copy of the old scheduler. Remove it.
    
    Reported-by: Fabio Checconi <fabio at gandalf.sssup.it>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 2abdad0a4cd8f9413f778cc998e0ee7d60b28417
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Fri Apr 25 10:53:13 2008 -0700

    sched: make rt_sched_class, idle_sched_class static
    
    The C files are included directly in sched.c, so they are
    effectively static.
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Acked-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit e05510d01ad1565e5e086a939261084d67ba2b10
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date:   Mon May 5 23:56:17 2008 +0200

    sched: optimize calc_delta_mine()
    
    Joel noticed that the !lw->inv_weight contition isn't unlikely anymore so
    remove the unlikely annotation. Also, remove the two div64_u64() inv_weight
    calculations, which makes them rely on the calc_delta_mine() path as well.
    
    Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
    CC: Joel Schopp <jschopp at austin.ibm.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit a992241de614dd2b7c97a9ba64e28c0e563f19bf
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date:   Mon May 5 23:56:17 2008 +0200

    sched: fix normalized sleeper
    
    Normalized sleeper uses calc_delta*() which requires that the rq load is
    already updated, so move account_entity_enqueue() before place_entity()
    
    Tested-by: Frans Pop <elendil at planet.nl>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 19443178fbfbf40db15c86012fc37df1a44ab857
Author: Chris Wright <chrisw at sous-sol.org>
Date:   Mon May 5 13:50:24 2008 -0700

    dccp: return -EINVAL on invalid feature length
    
    dccp_feat_change() validates length and on error is returning 1.
    This happens to work since call chain is checking for 0 == success,
    but this is returned to userspace, so make it a real error value.
    
    Signed-off-by: Chris Wright <chrisw at sous-sol.org>
    Acked-by: Arnaldo Carvalho de Melo <acme at redhat.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 108c1961847df2a875047c0fd27b419cb817d213
Merge: 48fc8de9cd093b8c9e2cfa339421862bae3a6cad 0df18ff366853cdf31e5238764ec5c63e6b5a398
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Mon May 5 12:39:10 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:
      x86 PCI: call dmi_check_pciprobe()
      x86/pci: add pci=skip_isa_align command lines.
      x86/pci: remove flag in pci_cfg_space_size_ext
      x86: fix section mismatch in pci_scan_bus

commit 48fc8de9cd093b8c9e2cfa339421862bae3a6cad
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date:   Mon May 5 21:27:21 2008 +0200

    CONFIG_SCSI_MAC_ESP needs CONFIG_SCSI_SPI_ATTRS
    
    The new mac_esp scsi driver needs CONFIG_SCSI_SPI_ATTRS, just like all other
    drivers using the new esp_scsi core.
    
    Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit b6d9d267f0d68104df910fca89149803aec82426
Author: Finn Thain <fthain at telegraphics.com.au>
Date:   Mon May 5 21:26:15 2008 +0200

    m68k: remove old mac_esp cruft
    
    Remove the rest of the old mac_esp driver. Also ditch the rest of the
    machw mechanism, it needs to be replaced by a fake openfirmware tree.
    
    Signed-off-by: Finn Thain <fthain at telegraphics.com.au>
    Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 3b17f136bf32984eb0faeb116bcd44ffe3503782
Author: Roman Zippel <zippel at linux-m68k.org>
Date:   Mon May 5 21:25:48 2008 +0200

    m68k: Handle 68040 bus faults
    
    Fix 68040 bus fault handling, so the standard kernel exception handling
    can be used for i/o probing.
    
    Contrary to normal access faults there is nothing to fix, but at least
    we have to disable writebacks to avoid recursive faults.
    
    Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
    Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 4933d07531711e399d8d578036aa9fc1be2f9b20
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date:   Mon May 5 21:16:13 2008 +0200

    m68k: drivers/input/serio/hp_sdc.c needs <linux/semaphore.h>
    
    drivers/input/serio/hp_sdc.c: In function 'hp_sdc_take':
    drivers/input/serio/hp_sdc.c:198: error: implicit declaration of function 'up'
    
    Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 63a59fa7a74fccff64dbf7d9230bd9d91bddead4
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date:   Mon May 5 21:15:48 2008 +0200

    m68k: serial167 missing return value in cy_put_char()
    
        commit a5b08c66194fba02a865b397579b7204688bcb1e
        Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
        Date:   Wed Apr 30 00:54:05 2008 -0700
    
        serial167: switch to int put_char method
    
    missed one case when adding return values.
    
    Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit ab1a852128d6f0677999eecbf6d04bf9f6fe9a9a
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date:   Mon May 5 21:15:19 2008 +0200

    m68k: Fix falconide `data_adr' typo
    
        commit 9567b349f7e7dd7e2483db99ee8e4a6fe0caca38
        Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
        Date:   Mon Apr 28 23:44:36 2008 +0200
    
        ide: merge ->atapi_*put_bytes and ->ata_*put_data methods
    
    introduced a typo (`data_adr' instead of `data_addr'), leading to a compile
    failure.
    
    Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 5717922a1b8cc477f45a0f4f11fe619392ba7133
Merge: 50f7ad2500b27ce5c42be3a6936f143b158f7bc3 e024cbd257efc2788b7d21b9353e966267485c87
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Mon May 5 10:17:30 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:
      kgdb: kconfig fix xconfig/menuconfig element
      kgdb: fix signedness mixmatches, add statics, add declaration to header
      kgdb: 1000 loops for the single step test in kgdbts
      kgdb: trivial sparse fixes in kgdb test-suite
      kgdb: minor documentation fixes

commit 50f7ad2500b27ce5c42be3a6936f143b158f7bc3
Merge: 82af7aca56c67061420d618cc5a30f0fd4106b80 2c36eecfb6471c457994647771d1405502ad5fde
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Mon May 5 10:16:42 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] soc - fix S3C2410 i2s programming error
      [ALSA] soc - fix s3c2410 PCM breakage
      [ALSA] ac97 - Add a workaround for broken quirk for VT1617A codec
      [ALSA] Revert migration to alc_set_pin_output() in alc861_auto_set_output_and_unmute()
      [ALSA] fm801 - Fix kconfig dependency mess of fm801-tea575x
      [ALSA] hda - Support IDT 92HD206 codec
      [ALSA] pcsp: Fix build with CONFIG_PM=n

commit 0df18ff366853cdf31e5238764ec5c63e6b5a398
Author: Yinghai Lu <yhlu.kernel at gmail.com>
Date:   Mon Apr 14 15:40:37 2008 -0700

    x86 PCI: call dmi_check_pciprobe()
    
    this change:
    
    | commit 08f1c192c3c32797068bfe97738babb3295bbf42
    | Author: Muli Ben-Yehuda <muli at il.ibm.com>
    | Date:   Sun Jul 22 00:23:39 2007 +0300
    |
    |    x86-64: introduce struct pci_sysdata to facilitate sharing of ->sysdata
    |
    |    This patch introduces struct pci_sysdata to x86 and x86-64, and
    |    converts the existing two users (NUMA, Calgary) to use it.
    |
    |    This lays the groundwork for having other users of sysdata, such as
    |    the PCI domains work.
    |
    |    The Calgary bits are tested, the NUMA bits just look ok.
    
    replaces pcibios_scan_root with pci_scan_bus_parented...
    
    but in pcibios_scan_root we have a DMI check:
    
        dmi_check_system(pciprobe_dmi_table);
    
    when when have several peer root buses this could be called multiple
    times (which is bad), so move that call to pci_access_init().
    
    Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>

commit 13a6ddb08e58a1bd344da7898c4e2f13bdf18c2f
Author: Yinghai Lu <yhlu.kernel.send at gmail.com>
Date:   Thu Mar 27 01:31:18 2008 -0700

    x86/pci: add pci=skip_isa_align command lines.
    
    so we don't align the io port start address for pci cards.
    
    also move out dmi check out acpi.c, because it has nothing to do with acpi.
    it could spare some calling when we have several peer root buses.
    
    Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>

commit 82af7aca56c67061420d618cc5a30f0fd4106b80
Author: Eric Sesterhenn <snakebyte at gmx.de>
Date:   Fri Jan 25 10:40:46 2008 +0100

    Removal of FUTEX_FD
    
    Since FUTEX_FD was scheduled for removal in June 2007 lets remove it.
    
    Google Code search found no users for it and NGPT was abandoned in 2003
    according to IBM.  futex.h is left untouched to make sure the id does
    not get reassigned.  Since queue_me() has no users left it is commented
    out to avoid a warning, i didnt remove it completely since it is part of
    the internal api (matching unqueue_me())
    
    Signed-off-by: Eric Sesterhenn <snakebyte at gmx.de>
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au> (removed rest)
    Acked-by: Thomas Gleixner <tglx at linutronix.de>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit e024cbd257efc2788b7d21b9353e966267485c87
Author: Jan Engelhardt <jengelh at computergmbh.de>
Date:   Fri Apr 25 18:35:29 2008 +0200

    kgdb: kconfig fix xconfig/menuconfig element
    
    Kconfig.kgdb: fix menuconfig element
    
    Signed-off-by: Jan Engelhardt <jengelh at computergmbh.de>
    Signed-off-by: Jason Wessel <jason.wessel at windriver.com>

commit 688b744d8bc84dc5cc646e97509113dc5e8818ed
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Thu Apr 24 16:57:23 2008 -0500

    kgdb: fix signedness mixmatches, add statics, add declaration to header
    
    Noticed by sparse:
    arch/x86/kernel/kgdb.c:556:15: warning: symbol 'kgdb_arch_pc' was not declared. Should it be static?
    kernel/kgdb.c:149:8: warning: symbol 'kgdb_do_roundup' was not declared. Should it be static?
    kernel/kgdb.c:193:22: warning: symbol 'kgdb_arch_pc' was not declared. Should it be static?
    kernel/kgdb.c:712:5: warning: symbol 'remove_all_break' was not declared. Should it be static?
    
    Related to kgdb_hex2long:
    arch/x86/kernel/kgdb.c:371:28: warning: incorrect type in argument 2 (different signedness)
    arch/x86/kernel/kgdb.c:371:28:    expected long *long_val
    arch/x86/kernel/kgdb.c:371:28:    got unsigned long *<noident>
    kernel/kgdb.c:469:27: warning: incorrect type in argument 2 (different signedness)
    kernel/kgdb.c:469:27:    expected long *long_val
    kernel/kgdb.c:469:27:    got unsigned long *<noident>
    kernel/kgdb.c:470:27: warning: incorrect type in argument 2 (different signedness)
    kernel/kgdb.c:470:27:    expected long *long_val
    kernel/kgdb.c:470:27:    got unsigned long *<noident>
    kernel/kgdb.c:894:27: warning: incorrect type in argument 2 (different signedness)
    kernel/kgdb.c:894:27:    expected long *long_val
    kernel/kgdb.c:894:27:    got unsigned long *<noident>
    kernel/kgdb.c:895:27: warning: incorrect type in argument 2 (different signedness)
    kernel/kgdb.c:895:27:    expected long *long_val
    kernel/kgdb.c:895:27:    got unsigned long *<noident>
    kernel/kgdb.c:1127:28: warning: incorrect type in argument 2 (different signedness)
    kernel/kgdb.c:1127:28:    expected long *long_val
    kernel/kgdb.c:1127:28:    got unsigned long *<noident>
    kernel/kgdb.c:1132:25: warning: incorrect type in argument 2 (different signedness)
    kernel/kgdb.c:1132:25:    expected long *long_val
    kernel/kgdb.c:1132:25:    got unsigned long *<noident>
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Signed-off-by: Jason Wessel <jason.wessel at windriver.com>

commit 7cfcd985d36031459cc64e3843ea36a4d801097d
Author: Jason Wessel <jason.wessel at windriver.com>
Date:   Thu Apr 24 16:57:23 2008 -0500

    kgdb: 1000 loops for the single step test in kgdbts
    
    The single step test is not terribly costly and it should be able to
    pass at 1000 loops successfully in under 1 second.  A non-kgdb timing
    regression was found using this test, but it did not occur frequently
    because by default the test was only executed a single time.
    
    This patch changes the default for the single step test to 1000
    iterations and allows for individual configuration of the single step
    test to further exercise the kgdb subsystem when needed.
    
    Signed-off-by: Jason Wessel <jason.wessel at windriver.com>

commit 001fddf5fdcfe2c08ac9c4e5ca80c5e5698363bb
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Thu Apr 24 16:57:23 2008 -0500

    kgdb: trivial sparse fixes in kgdb test-suite
    
    Shadowed variable and integer as NULL pointer fixes:
    drivers/misc/kgdbts.c:877:6: warning: symbol 'sys_open_test' shadows an earlier one
    drivers/misc/kgdbts.c:537:27: originally declared here
    drivers/misc/kgdbts.c:378:22: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:386:22: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:468:30: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:472:15: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:502:30: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:506:30: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:509:30: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:523:20: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:527:20: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:530:15: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:541:21: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:545:21: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:548:15: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:559:30: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:563:15: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:573:16: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:574:19: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:578:15: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:588:16: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:589:19: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:593:15: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:602:16: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:604:15: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:925:3: warning: Using plain integer as NULL pointer
    drivers/misc/kgdbts.c:938:3: warning: Using plain integer as NULL pointer
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Signed-off-by: Jason Wessel <jason.wessel at windriver.com>

commit f92509371ec06227a7e29778f395776d31b0deab
Author: grzegorz.chwesewicz at chilan.com <grzegorz.chwesewicz at chilan.com>
Date:   Thu Apr 24 16:57:22 2008 -0500

    kgdb: minor documentation fixes
    
    Two minor fixes to the kgdb documentation.
    
    Signed-off-by: Grzegorz Chwesewicz, Chilan <grzegorz.chwesewicz at chilan.com>
    Signed-off-by: Jason Wessel <jason.wessel at windriver.com>

commit 2c36eecfb6471c457994647771d1405502ad5fde
Author: Davide Rizzo <davide at elpa.it>
Date:   Mon May 5 14:59:39 2008 +0200

    [ALSA] soc - fix S3C2410 i2s programming error
    
    S3C2410 i2s driver currently manages only i2s protocol (and not left
    justified one) and slave mode.
    With this small patch, other modes are possible.
    
    Signed-off-by: Davide Rizzo <davide at elpa.it>
    Acked-by: Liam Girdwood <lg at opensource.wolfsonmicro.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit d6426171bab3403cdcd5613d5549f20b0ab0967c
Author: Davide Rizzo <davide at elpa.it>
Date:   Mon May 5 14:56:07 2008 +0200

    [ALSA] soc - fix s3c2410 PCM breakage
    
    S3C2410 pcm doesn't work.
    s3c2410_dma_request() now returns the channel number and not 0 if OK.
    
    Signed-off-by: Davide Rizzo <davide at elpa.it>
    Acked-by: Liam Girdwood <lg at opensource.wolfsonmicro.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 2e75d050e42d1c61e820f9a35078a2f69e02cc3e
Author: Takashi Iwai <tiwai at suse.de>
Date:   Sat May 3 18:46:56 2008 +0200

    [ALSA] ac97 - Add a workaround for broken quirk for VT1617A codec
    
    On boards with VT1617A codec, the sound disappears suddenly.
    This looks like a problem with HPE-bit control that is supposed to be
    set in patch_vt1617a().  However, on such problematic hardwares, the
    bit is actually reset mysteriously.
    
    The patch adds a workaround for the wrong quirk.
    
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 564c5bead424fa798dfbd5fe382b4e0b7ea483fb
Author: Jacek Luczak <luczak.jacek at gmail.com>
Date:   Sat May 3 18:41:23 2008 +0200

    [ALSA] Revert migration to alc_set_pin_output() in alc861_auto_set_output_and_unmute()
    
    Change done by:
            commit f6c7e5461e9046445d50c5c7a9a4587824239623
            [ALSA] hda-codec - Fix auto-configuration of Realtek codecs
    broke sound on ALC861 Analog.
    
    Signed-off-by: Jacek Luczak <luczak.jacek at gmail.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 20686c24377246d9eb57782551b25ff19df09873
Author: Takashi Iwai <tiwai at suse.de>
Date:   Fri May 2 12:31:51 2008 +0200

    [ALSA] fm801 - Fix kconfig dependency mess of fm801-tea575x
    
    FM801-tea575x tuner has a reverse selection to V4L1 and this causes
    nasty dependency problems.
    
    The patch simplifies the dependency with a normal
    "depends on VIDEO_V4L1".  This decreases the usability but fixes bugs,
    yeah.  If any better feature like "requires" is introduced to kbuild
    in future, we'll be able to switch it...
    
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 7bd3c0f73c9c5b47fd1ca49757c436e73f4cd55b
Author: Takashi Iwai <tiwai at suse.de>
Date:   Fri May 2 12:28:02 2008 +0200

    [ALSA] hda - Support IDT 92HD206 codec
    
    Added the support for IDT 92HD206 codec chip.
    It's compatible with STAC927x.
    
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 983e0972cea450fe5725d1ba11c78adfd5d7ad3a
Author: Johann Felix Soden <johfel at users.sourceforge.net>
Date:   Fri May 2 09:54:31 2008 +0200

    [ALSA] pcsp: Fix build with CONFIG_PM=n
    
    sound/drivers/pcsp/pcsp.c: In function 'pcsp_suspend':
    sound/drivers/pcsp/pcsp.c:201: error: implicit declaration of function 'snd_pcm_suspend_all'
    
    Signed-off-by: Johann Felix Soden <johfel at users.sourceforge.net>
    CC: Stas Sergeev <stsp at aknet.ru>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 7a1aa309f21ea2f6c31f364341e4027ecf4e79bc
Author: Ingo Molnar <mingo at elte.hu>
Date:   Mon May 5 01:06:54 2008 -0700

    irda: fix !PNP support for drivers/net/irda/smsc-ircc2.c
    
    x86.git testing found this build bug on v2.6.26-rc1:
    
      ERROR: "pnp_get_resource" [drivers/net/irda/smsc-ircc2.ko] undefined!
      make[1]: *** [__modpost] Error 1
      make: *** [modules] Error 2
    
    the driver did not anticipate the case of !CONFIG_PNP which is rare but
    still possible. Instead of restricting the driver to PNP-only in the
    Kconfig space, add the (trivial) dummy struct pnp_driver - this is that
    other drivers use in the !PNP case too.
    
    The driver itself can in theory be initialized on !PNP too in certain
    cases, via smsc_ircc_legacy_probe().
    
    Patch only minimally build tested, i dont have this hardware.
    
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit c17f888f8fc2e47e2b4a51424f8ccf564ae87576
Author: Ingo Molnar <mingo at elte.hu>
Date:   Mon May 5 01:04:06 2008 -0700

    irda: fix !PNP support in drivers/net/irda/nsc-ircc.c
    
    x86.git testing found the following build failure in latest -git:
    
     drivers/built-in.o: In function `nsc_ircc_pnp_probe':
     nsc-ircc.c:(.text+0xdf1b6): undefined reference to `pnp_get_resource'
     nsc-ircc.c:(.text+0xdf1d4): undefined reference to `pnp_get_resource'
     nsc-ircc.c:(.text+0xdf1ee): undefined reference to `pnp_get_resource'
     nsc-ircc.c:(.text+0xdf237): undefined reference to `pnp_get_resource'
     nsc-ircc.c:(.text+0xdf24c): undefined reference to `pnp_get_resource'
     drivers/built-in.o:nsc-ircc.c:(.text+0xdf266): more undefined references to `pnp_get_resource' follow
     make: *** [.tmp_vmlinux1] Error 1
    
    triggered via this config:
    
      http://redhat.com/~mingo/misc/config-Sat_May__3_20_53_13_CEST_2008.bad
    
    while generally most users will have PNP enabled, drivers can support
    non-PNP build mode too - and most drivers implement it. That is typically
    done by providing a dummy pnp_driver structure that will not probe anything.
    
    The fallback routines in the driver will handle this dumber mode of
    operation too.
    
    This patch implements that. I have not tested whether this actually
    works on real hardware so take care. It does resolve the build bug.
    
    [ Another solution that is used by a few drivers is to exclude the driver
      in the Kconfig if PNP is disabled, via "depends on PNP", but this would
      limit the availability of the driver needlessly. ]
    
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit fa1b1cff3d06550d23ef540c4f97ca83c021b473
Author: Jamal Hadi Salim <hadi at cyberus.ca>
Date:   Mon May 5 00:22:35 2008 -0700

    net_cls_act: Make act_simple use of netlink policy.
    
    Convert to netlink helpers by using netlink policy validation.
    As a side effect fixes a leak.
    
    Signed-off-by: Jamal Hadi Salim <hadi at cyberus.ca>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 9185ef6787f1c8f1c06aa0cb3c7746fb4f101f50
Author: Denis V. Lunev <den at openvz.org>
Date:   Sat May 3 06:34:05 2008 +1000

    [POWERPC] Assign PDE->data before gluing PDE into /proc tree
    
    Simply replace proc_create and further data assigned with proc_create_data.
    No need to check for data!=NULL after that.
    
    Signed-off-by: Denis V. Lunev <den at openvz.org>
    Cc: Alexey Dobriyan <adobriyan at openvz.org>
    Cc: Eric W. Biederman <ebiederm at xmission.com>
    Cc: 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 b41e5fffe8b81fc939067d8c1c195cc79115d5a3
Author: Emil Medve <Emilian.Medve at Freescale.com>
Date:   Sat May 3 06:34:04 2008 +1000

    [POWERPC] devres: Add devm_ioremap_prot()
    
    We provide an ioremap_flags, so this provides a corresponding
    devm_ioremap_prot.  The slight name difference is at Ben
    Herrenschmidt's request as he plans on changing ioremap_flags to
    ioremap_prot in the future.
    
    Signed-off-by: Emil Medve <Emilian.Medve at Freescale.com>
    Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
    Acked-by: Tejun Heo <htejun at gmail.com>
    Cc: 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 af3ce514ade2fd0e18c5d078d138a6c1137a33df
Author: Daniel Walker <dwalker at mvista.com>
Date:   Sat May 3 06:34:03 2008 +1000

    [POWERPC] macintosh: ADB driver: adb_handler_sem semaphore to mutex
    
    Signed-off-by: Daniel Walker <dwalker at mvista.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
    Signed-off-by: Paul Mackerras <paulus at samba.org>

commit 56783c5e4dd32ca370ad0bdf3a9c6c1aaee94726
Author: Daniel Walker <dwalker at mvista.com>
Date:   Sat May 3 06:34:02 2008 +1000

    [POWERPC] macintosh: windfarm_smu_sat: semaphore to mutex
    
    Signed-off-by: Daniel Walker <dwalker at mvista.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
    Signed-off-by: Paul Mackerras <paulus at samba.org>

commit 0885cb5653ff82c8d322df1b8a95843dc5f5486b
Author: Daniel Walker <dwalker at mvista.com>
Date:   Sat May 3 06:34:01 2008 +1000

    [POWERPC] macintosh: therm_pm72: driver_lock semaphore to mutex
    
    Signed-off-by: Daniel Walker <dwalker at mvista.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
    Signed-off-by: Paul Mackerras <paulus at samba.org>

commit 5ffc02a158997b1eb91ade8d02bcf521ff79a218
Author: Satoru SATOH <satoru.satoh at gmail.com>
Date:   Sun May 4 22:14:42 2008 -0700

    ip: Use inline function dst_metric() instead of direct access to dst->metric[]
    
    There are functions to refer to the value of dst->metric[THE_METRIC-1]
    directly without use of a inline function "dst_metric" defined in
    net/dst.h.
    
    The following patch changes them to use the inline function
    consistently.
    
    Signed-off-by: Satoru SATOH <satoru.satoh at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 0bbeafd0118fc3ae54990064760c889d41dc21d6
Author: Satoru SATOH <satoru.satoh at gmail.com>
Date:   Sun May 4 22:12:43 2008 -0700

    ip: Make use of the inline function dst_metric_locked()
    
    Signed-off-by: Satoru SATOH <satoru.satoh at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 1e0ba0060ffcee2e766ec3159196235b1a2a0ff3
Author: Pavel Emelyanov <xemul at openvz.org>
Date:   Sun May 4 18:00:36 2008 -0700

    atm: Bad locking on br2684_devs modifications.
    
    The list_del happens under read-locked devs_lock.
    
    Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 65e4113684e50cee75357ce10dc9026b0929e4e9
Author: Pavel Emelyanov <xemul at openvz.org>
Date:   Sun May 4 18:00:05 2008 -0700

    atm: Do not free already unregistered net device.
    
    Both br2684_push and br2684_exit do so, but unregister_netdev()
    releases the device itself.
    
    Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 339a7c41c913035bf58579f6e47b4ba29da83795
Author: Pavel Emelyanov <xemul at openvz.org>
Date:   Sun May 4 17:59:30 2008 -0700

    mac80211: Do not free net device after it is unregistered.
    
    The error path in ieee80211_register_hw() may call the unregister_netdev()
    and right after it - the free_netdev(), which is wrong, since the
    unregister releases the device itself.
    
    So the proposed fix is to NULL the local->mdev after unregister is done
    and check this before calling free_netdev().
    
    I checked - no code uses the local->mdev after unregister in this error
    path (but even if some did this would be a BUG).
    
    Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit e340a90e6e07bba6e6b3fc39dd5fa76f95579d7c
Author: Pavel Emelyanov <xemul at openvz.org>
Date:   Sun May 4 17:58:07 2008 -0700

    bridge: Consolidate error paths in br_add_bridge().
    
    This actually had to be merged with the patch #1, but I decided not to
    mix two changes in one patch.
    
    There are already two calls to free_netdev() in there, so merge them
    into one.
    
    Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit c37aa90b0458d87342e0bb083f6bf7d113220d09
Author: Pavel Emelyanov <xemul at openvz.org>
Date:   Sun May 4 17:57:29 2008 -0700

    bridge: Net device leak in br_add_bridge().
    
    In case the register_netdevice() call fails the device is leaked,
    since the out: label is just rtnl_unlock()+return.
    
    Free the device.
    
    Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit f74d505b58d36ceeef10e459094f0eb760681165
Merge: 45ea2103d8856454503b30464cc1dba378748d00 2961b423037da60a8cb230963ee0d8c04473d73b
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sun May 4 17:12:10 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes:
      fix asm-mips/types.h syntax error
      fix asm-alpha/types.h breakage

commit 45ea2103d8856454503b30464cc1dba378748d00
Merge: 10ea18f0deb2372417c8e5be4d2ec79de1f65c4b 62179849b40aded9e727cca5006627a1c4d6446e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sun May 4 17:11:43 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes:
      x86: fix setup printk format warning
      x86: olpc build fix
      x86: video/fbdev.c: add MODULE_LICENSE
      x86: fix up bootparam.h for userspace inclusion
      x86: relocs ELF handling - use SELFMAG instead of numeric constant
      x86: vdso ELF handling - use SELFMAG instead of numeric constant
      x86: remove dell reboot dmi quirk board name match
      x86: es7000 build fix
      x86: make additional_cpus static
      x86: make start_secondary() static
      kbuild, suspend, x86: fix rebuild of wakeup.bin
      uml: fix gcc problem
      x86: undo visws/numaq build changes

commit 10ea18f0deb2372417c8e5be4d2ec79de1f65c4b
Merge: eb28062f131b0a1da32b2554fd819af5221040de 2cb1e1257fb4d4d52c97e763ab262c2295aea4a8
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sun May 4 17:11:24 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-language.txt: remove bogus hint
      kconfig: fix MAC OS X warnings in menuconfig
      modpost: i2c aliases need no trailing wildcard

commit eb28062f131b0a1da32b2554fd819af5221040de
Author: Bryan Wu <cooloney at kernel.org>
Date:   Sun May 4 23:12:55 2008 +0800

    task_nommu: fix compile failing bug because of spilt file.h
    
      CC      fs/proc/task_nommu.o
    fs/proc/task_nommu.c: In function ‘task_mem’:
    fs/proc/task_nommu.c:55: error: dereferencing pointer to incomplete type
    make[2]: *** [fs/proc/task_nommu.o] Error 1
    make[1]: *** [fs/proc] Error 2
    make: *** [fs] Error 2
    
    Signed-off-by: Bryan Wu <cooloney at kernel.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit d0dcd41d7b463de955b7ae7a55f76ff4216ed665
Merge: 8dcf5782848600ecfd0df3a45c521b5ad0fcb42e 1024c5f4be4fc5b00337464fb8a442bebf15df68
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sun May 4 17:08:21 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:
      ide: IDE_HFLAG_SERIALIZE_DMA bugfix

commit 8dcf5782848600ecfd0df3a45c521b5ad0fcb42e
Merge: e73b65f1db7e3baa3db43951476b7d2d2381ba35 b8ba5f10c5956d2b297766fda8f4f5ab8ad1e2cc
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sun May 4 17:07:28 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:
      x86: KVM geust: make setup_secondary_clock definition dependent on local apic
      KVM: MMU: Allow more than PAGES_PER_HPAGE write protections per large page
      KVM: avoid fx_init() schedule in atomic
      KVM: Avoid spurious execeptions after setting registers
      KVM: PIT: support mode 4
      KVM: x86 emulator: disable writeback on lmsw
      KVM: ppc: deliver INTERRUPT_FP_UNAVAIL to the guest
      KVM: ppc: Handle guest idle by emulating MSR[WE] writes
      KVM: x86: task switch: fix wrong bit setting for the busy flag
      KVM: VMX: Enable EPT feature for KVM
      KVM: VMX: Prepare an identity page table for EPT in real mode
      KVM: Export necessary function for EPT
      KVM: MMU: Remove #ifdef CONFIG_X86_64 to support 4 level EPT
      KVM: MMU: Add EPT support
      KVM: Add kvm_x86_ops get_tdp_level()
      KVM: MMU: Move some definitions to a header file
      KVM: VMX: EPT Feature Detection

commit e73b65f1db7e3baa3db43951476b7d2d2381ba35
Author: Ingo Molnar <mingo at elte.hu>
Date:   Sun May 4 09:29:43 2008 +0200

    sysfs: build fix
    
    x86.git testing found the following build failure on v2.6.26-rc1:
    
      In file included from include/linux/kobject.h:22,
                       from include/linux/module.h:17,
                       from include/linux/crypto.h:22,
                       from arch/x86/kernel/asm-offsets_32.c:8,
                       from arch/x86/kernel/asm-offsets.c:3:
      include/linux/sysfs.h:201: error: redefinition of 'sysfs_update_group'
      include/linux/sysfs.h:195: error: previous definition of 'sysfs_update_group' was here
      make[1]: *** [arch/x86/kernel/asm-offsets.s] Error 1
      make: *** [prepare0] Error 2
    
    with the following config:
    
        http://redhat.com/~mingo/misc/config-Sun_May__4_07_09_30_CEST_2008.bad
    
    the reason for the build failure is the duplicate definition of the
    sysfs_update_group() inline function in include/linux/sysfs.h.
    
    The duplication was a merge error: it was added via -mm by commit
    v2.6.25-7262-g2850699, "sysfs: sysfs_update_group stub for
    CONFIG_SYSFS=n" a day before v2.6.26-rc1, but a day before that the same
    commit was already merged upstream via the sysfs tree, with commit
    v2.6.25-7211-g1cbfb7a.
    
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 826e4506a0acb6487910a5ebafe839f708a00e1c
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sun May 4 17:04:16 2008 -0700

    Make forced module loading optional
    
    The kernel module loader used to be much too happy to allow loading of
    modules for the wrong kernel version by default.  For example, if you
    had MODVERSIONS enabled, but tried to load a module with no version
    info, it would happily load it and taint the kernel - whether it was
    likely to actually work or not!
    
    Generally, such forced module loading should be considered a really
    really bad idea, so make it conditional on a new config option
    (MODULE_FORCE_LOAD), and make it default to off.
    
    If somebody really wants to force module loads, that's their problem,
    but we should not encourage it.  Especially as it happened to me by
    mistake (ie regular unversioned Fedora modules getting loaded) causing
    lots of strange behavior.
    
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 2961b423037da60a8cb230963ee0d8c04473d73b
Author: Adrian Bunk <bunk at kernel.org>
Date:   Sat May 3 22:26:17 2008 +0300

    fix asm-mips/types.h syntax error
    
    This patch fixes the following compile error caused by
    commit 23cf11ddb5099f8c7f7cb3eb154bff0faf31cae9
    (mips: types: use <asm-generic/int-*.h> for the mips architecture):
    
    <--  snip  -->
    
    ...
      CC      kernel/bounds.s
    In file included from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/types.h:12,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/page-flags.h:8,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/bounds.c:9:
    include2/asm/types.h:56:2: error: #endif without #if
    make[2]: *** [kernel/bounds.s] Error 1
    
    <--  snip  -->
    
    Signed-off-by: Adrian Bunk <bunk at kernel.org>
    Cc: Ralf Baechle <ralf at linux-mips.org>
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>

commit 36bbfe2f097d5e09e8e9c83f55264bd538a0ebe1
Author: Adrian Bunk <bunk at kernel.org>
Date:   Sat May 3 23:51:03 2008 +0300

    fix asm-alpha/types.h breakage
    
    This patch fixes the following compile error on alpha caused by
    commit 3726c23df8e4d95b6f2b335dfa90e3f4850a8a00
    (alpha: types: use <asm-generic/int-*.h> for the alpha architecture):
    
    <--  snip  -->
    
    ...
      CC      arch/alpha/kernel/asm-offsets.s
    In file included from include2/asm/topology.h:6,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/topology.h:34,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/mmzone.h:683,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/gfp.h:4,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/slab.h:12,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/percpu.h:5,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/rcupdate.h:39,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/pid.h:4,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/sched.h:74,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/alpha/kernel/asm-offsets.c:9:
    include2/asm/machvec.h:44: error: expected declaration specifiers or '...' before 'dma_addr_t'
    include2/asm/machvec.h:44: error: expected declaration specifiers or '...' before 'dma_addr_t'
    In file included from /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/alpha/kernel/asm-offsets.c:12:
    include2/asm/io.h:94: warning: type defaults to 'int' in declaration of 'dma_addr_t'
    include2/asm/io.h:94: warning: variable 'dma_addr_t' declared 'inline'
    include2/asm/io.h:94: error: expected ',' or ';' before 'isa_page_to_bus'
    make[2]: *** [arch/alpha/kernel/asm-offsets.s] Error 1
    
    <--  snip  -->
    
    Cc: Richard Henderson <rth at twiddle.net>
    Cc: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>

commit 2cb1e1257fb4d4d52c97e763ab262c2295aea4a8
Author: Adrian Bunk <bunk at kernel.org>
Date:   Sun May 4 02:15:35 2008 +0300

    kconfig-language.txt: remove bogus hint
    
    For the use case the hint describe a simple dependency is
    enough.
    
    Signed-off-by: Adrian Bunk <bunk at kernel.org>
    Acked-by: Randy Dunlap <randy.dunlap at oracle.com>

commit c4143a83031aef7ba87a62cf654d6d8fb4d8e76e
Author: Sam Ravnborg <sam at ravnborg.org>
Date:   Sun May 4 21:03:20 2008 +0200

    kconfig: fix MAC OS X warnings in menuconfig
    
    Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
    Acked-by: Timur Tabi <timur at freescale.com>

commit 62179849b40aded9e727cca5006627a1c4d6446e
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date:   Fri May 2 13:32:35 2008 -0700

    x86: fix setup printk format warning
    
    Fix x86 setup printk format warming:
    
    next-20080430/arch/x86/kernel/setup.c:172: warning: format '%lu' expects type 'long unsigned int', but argument 2 has type 'ssize_t'
    
    Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Cc: mingo at elte.hu
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit e26a28d190304d910ee49b81cbfe6d9241f56e86
Author: Thomas Gleixner <tglx at linutronix.de>
Date:   Sat May 3 23:49:59 2008 +0200

    x86: olpc build fix
    
    CONFIG_OLPC needs to depend on MGEODE_LX
    
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 7b04fa014c11e6415da8b5a7999dbd201abad53c
Author: Adrian Bunk <bunk at kernel.org>
Date:   Fri May 2 13:32:32 2008 -0700

    x86: video/fbdev.c: add MODULE_LICENSE
    
    Add the missing MODULE_LICENSE("GPL").
    
    Signed-off-by: Adrian Bunk <bunk at kernel.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit afaafe50ee15c59010f19273ebfb6c44f0962d7c
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Fri May 2 21:14:20 2008 +1000

    x86: fix up bootparam.h for userspace inclusion
    
    commit 8b664aa66e824a0ddf4ec56d41fa0cf7bb374de6 (x86, boot: add linked
    list of struct setup_data) put a new struct in bootparam.h, but didn't
    use the userspace-safe types.
    
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
    Cc: Huang Ying <ying.huang at intel.com>
    Acked-by: H. Peter Anvin <hpa at zytor.com>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
    
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 8bd1796dedd50abd7553afbe6113bd97cc88390f
Author: Cyrill Gorcunov <gorcunov at gmail.com>
Date:   Sat May 3 14:18:03 2008 +0400

    x86: relocs ELF handling - use SELFMAG instead of numeric constant
    
    Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
    Cc: akpm at linux-foundation.org
    Cc: hpa at zytor.com
    Cc: mingo at elte.hu
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit ecb783eae1372d69a53d406e1bdba8284e4bafcc
Author: Cyrill Gorcunov <gorcunov at gmail.com>
Date:   Sat May 3 14:18:01 2008 +0400

    x86: vdso ELF handling - use SELFMAG instead of numeric constant
    
    Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
    Cc: akpm at linux-foundation.org
    Cc: hpa at zytor.com
    Cc: mingo at elte.hu
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 163ea310b68bdde89b1ac633fbf8c0db290d3f86
Author: Ben <bdeb at willmore.eu>
Date:   Sat May 3 22:39:42 2008 +0200

    x86: remove dell reboot dmi quirk board name match
    
    http://bugzilla.kernel.org/show_bug.cgi?id=10547
    
    Newer Dell OptiPlex 745s hang before rebooting after 'sudo reboot'.
    
    A patch for some versions of the OptiPlex was proposed here --
    http://lkml.org/lkml/2007/6/5/59 -- and is included in 2.6.23 and
    later kernels, according to
    http://lxr.linux.no/linux+v2.6.23/arch/i386/kernel/reboot.c . However,
    the DMI_BOARD_NAME ("0WF810") is too restrictive. Newer OptiPlex
    machines have a DMI_BOARD_NAME of "0RF703".  I therefore suggest
    adding another clause to reboot.c, similar to the one in the original
    patch, but matching a DMI_BOARD_NAME of "0RF703".
    
    On further inspection, it seems that there are other DMI_BOARD_NAMEs
    for this same machine. They seem to change from time to time, which
    means that the current code is fragile. Moreover, using bios reboot
    should not break non-SFF OptiPlex 745s, and so a reasonable fix is to
    simply drop the match on DMI_BOARD_NAME.
    
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit e37ee42caadab46cec277546099fa2a6207fff0b
Author: Ingo Molnar <mingo at elte.hu>
Date:   Sat May 3 22:01:31 2008 +0200

    x86: es7000 build fix
    
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit c5562faeaacf19e81a78ee37cc6b96ab1f3e68e4
Author: Adrian Bunk <bunk at kernel.org>
Date:   Tue Apr 22 00:31:37 2008 +0300

    x86: make additional_cpus static
    
    This patch makes the needlessly global additional_cpus static.
    
    Signed-off-by: Adrian Bunk <bunk at kernel.org>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit dbe55f4797712f86691a0ee0b5f508693c7310fe
Author: Adrian Bunk <bunk at kernel.org>
Date:   Tue Apr 22 01:50:26 2008 +0300

    x86: make start_secondary() static
    
    start_secondary() needlessly became global.
    
    Signed-off-by: Adrian Bunk <bunk at kernel.org>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit 4c6214c75a5aca5417156a47cd890b128c5f0637
Author: Sam Ravnborg <sam at ravnborg.org>
Date:   Thu May 1 11:31:07 2008 +0200

    kbuild, suspend, x86: fix rebuild of wakeup.bin
    
    In kernel/acpi/realmode/Makefile use the 'always'
    variable to say that wakeup.bin should always
    be made.
    
    In acpi/Makefile we then do not need to specify the
    requested target and we avoid the message from make:
    
       `arch/x86/kernel/acpi/realmode/wakeup.bin' is up to date.
    
    Add wakeup.lds to list af targets to avoid rebuilding
    wakeup.bin - from Roland McGrath.
    
    Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
    Cc: Rafael J. Wysocki <rjw at sisk.pl>
    Cc: Pavel Machek <pavel at suse.cz>
    Cc: H. Peter Anvin <hpa at zytor.com>
    Cc: Roland McGrath <roland at redhat.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 22eecde2f9034764a3fd095eecfa3adfb8ec9a98
Author: Ingo Molnar <mingo at elte.hu>
Date:   Thu May 1 12:06:54 2008 +0200

    uml: fix gcc problem
    
    this is what caused gcc 4.3 to throw an internal error when
    OPTIMIZE_INLINING was enabled ...
    
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit 48b83d2425d7781bb625b1c37b5f2a8963b6e23b
Author: Thomas Gleixner <tglx at linutronix.de>
Date:   Fri May 2 21:24:30 2008 +0200

    x86: undo visws/numaq build changes
    
    arch/x86/pci/Makefile_32 has a nasty detail. VISWS and NUMAQ build
    override the generic pci-y rules. This needs a proper cleanup, but
    that needs more thoughts. Undo
    
    commit 895d30935ebe05f192e844792668bf8d19deaae7
        x86: numaq fix
        do not override the existing pci-y rule when adding visws or
        numaq rules.
    
    There is also a stupid init function ordering problem vs. acpi.o
    
    Add comments to the Makefile to avoid tripping over this again.
    
    Remove the srat stub code in discontig_32.c to allow a proper NUMAQ
    build.
    
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 1024c5f4be4fc5b00337464fb8a442bebf15df68
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date:   Sun May 4 17:03:41 2008 +0200

    ide: IDE_HFLAG_SERIALIZE_DMA bugfix
    
    Patch re-ordering could be harmful:
    
    commit 1fd1890594bd355a4217f5658a34763e77decee3
    Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
    Date:   Sat Apr 26 22:25:24 2008 +0200
    
        ide: add IDE_HFLAG_SERIALIZE_DMA host flag
    ...
    
    is buggy because ->init_dma method / ide_hwif_setup_dma() is called
    before IDE_HFLAG_SERIALIZE_DMA host flag is checked.
    
    Fix it by checking IDE_HFLAG_SERIALIZE[_DMA] after DMA initialization.
    
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>

commit b8ba5f10c5956d2b297766fda8f4f5ab8ad1e2cc
Author: Glauber Costa <gcosta at redhat.com>
Date:   Wed Apr 30 12:39:05 2008 -0300

    x86: KVM geust: make setup_secondary_clock definition dependent on local apic
    
    Since the pv_apic_ops are only present if CONFIG_X86_LOCAL_APIC is compiled
    in, kvmclock failed to build without this option.  This patch fixes this.
    
    Signed-off-by: Glauber Costa <gcosta at redhat.com>
    Signed-off-by: Avi Kivity <avi at qumranet.com>

commit 93df766322ba1db2801e4b826985a4932dd75866
Author: Avi Kivity <avi at qumranet.com>
Date:   Fri May 2 13:23:10 2008 +0300

    KVM: MMU: Allow more than PAGES_PER_HPAGE write protections per large page
    
    nonpae guests can call rmap_write_protect twice per page (for page tables)
    or four times per page (for page directories), triggering a bogus warning.
    
    Remove the warning.
    
    Signed-off-by: Avi Kivity <avi at qumranet.com>

commit bc1a34f1bf354fabc03e3f465620c80e510d0e8f
Author: Andrea Arcangeli <andrea at qumranet.com>
Date:   Thu May 1 18:43:33 2008 +0200

    KVM: avoid fx_init() schedule in atomic
    
    This make sure not to schedule in atomic during fx_init. I also
    changed the name of fpu_init to fx_finit to avoid duplicating the name
    with fpu_init that is already used in the kernel, this makes grep
    simpler if nothing else.
    
    Signed-off-by: Andrea Arcangeli <andrea at qumranet.com>
    Signed-off-by: Avi Kivity <avi at qumranet.com>

commit b4f14abd95cd8d42f08438f1c4ec3eafe41054ee
Author: Jan Kiszka <jan.kiszka at siemens.com>
Date:   Wed Apr 30 17:59:04 2008 +0200

    KVM: Avoid spurious execeptions after setting registers
    
    Clear pending exceptions when setting new register values. This avoids
    spurious exceptions after restoring a vcpu state or after
    reset-on-triple-fault.
    
    Signed-off-by: Jan Kiszka <jan.kiszka at siemens.com>
    Signed-off-by: Avi Kivity <avi at qumranet.com>

commit ece15babfa514e06118f62f4df2c757d6209f4f0
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Wed Apr 30 13:23:54 2008 -0300

    KVM: PIT: support mode 4
    
    The in-kernel PIT emulation ignores pending timers if operating under
    mode 4, which for example DragonFlyBSD uses (and Plan9 too, apparently).
    
    Mode 4 seems to be similar to one-shot mode, other than the fact that it
    starts counting after the next CLK pulse once programmed, while mode 1
    starts counting immediately, so add a FIXME to enhance precision.
    
    Fixes sourceforge bug 1952988.
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
    Acked-by: Sheng Yang <sheng.yang at intel.com>
    Signed-off-by: Avi Kivity <avi at qumranet.com>

commit dc7457ea52f88539dc72925360e6068d5c938a0f
Author: Avi Kivity <avi at qumranet.com>
Date:   Wed Apr 30 16:13:36 2008 +0300

    KVM: x86 emulator: disable writeback on lmsw
    
    The recent changes allowing memory operands with lmsw and smsw left
    lmsw with writeback enabled.  Since lmsw has no oridinary destination
    operand, the dst pointer was not initialized, resulting in an oops.
    
    Close the hole by disabling writeback for lmsw.
    
    Signed-off-by: Avi Kivity <avi at qumranet.com>

commit de368dceb33c3c068dbde1407aff75cd8e126f04
Author: Christian Ehrhardt <ehrhardt at linux.vnet.ibm.com>
Date:   Tue Apr 29 18:18:23 2008 +0200

    KVM: ppc: deliver INTERRUPT_FP_UNAVAIL to the guest
    
    This patch adds the delivery of INTERRUPT_FP_UNAVAIL exceptions to the guest.
    It's needed if a guest uses ppc binaries using the Floating point instructions.
    
    Signed-off-by: Christian Ehrhardt <ehrhardt at linux.vnet.ibm.com>
    Acked-by: Hollis Blanchard <hollisb at us.ibm.com>
    Signed-off-by: Avi Kivity <avi at qumranet.com>

commit 45c5eb67da5a668abe79c23a7e64dbc87a600f90
Author: Hollis Blanchard <hollisb at us.ibm.com>
Date:   Fri Apr 25 17:55:49 2008 -0500

    KVM: ppc: Handle guest idle by emulating MSR[WE] writes
    
    This reduces host CPU usage when the guest is idle. However, the guest must
    set MSR[WE] in its idle loop, which Linux did not do until 2.6.26.
    
    Signed-off-by: Hollis Blanchard <hollisb at us.ibm.com>
    Signed-off-by: Jerone Young <jyoung5 at us.ibm.com>
    Signed-off-by: Avi Kivity <avi at qumranet.com>

commit 3fe913e7c550a869e250d04c34410f7a6e263f7c
Author: Izik Eidus <izike at qumranet.com>
Date:   Mon Apr 28 18:23:52 2008 +0300

    KVM: x86: task switch: fix wrong bit setting for the busy flag
    
    The busy bit is bit 1 of the type field, not bit 8.
    
    Signed-off-by: Izik Eidus <izike at qumranet.com>
    Signed-off-by: Avi Kivity <avi at qumranet.com>

commit 1439442c7b257b47a83aea4daed8fbf4a32cdff9
Author: Sheng Yang <sheng.yang at intel.com>
Date:   Mon Apr 28 12:24:45 2008 +0800

    KVM: VMX: Enable EPT feature for KVM
    
    Signed-off-by: Sheng Yang <sheng.yang at intel.com>
    Signed-off-by: Avi Kivity <avi at qumranet.com>

commit b7ebfb0509692cd923e31650f81ed4d79c9a3e59
Author: Sheng Yang <sheng.yang at intel.com>
Date:   Fri Apr 25 21:44:52 2008 +0800

    KVM: VMX: Prepare an identity page table for EPT in real mode
    
    [aliguory: plug leak]
    
    Signed-off-by: Sheng Yang <sheng.yang at intel.com>
    Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
    Signed-off-by: Avi Kivity <avi at qumranet.com>

commit 0d15029895051904e31925ec63525cc3a637f7de
Author: Sheng Yang <sheng.yang at intel.com>
Date:   Fri Apr 25 21:44:50 2008 +0800

    KVM: Export necessary function for EPT
    
    Signed-off-by: Sheng Yang <sheng.yang at intel.com>
    Signed-off-by: Avi Kivity <avi at qumranet.com>

commit 1ac593c97eb229da44819f66fea47975537c1177
Author: Sheng Yang <sheng.yang at intel.com>
Date:   Fri Apr 25 21:44:42 2008 +0800

    KVM: MMU: Remove #ifdef CONFIG_X86_64 to support 4 level EPT
    
    Currently EPT level is 4 for both pae and x86_64. The patch remove the #ifdef
    for alloc root_hpa and free root_hpa to support EPT.
    
    Signed-off-by: Sheng Yang <sheng.yang at intel.com>
    Signed-off-by: Avi Kivity <avi at qumranet.com>

commit 7b52345e2c4c7333bf7eba8034ffc4683fa63c91
Author: Sheng Yang <sheng.yang at intel.com>
Date:   Fri Apr 25 21:13:50 2008 +0800

    KVM: MMU: Add EPT support
    
    Enable kvm_set_spte() to generate EPT entries.
    
    Signed-off-by: Sheng Yang <sheng.yang at intel.com>
    Signed-off-by: Avi Kivity <avi at qumranet.com>

commit 67253af52e9133fb4cfbf7a2448a2d3524d1fa6c
Author: Sheng Yang <sheng.yang at intel.com>
Date:   Fri Apr 25 10:20:22 2008 +0800

    KVM: Add kvm_x86_ops get_tdp_level()
    
    The function get_tdp_level() provided the number of tdp level for EPT and
    NPT rather than the NPT specific macro.
    
    Signed-off-by: Sheng Yang <sheng.yang at intel.com>
    Signed-off-by: Avi Kivity <avi at qumranet.com>

commit 8c6d6adc6b87daa364ee9deb2e966021d37a7622
Author: Sheng Yang <sheng.yang at intel.com>
Date:   Fri Apr 25 10:17:08 2008 +0800

    KVM: MMU: Move some definitions to a header file
    
    Move some definitions to mmu.h in order to allow building common table
    entries between EPT and non-EPT.
    
    Signed-off-by: Sheng Yang <sheng.yang at intel.com>
    Signed-off-by: Avi Kivity <avi at qumranet.com>

commit d56f546db97795dca5aa575b00b0e9886895ac87
Author: Sheng Yang <sheng.yang at intel.com>
Date:   Fri Apr 25 10:13:16 2008 +0800

    KVM: VMX: EPT Feature Detection
    
    Signed-off-by: Sheng Yang <sheng.yang at intel.com>
    Signed-off-by: Avi Kivity <avi at qumranet.com>

commit be0c007ac64f880a946995d6d1fc654acc81484d
Author: David S. Miller <davem at davemloft.net>
Date:   Sun May 4 01:34:31 2008 -0700

    niu: Fix probing regression for maramba on-board chips.
    
    Changeset 7f7c4072ea552f97a0898331322f71986a97299c ("niu: Determine
    the # of ports from the card's VPD data") caused maramba on-board
    NIU ports to stop probing properly.
    
    The old code had a fallback that would use a num_ports value of
    4 if all the probing methods failed, but that was removed.
    
    This restores the fallback of 4 ports, to get things working
    again.
    
    Bump driver version and release date.
    
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit ac551828993eecb8499ef9cc3c828fceb49bcf7a
Author: Jean Delvare <khali at linux-fr.org>
Date:   Fri May 2 20:37:21 2008 +0200

    modpost: i2c aliases need no trailing wildcard
    
    Not all device types need a wildcard at the end of their module
    aliases. In particular, for i2c module aliases, the trailing wildcard
    is not only unneeded, it could also cause the wrong driver to be
    loaded.
    
    As I2C devices have no IDs, i2c module aliases are simple, arbitrary
    device names. For example:
    
    $ /sbin/modinfo lm90
    filename:       /lib/modules/2.6.25-git18/kernel/drivers/hwmon/lm90.ko
    author:         Jean Delvare <khali at linux-fr.org>
    description:    LM90/ADM1032 driver
    license:        GPL
    vermagic:       2.6.25-git18 mod_unload
    depends:        hwmon
    alias:          i2c:lm90*
    alias:          i2c:adm1032*
    alias:          i2c:lm99*
    alias:          i2c:lm86*
    alias:          i2c:max6657*
    alias:          i2c:adt7461*
    alias:          i2c:max6680*
    $
    
    This would cause trouble if one I2C chip name matches the beginning of
    another I2C chip name and both chips are supported by different
    drivers. For example, an i2c device named lm9042 would cause the lm90
    driver to be loaded, while it doesn't support that device. This case
    has yet to be seen in practice, but still, I'd like to fix it now. The
    cleanest fix is to remove the trailing wildcard from i2c module aliases.
    
    Here's a patch doing this.
    
    Not all device type aliases need a trailing wildcard, in particular
    the i2c aliases don't. Don't add a wildcard by default in do_table(),
    instead let each device type handler add it if needed.
    
    I have tested types acpi, dmi, eisa, i2c, ide, ieee1394, input, pci,
    pcmcia, platform, pnp, scsi, serio, ssb and usb. Other types (ccw, of,
    vio, parisc, sdio and virtio) are untested.
    Signed-off-by: Jean Delvare <khali at linux-fr.org>
    Acked-by: Jochen Friedrich <jochen at scram.de>
    Signed-off-by: Sam Ravnborg <sam at ravnborg.org>

commit e544ff00da4b53069dbca3debbfb02d455f72467
Author: David S. Miller <davem at davemloft.net>
Date:   Sat May 3 21:10:58 2008 -0700

    lapbeth: Release ->ethdev when unregistering device.
    
    Otherwise it leaks forever.
    
    Based upon a report by Roland <devzero at web.de>
    
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 41fef0ee7b8f3fe3f3dd2ddc9b170f3d88bce595
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date:   Sat May 3 21:03:01 2008 -0700

    xfrm: convert empty xfrm_audit_* macros to functions
    
    it removes these warnings when CONFIG_AUDITSYSCALL is unset:
    
    net/xfrm/xfrm_user.c: In function 'xfrm_add_sa':
    net/xfrm/xfrm_user.c:412: warning: unused variable 'sid'
    net/xfrm/xfrm_user.c:411: warning: unused variable 'sessionid'
    net/xfrm/xfrm_user.c:410: warning: unused variable 'loginuid'
    net/xfrm/xfrm_user.c: In function 'xfrm_del_sa':
    net/xfrm/xfrm_user.c:485: warning: unused variable 'sid'
    net/xfrm/xfrm_user.c:484: warning: unused variable 'sessionid'
    net/xfrm/xfrm_user.c:483: warning: unused variable 'loginuid'
    net/xfrm/xfrm_user.c: In function 'xfrm_add_policy':
    net/xfrm/xfrm_user.c:1132: warning: unused variable 'sid'
    net/xfrm/xfrm_user.c:1131: warning: unused variable 'sessionid'
    net/xfrm/xfrm_user.c:1130: warning: unused variable 'loginuid'
    net/xfrm/xfrm_user.c: In function 'xfrm_get_policy':
    net/xfrm/xfrm_user.c:1382: warning: unused variable 'sid'
    net/xfrm/xfrm_user.c:1381: warning: unused variable 'sessionid'
    net/xfrm/xfrm_user.c:1380: warning: unused variable 'loginuid'
    net/xfrm/xfrm_user.c: In function 'xfrm_add_pol_expire':
    net/xfrm/xfrm_user.c:1620: warning: unused variable 'sid'
    net/xfrm/xfrm_user.c:1619: warning: unused variable 'sessionid'
    net/xfrm/xfrm_user.c:1618: warning: unused variable 'loginuid'
    net/xfrm/xfrm_user.c: In function 'xfrm_add_sa_expire':
    net/xfrm/xfrm_user.c:1658: warning: unused variable 'sid'
    net/xfrm/xfrm_user.c:1657: warning: unused variable 'sessionid'
    net/xfrm/xfrm_user.c:1656: warning: unused variable 'loginuid'
    
    Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit c8005785102e5b67ecf213f06a3d6c001f6f8cb4
Author: Johannes Berg <johannes at sipsolutions.net>
Date:   Sat May 3 20:56:42 2008 -0700

    net: Fix useless comment reference loop.
    
    include/linux/skbuff.h says:
            /* These elements must be at the end, see alloc_skb() for details.  */
    
    net/core/skbuff.c says:
    	* See comment in sk_buff definition, just before the 'tail' member
    
    This patch contains my guess as to the actual reason rather than a
    dead comment reference loop.
    
    Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 3ba08b00e0d8413d79be9cab8ec085ceb6ae6fd6
Author: Jarek Poplawski <jarkao2 at gmail.com>
Date:   Sat May 3 20:46:29 2008 -0700

    sch_htb: remove from event queue in htb_parent_to_leaf()
    
    There is lack of removing a class from the event queue while changing
    from parent to leaf which can cause corruption of this rb tree. This
    patch fixes a bug introduced by my patch: "sch_htb: turn intermediate
    classes into leaves" commit: 160d5e10f87b1dc88fd9b84b31b1718e0fd76398.
    
    Many thanks to Jan 'yanek' Bortl for finding a way to reproduce this
    rare bug and narrowing the test case, which made possible proper
    diagnosing.
    
    This patch is recommended for all kernels starting from 2.6.20.
    
    Reported-and-tested-by: Jan 'yanek' Bortl <yanek at ya.bofh.cz>
    Signed-off-by: Jarek Poplawski <jarkao2 at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit afa26be86b65a7183ceac29bdf1f51d6fc6932f0
Merge: 269f21344b23e552c21c9e2d7ca258479dcd7a0a 4f95f81a48623982879f4fa80c641933444afd18
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sat May 3 13:51:10 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
      clocksource: allow read access to available/current_clocksource
      clocksource: Fix permissions for available_clocksource
      hrtimer: remove duplicate helper function

commit 269f21344b23e552c21c9e2d7ca258479dcd7a0a
Author: Ulrich Drepper <drepper at redhat.com>
Date:   Sat May 3 15:28:45 2008 -0400

    tiny mq_open optimization
    
    A very small cleanup for mq_open.
    
    We do not have to call set_close_on_exit if we create the file
    descriptor right away with the flag set.  We have a function for this
    now.  The resulting code is smaller and a tiny bit faster.
    
    Signed-off-by: Ulrich Drepper <drepper at redhat.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit d35c7b0e54a596c5a8134d75999b7f391a9c6550
Author: Ulrich Drepper <drepper at redhat.com>
Date:   Sat May 3 15:10:37 2008 -0400

    unified (weak) sys_pipe implementation
    
    This replaces the duplicated arch-specific versions of "sys_pipe()" with
    one unified implementation.  This removes almost 250 lines of duplicated
    code.
    
    It's marked __weak, so that *if* an architecture wants to override the
    default implementation it can do so by simply having its own replacement
    version, since many architectures use alternate calling conventions for
    the 'pipe()' system call for legacy reasons (ie traditional UNIX
    implementations often return the two file descriptors in registers)
    
    I still haven't changed the cris version even though Linus says the BKL
    isn't needed.  The arch maintainer can easily do it if there are really
    no obstacles.
    
    Signed-off-by: Ulrich Drepper <drepper at redhat.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 2ddcca36c8bcfa251724fe342c8327451988be0d
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sat May 3 11:59:44 2008 -0700

    Linux 2.6.26-rc1

commit 38e80121bd7d0c493072442ac7eddcba165a07a8
Merge: e098675635479e9267cf2b12fb969c463cf506ab 35bf559145b6332f5465c15a4e5cd7a363985382
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sat May 3 10:57:57 2008 -0700

    Merge git://git.infradead.org/battery-2.6
    
    * git://git.infradead.org/battery-2.6:
      PMU battery: filenames in sysfs with spaces
      pda_power: add init and exit function callbacks

commit e098675635479e9267cf2b12fb969c463cf506ab
Merge: 2905474d3842bfab0b9d8197fb1f4576462901da b9095fd8a7f41dc7ac0b0b7864f74766a3056f96
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sat May 3 10:54:23 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes: (24 commits)
      Make constants in kernel/timeconst.h fixed 64 bits
      types: add C99-style constructors to <asm-generic/int-*.h>
      xtensa: types: use <asm-generic/int-*.h> for the xtensa architecture
      x86: types: use <asm-generic/int-*.h> for the x86 architecture
      v850: types: use <asm-generic/int-*.h> for the v850 architecture
      sparc64: types: use <asm-generic/int-*.h> for the sparc64 architecture
      sparc: types: use <asm-generic/int-*.h> for the sparc architecture
      sh: types: use <asm-generic/int-*.h> for the sh architecture
      s390: types: use <asm-generic/int-*.h> for the s390 architecture
      powerpc: types: use <asm-generic/int-*.h> for the powerpc architecture
      parisc: types: use <asm-generic/int-*.h> for the parisc architecture
      mn10300: types: use <asm-generic/int-*.h> for the mn10300 architecture
      mips: types: use <asm-generic/int-*.h> for the mips architecture
      m68k: types: use <asm-generic/int-*.h> for the m68k architecture
      m32r: types: use <asm-generic/int-*.h> for the m32r architecture
      ia64: types: use <asm-generic/int-*.h> for the ia64 architecture
      h8300: types: use <asm-generic/int-*.h> for the h8300 architecture
      frv: types: use <asm-generic/int-*.h> for the frv architecture
      cris: types: use <asm-generic/int-*.h> for the cris architecture
      blackfin: types: use <asm-generic/int-*.h> for the blackfin architecture
      ...

commit 2905474d3842bfab0b9d8197fb1f4576462901da
Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date:   Sat May 3 08:35:49 2008 -0700

    [MAINTAINERS] PCI list moved
    
    Many thanks to Martin for his years of hosting.  The pci list has moved to
    vger, along with what seems like the rest of the major Linux mailing lists.
    
    Signed-off-by:  Jesse Barnes <jbarnes at virtuousgeek.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit c402f98c6d43f22b4c6d7b3db9d7099611cdcaec
Merge: 4f9faaace217b854ae1e1746ee4ac44688ddadbd f6acb63508700b5f8cd817082b62c96ba907775e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sat May 3 10:18:40 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: #ifdef simplification
      slabinfo: Support printout of the number of fallbacks
      slub: Whitespace cleanup and use of strict_strtoul

commit 4f9faaace217b854ae1e1746ee4ac44688ddadbd
Merge: bf640be423d60d954b9673527e106a461a129eb8 f37f2c62a28e848e06399ea2f9be1e098212625c
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sat May 3 10:18:21 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: (47 commits)
      rose: Wrong list_lock argument in rose_node seqops
      netns: Fix reassembly timer to use the right namespace
      netns: Fix device renaming for sysfs
      bnx2: Update version to 1.7.5.
      bnx2: Update RV2P firmware for 5709.
      bnx2: Zero out context memory for 5709.
      bnx2: Fix register test on 5709.
      bnx2: Fix remote PHY initial link state.
      bnx2: Refine remote PHY locking.
      bridge: forwarding table information for >256 devices
      tg3: Update version to 3.92
      tg3: Add link state reporting to UMP firmware
      tg3: Fix ethtool loopback test for 5761 BX devices
      tg3: Fix 5761 NVRAM sizes
      tg3: Use constant 500KHz MI clock on adapters with a CPMU
      hci_usb.h: fix hard-to-trigger race
      dccp: ccid2.c, ccid3.c use clamp(), clamp_t()
      net: remove NR_CPUS arrays in net/core/dev.c
      net: use get/put_unaligned_* helpers
      bluetooth: use get/put_unaligned_* helpers
      ...

commit bf640be423d60d954b9673527e106a461a129eb8
Merge: c36c804559d3a891a2e655ba8185b4fa7eaee156 4a1236ac6ee3bb3a2f585e66871de3c39ab38f7c
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sat May 3 10:05:11 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:
      sparc32: Delete prom_stdin and prom_stdout.
      sparc32: More memory probing consolidation.
      sparc32: Kill totally unused memory information tables.
      sparc64: Fix syscall restart, for real...
      serial: Fix sparc driver name strings.
      sparc64: Stop creating dummy root PCI host controller devices.

commit c36c804559d3a891a2e655ba8185b4fa7eaee156
Merge: be2e88011bd800222bfd7b477c727966f93186a9 3b5750644b2ffa2a76fdfe7b4e00e4af2ecf3539
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sat May 3 10:01:33 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
      [POWERPC] Bolt in SLB entry for kernel stack on secondary cpus
      [POWERPC] PS3: Update ps3_defconfig
      [POWERPC] PS3: Remove unsupported wakeup sources
      [POWERPC] PS3: Make ps3_virq_setup and ps3_virq_destroy static
      [POWERPC] PS3: Add time include to lpm
      [POWERPC] Fix slb.c compile warnings
      [POWERPC] Xilinx: Fix compile warnings
      [POWERPC] Squash build warning for print of resource_size_t in fsl_soc.c
      [RAPIDIO] fix current kernel-doc notation
      [POWERPC] 86xx: mpc8610_hpcd: add support for PCI Express x8 slot
      Fix a potential issue in mpc52xx uart driver
      [POWERPC] mpc5200: Allow for fixed speed MII configurations
      [POWERPC] 86xx: Fix the wrong serial1 interrupt for 8610 board

commit 4f95f81a48623982879f4fa80c641933444afd18
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date:   Sat May 3 14:23:14 2008 +0200

    clocksource: allow read access to available/current_clocksource
    
    There is no harm, when users can read the info and we ask often enough
    during debugging for this kind of information.
    
    Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
    Cc: Andrew Morton <akpm at linux-foundation.org>
    Cc: John Stultz <johnstul at us.ibm.com>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit 4359a023a8c3b247b348c310bf510b23f3c1ab64
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date:   Fri May 2 12:49:40 2008 +0200

    clocksource: Fix permissions for available_clocksource
    
    File permissions for
    /sys/devices/system/clocksource/clocksource0/available_clocksource
    are 600 which allows write access. But this is in fact a read only
    file. So change permissions to 400.
    
    Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
    Cc: John Stultz <johnstul at us.ibm.com>
    Cc: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit 4346f65426cbceb64794b468e4af6f5632d58c5e
Author: Oliver Hartkopp <oliver at hartkopp.net>
Date:   Wed Apr 30 23:04:37 2008 +0200

    hrtimer: remove duplicate helper function
    
    The helper function hrtimer_callback_running() is used in
    kernel/hrtimer.c as well as in the updated net/can/bcm.c which now
    supports hrtimers. Moving the helper function to hrtimer.h removes the
    duplicate definition in the C-files.
    
    Signed-off-by: Oliver Hartkopp <oliver at hartkopp.net>
    Cc: David Miller <davem at davemloft.net>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit f37f2c62a28e848e06399ea2f9be1e098212625c
Author: Bernard Pidoux <f6bvp at amsat.org>
Date:   Fri May 2 17:03:22 2008 -0700

    rose: Wrong list_lock argument in rose_node seqops
    
    In rose_node_start() as well as in rose_node_stop() __acquires() and
    spin_lock_bh() were wrongly passing rose_neigh_list_lock instead of
    rose_node_list_lock arguments.
    
    Signed-off-by: Bernard Pidoux <f6bvp at amsat.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 4ac2ccd01646e08d7176185c94e5b19404a25998
Author: Daniel Lezcano <dlezcano at fr.ibm.com>
Date:   Fri May 2 17:02:03 2008 -0700

    netns: Fix reassembly timer to use the right namespace
    
    This trivial fix retrieves the network namespace from frag queue
    and use it to get the network device in the right namespace.
    
    Signed-off-by: Daniel Lezcano <dlezcano at fr.ibm.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit aaf8cdc34ddba08122f02217d9d684e2f9f5d575
Author: Daniel Lezcano <dlezcano at fr.ibm.com>
Date:   Fri May 2 17:00:58 2008 -0700

    netns: Fix device renaming for sysfs
    
    When a netdev is moved across namespaces with the
    'dev_change_net_namespace' function, the 'device_rename' function is
    used to fixup kobject and refresh the sysfs tree. The device_rename
    function will call kobject_rename and this one will check if there is
    an object with the same name and this is the case because we are
    renaming the object with the same name.
    
    The use of 'device_rename' seems for me wrong because we usually don't
    rename it but just move it across namespaces. As we just want to do a
    mini "netdev_[un]register", IMO the functions
    'netdev_[un]register_kobject' should be used instead, like an usual
    network device [un]registering.
    
    This patch replace device_rename by netdev_unregister_kobject,
    followed by netdev_register_kobject.
    
    The netdev_register_kobject will call device_initialize and will raise
    a warning indicating the device was already initialized. In order to
    fix that, I split the device initialization into a separate function
    and use it together with 'netdev_register_kobject' into
    register_netdevice. So we can safely call 'netdev_register_kobject' in
    'dev_change_net_namespace'.
    
    This fix will allow to properly use the sysfs per namespace which is
    coming from -mm tree.
    
    Signed-off-by: Daniel Lezcano <dlezcano at fr.ibm.com>
    Acked-by: Benjamin Thery <benjamin.thery at bull.net>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 705d209168681b4408d10fca7257de3343be573d
Author: Michael Chan <mchan at broadcom.com>
Date:   Fri May 2 16:58:18 2008 -0700

    bnx2: Update version to 1.7.5.
    
    Signed-off-by: Michael Chan <mchan at broadcom.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit d25be1d3ecf0b1b95ae29919786372b87b2bfea6
Author: Michael Chan <mchan at broadcom.com>
Date:   Fri May 2 16:57:59 2008 -0700

    bnx2: Update RV2P firmware for 5709.
    
    The new RV2P firmware fixes 2 issues:
    
    1. The jumbo rx buffer page size is now configurable and set to the
       proper PAGE_SIZE.  Before, it was assumed to be always 4K.
    
    2. Driver sometimes would crash when receiving jumbo packets mixed
       with firmware management packets.  This was caused by the old
       firmware DMA'ing to the wrong address.
    
    Signed-off-by: Michael Chan <mchan at broadcom.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 352f76879ebde543817360ce9c18c973d4300f4f
Author: Michael Chan <mchan at broadcom.com>
Date:   Fri May 2 16:57:26 2008 -0700

    bnx2: Zero out context memory for 5709.
    
    We should zero out the context memory for 5709 before each reset.  When
    we resume after suspend for example, the memory may not be zero and the
    chip may not function correctly.
    
    Signed-off-by: Michael Chan <mchan at broadcom.com>
    Signed-off-by: Benjamin Li <benli at broadcom.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 15b169cccff1503a88f12f104e5657c65c53ade7
Author: Michael Chan <mchan at broadcom.com>
Date:   Fri May 2 16:57:08 2008 -0700

    bnx2: Fix register test on 5709.
    
    The register BNX2_CTX_STATUS (0x1004) should be skipped on 5709 as it
    contains reserved bits.
    
    Signed-off-by: Michael Chan <mchan at broadcom.com>
    Signed-off-by: Benjamin Li <benli at broadcom.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 543a827d7a5600a71855bd6afacac78536c86822
Author: Michael Chan <mchan at broadcom.com>
Date:   Fri May 2 16:56:44 2008 -0700

    bnx2: Fix remote PHY initial link state.
    
    On some remote PHY blade systems, the driver receives no initial link
    interrupt.  As a result, the GMII/MII MAC mode does not get setup properly.
    To fix this problem, we add an initial poll of the link state after chip
    reset.
    
    With this change, the setting of the initial carrier state in the init
    code can be eliminated.
    
    Signed-off-by: Michael Chan <mchan at broadcom.com>
    Signed-off-by: Benjamin Li <benli at broadcom.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 74ecc62d6e595ca64bbef2471787bf53b94e5d3c
Author: Michael Chan <mchan at broadcom.com>
Date:   Fri May 2 16:56:16 2008 -0700

    bnx2: Refine remote PHY locking.
    
    bnx2_set_remote_link() should be called under bp->phy_lock to protect
    against concurrent polling and interrupt calls.  This change is needed
    by the next patch which will add one initial poll of the remote PHY
    link status.
    
    Signed-off-by: Michael Chan <mchan at broadcom.com>
    Signed-off-by: Benjamin Li <benli at broadcom.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit ae4f8fca4030a4e783fa4ccb0c9d8d8a8cf60a32
Author: Stephen Hemminger <shemminger at vyatta.com>
Date:   Fri May 2 16:53:33 2008 -0700

    bridge: forwarding table information for >256 devices
    
    The forwarding table binary interface (my bad choice), only exposes
    the port number of the first 8 bits. The bridge code was limited to
    256 ports at the time, but now the kernel supports up 1024 ports, so
    the upper bits are lost when doing:
    
       brctl showmacs
    
    The fix is to squeeze the extra bits into small hole left in data
    structure, to maintain binary compatiablity.
    
    Signed-off-by: Stephen Hemminger <shemminger at vyatta.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 920e37f76b19b4a3d8a1a3144cd6ee24e0e7f5b4
Author: Matt Carlson <mcarlson at broadcom.com>
Date:   Fri May 2 16:49:50 2008 -0700

    tg3: Update version to 3.92
    
    This patch updates the version number to 3.92.
    
    Signed-off-by: Matt Carlson <mcarlson at broadcom.com>
    Signed-off-by: Michael Chan <mchan at broadcom.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 7c5026aa9b81dd45df8d3f4e0be73e485976a8b6
Author: Matt Carlson <mcarlson at broadcom.com>
Date:   Fri May 2 16:49:29 2008 -0700

    tg3: Add link state reporting to UMP firmware
    
    All variants of the 5714, 5715, and 5780 offer a feature called the
    "Universal Management Port".  This feature is implemented in firmware
    and is largely transparent to the driver, except...
    
    It turns out that the UMP firmware needs to know the current status
    of the link.  Because the firmware cannot touch the PHY registers while
    the driver is in control of the device, it needs the driver to report
    link status changes through an additional handshaking mechanism.
    Without this handshake, it has been observed in the field that the UMP
    firmware will not operate correctly.
    
    This patch implements the new handshake with the UMP firmware.  Since
    the handshake uses the same mechanism ASF heartbeats use, code was
    added to detect and wait for completion of a pending previous event.
    
    Signed-off-by: Matt Carlson <mcarlson at broadcom.com>
    Signed-off-by: Michael Chan <mchan at broadcom.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 109115e1991824b88306b374b763d6857b292aeb
Author: Matt Carlson <mcarlson at broadcom.com>
Date:   Fri May 2 16:48:59 2008 -0700

    tg3: Fix ethtool loopback test for 5761 BX devices
    
    A CPMU related loopback test bug existed for AX revisions of the 5761.
    While that errata has been fixed, the CPMU still slows down the core
    clock too far to run the loopback test successfully.  This patch
    disables the CPMU LINK_SPEED mode just like we do with the AX
    revisions of the 5761 and all revisions of the 5784.
    
    Signed-off-by: Matt Carlson <mcarlson at broadcom.com>
    Signed-off-by: Michael Chan <mchan at broadcom.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit fd1122a2593d0bbe19856e3943c859ebfe563583
Author: Matt Carlson <mcarlson at broadcom.com>
Date:   Fri May 2 16:48:36 2008 -0700

    tg3: Fix 5761 NVRAM sizes
    
    The 5761 NVRAM sizes assigned to the nvram_size member are half as big
    as they should be.  This patch corrects the NVRAM sizes and replaces
    the hardcoded constants with preprocessor constants for readability.
    
    Signed-off-by: Matt Carlson <mcarlson at broadcom.com>
    Signed-off-by: Michael Chan <mchan at broadcom.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 8ef214288622bf523a3b3096958292a1c63132ad
Author: Matt Carlson <mcarlson at broadcom.com>
Date:   Fri May 2 16:47:53 2008 -0700

    tg3: Use constant 500KHz MI clock on adapters with a CPMU
    
    The MI clock is not configured correctly on adapters with the CPMU
    present.  The tg3 driver has code which statically sets the MI clock to
    be a fraction of the speed at which the core clock is running.
    However, the CPMU can change the adapter's core clock frequency based
    on operating conditions.  Consequently, the MI will run slow when the
    core's clock has been slowed down.
    
    There is a new 500KHz constant frequency clock available on adapters
    with a CPMU.  This patch removes the static core clock scaling and
    configures the MI clock to use this new 500KHz clock instead.
    
    Running the MI clock at slower speeds will not directly result in data
    corruption, but it does challenge the PHY read and write routine timeouts.
    
    Signed-off-by: Matt Carlson <mcarlson at broadcom.com>
    Signed-off-by: Michael Chan <mchan at broadcom.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 026672d0997c911c9bef9aabe862884fc0add106
Author: Pavel Machek <pavel at suse.cz>
Date:   Fri May 2 16:45:10 2008 -0700

    hci_usb.h: fix hard-to-trigger race
    
    If someone tries to _urb_unlink while _urb_queue_head is running, he'll see
    _urb->queue == NULL and fail to do any locking.  Prevent that from happening
    by strategically placed barriers.
    
    Signed-off-by: Pavel Machek <pavel at suse.cz>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 84994e16f25dabe234be4fc2d323ec9db95b87cb
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Fri May 2 16:44:07 2008 -0700

    dccp: ccid2.c, ccid3.c use clamp(), clamp_t()
    
    Makes the intention of the nested min/max clear.
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 0c0b0aca66b3a58e12a216d992a0b534eff210e0
Author: Mike Travis <travis at sgi.com>
Date:   Fri May 2 16:43:08 2008 -0700

    net: remove NR_CPUS arrays in net/core/dev.c
    
    Remove the fixed size channels[NR_CPUS] array in net/core/dev.c and
    dynamically allocate array based on nr_cpu_ids.
    
    Signed-off-by: Mike Travis <travis at sgi.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 35bf559145b6332f5465c15a4e5cd7a363985382
Author: Christian Kujau <lists at nerdbynature.de>
Date:   Fri May 2 13:41:56 2008 -0700

    PMU battery: filenames in sysfs with spaces
    
    By changing drivers/power/pmu_battery.c I now have '_' instead of
    ' ' (spaces) in /sys:
    
    /sys/devices/platform/pmu-battery.0/power_supply/PMU_battery_0
    /sys/class/power_supply/PMU_battery_0
    
    I'm still not sure if some userspace tool out there uses the old paths and
    will break now.
    
    Signed-off-by: Christian Kujau <lists at nerdbynature.de>
    Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Anton Vorontsov <cbouatmailru at gmail.com>

commit f6b6b180b4614e57af217045f71caedd94821fc7
Author: Philipp Zabel <philipp.zabel at gmail.com>
Date:   Sat Apr 12 13:47:45 2008 +0200

    pda_power: add init and exit function callbacks
    
    This adds init/exit function callbacks to pda_power, to
    provide a place where the platform code can request/free
    GPIOs that it wants to use in the is_ac_online, is_usb_online
    and set_charge functions.
    
    Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
    Signed-off-by: Anton Vorontsov <cbouatmailru at gmail.com>

commit d3e2ce3bcdbf4319dea308c79b5f72a8ecc8015c
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Fri May 2 16:26:16 2008 -0700

    net: use get/put_unaligned_* helpers
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 83985319393973f280ca2a797047780a7955cf19
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Fri May 2 16:25:46 2008 -0700

    bluetooth: use get/put_unaligned_* helpers
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Acked-by: Marcel Holtmann <marcel at holtmann.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 260ffeed3fd185d29f08e98fb47c09e71bb59cd8
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Fri May 2 16:21:52 2008 -0700

    irda: use get_unaligned_* helpers
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit b4192bbd85d29eb3bec7f9297d6464250e6a7a90
Author: Arjan van de Ven <arjan at linux.intel.com>
Date:   Fri May 2 16:21:07 2008 -0700

    net: Add a WARN_ON_ONCE() to the transmit timeout function
    
    WARN_ON_ONCE() gives a stack trace including the full module list.
    Having this in the kernel dump for the timeout case in the
    generic netdev watchdog will help us see quicker which driver
    is involved. It also allows us to collect statistics
    and patterns in terms of which drivers have this event occuring.
    
    Suggested by Andrew Morton
    
    Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 50aab54f3056ba28afc681f71adee41c399dde1e
Author: Ilpo Järvinen <ilpo.jarvinen at helsinki.fi>
Date:   Fri May 2 16:20:10 2008 -0700

    net: Add missing braces to multi-statement if()s
    
    One finds all kinds of crazy things with some shell pipelining.
    
    Signed-off-by: Ilpo Järvinen <ilpo.jarvinen at helsinki.fi>
    Acked-by: David Howells <dhowells at redhat.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit b9095fd8a7f41dc7ac0b0b7864f74766a3056f96
Author: H. Peter Anvin <hpa at zytor.com>
Date:   Fri May 2 16:18:42 2008 -0700

    Make constants in kernel/timeconst.h fixed 64 bits
    
    Force constants in kernel/timeconst.h (except shift counts) to be 64 bits,
    using U64_C() constructor macros, and eliminate constants that cannot
    be represented at all in 64 bits.  This avoids warnings with some gcc
    versions.
    
    Drop generating 64-bit constants, since we have no real hope of
    getting a full set (operation on 64-bit values requires a 128-bit
    intermediate result, which gcc only supports on 64-bit platforms, and
    only with libgcc support on some.)  Note that the use of these
    constants does not depend on if we are on a 32- or 64-bit architecture.
    
    This resolves Bugzilla 10153.
    
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>

commit c25bd29805f4d854c3a0b4176813f3c1bff569d3
Author: H. Peter Anvin <hpa at zytor.com>
Date:   Thu Apr 24 13:37:33 2008 -0700

    types: add C99-style constructors to <asm-generic/int-*.h>
    
    Add C99-style constructor macros for fixed types to
    <asm-generic/int-*.h>.  Since Linux uses names like "u64" instead of
    "uint64_t", the constructor macros are called U64_C() instead of
    UINT64_C() and so forth.
    
    These macros allow specific sizes to be specified as
    U64_C(0x123456789abcdef), without gcc issuing warnings as it will if
    one writes (u64)0x123456789abcdef.
    
    When used from assembly, these macros pass their argument unchanged.
    
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>

commit 4cf63c8ac48c63b4c55669d4648506ed2bb8976f
Author: H. Peter Anvin <hpa at zytor.com>
Date:   Sun Apr 6 10:35:15 2008 -0700

    xtensa: types: use <asm-generic/int-*.h> for the xtensa architecture
    
    This modifies <asm-xtensa/types.h> to use the <asm-generic/int-*.h>
    generic include files.
    
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>
    Cc: Chris Zankel <chris at zankel.net>

commit edfa5cfa3dc5bfa95e6aa82a2b8904e7f6c35ed7
Author: H. Peter Anvin <hpa at zytor.com>
Date:   Sun Apr 6 10:35:14 2008 -0700

    x86: types: use <asm-generic/int-*.h> for the x86 architecture
    
    This modifies <asm-x86/types.h> to use the <asm-generic/int-*.h>
    generic include files.
    
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>
    Cc: H. Peter Anvin <hpa at zytor.com>
    Cc: Ingo Molnar <mingo at elte.hu>
    Cc: Thomas Gleixner <tglx at linutronix.de>

commit a192da9afa00476ca27edf763922ab0b5d64246e
Author: H. Peter Anvin <hpa at zytor.com>
Date:   Sun Apr 6 10:35:13 2008 -0700

    v850: types: use <asm-generic/int-*.h> for the v850 architecture
    
    This modifies <asm-v850/types.h> to use the <asm-generic/int-*.h>
    generic include files.
    
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>

commit 0dc794754cba8e3e8eb39bc028cb88c5d6ed506b
Author: H. Peter Anvin <hpa at zytor.com>
Date:   Sun Apr 6 10:35:13 2008 -0700

    sparc64: types: use <asm-generic/int-*.h> for the sparc64 architecture
    
    This modifies <asm-sparc64/types.h> to use the <asm-generic/int-*.h>
    generic include files.
    
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>
    Acked-by: David S. Miller <davem at davemloft.net>

commit a3727dc6c21cd0bed64dbc97212c39d2b391f5af
Author: H. Peter Anvin <hpa at zytor.com>
Date:   Sun Apr 6 10:35:12 2008 -0700

    sparc: types: use <asm-generic/int-*.h> for the sparc architecture
    
    This modifies <asm-sparc/types.h> to use the <asm-generic/int-*.h>
    generic include files.
    
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>
    Cc: William L. Irwin <wli at holomorphy.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit ba6677886e46adcd075f251d8971debf7b5ca3ee
Author: H. Peter Anvin <hpa at zytor.com>
Date:   Sun Apr 6 10:35:11 2008 -0700

    sh: types: use <asm-generic/int-*.h> for the sh architecture
    
    This modifies <asm-sh/types.h> to use the <asm-generic/int-*.h>
    generic include files.
    
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>
    Cc: Paul Mundt <lethal at linux-sh.org>

commit 59df83992b6ec962fdf69e4db4c18951499cc67c
Author: H. Peter Anvin <hpa at zytor.com>
Date:   Sun Apr 6 10:35:10 2008 -0700

    s390: types: use <asm-generic/int-*.h> for the s390 architecture
    
    This modifies <asm-s390/types.h> to use the <asm-generic/int-*.h>
    generic include files.
    
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>
    Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
    Cc: Heiko Carstens <heiko.carstens at de.ibm.com>

commit 3f02c4e0e5d20884677a0259de42e553514534f9
Author: H. Peter Anvin <hpa at zytor.com>
Date:   Sun Apr 6 10:35:09 2008 -0700

    powerpc: types: use <asm-generic/int-*.h> for the powerpc architecture
    
    This modifies <asm-powerpc/types.h> to use the <asm-generic/int-*.h>
    generic include files.
    
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>
    Cc: Paul Mackerras <paulus at samba.org>
    Cc: Anton Blanchard <anton at samba.org>

commit 849bf3a09fdcf9dbbe060da0f5bce90231b14625
Author: H. Peter Anvin <hpa at zytor.com>
Date:   Sun Apr 6 10:35:09 2008 -0700

    parisc: types: use <asm-generic/int-*.h> for the parisc architecture
    
    This modifies <asm-parisc/types.h> to use the <asm-generic/int-*.h>
    generic include files.
    
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>
    Cc: Kyle McMartin <kyle at parisc-linux.org>
    Cc: Matthew Wilcox <matthew at wil.cx>
    Cc: Grant Grundler <grundler at parisc-linux.org>

commit 8523437b4c664cfc0f11998c4274846b95182000
Author: H. Peter Anvin <hpa at zytor.com>
Date:   Sun Apr 6 10:35:07 2008 -0700

    mn10300: types: use <asm-generic/int-*.h> for the mn10300 architecture
    
    This modifies <asm-mn10300/types.h> to use the <asm-generic/int-*.h>
    generic include files.
    
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>
    Cc: David Howells <dhowells at redhat.com>
    Cc: Koichi Yasutake <yasutake.koichi at jp.panasonic.com>

commit 23cf11ddb5099f8c7f7cb3eb154bff0faf31cae9
Author: H. Peter Anvin <hpa at zytor.com>
Date:   Sun Apr 6 10:35:06 2008 -0700

    mips: types: use <asm-generic/int-*.h> for the mips architecture
    
    This modifies <asm-mips/types.h> to use the <asm-generic/int-*.h>
    generic include files.
    
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>
    Cc: Ralf Baechle <ralf at linux-mips.org>

commit ad55ed6161c113cc03c04df266e75d484bce8247
Author: H. Peter Anvin <hpa at zytor.com>
Date:   Sun Apr 6 10:35:06 2008 -0700

    m68k: types: use <asm-generic/int-*.h> for the m68k architecture
    
    This modifies <asm-m68k/types.h> to use the <asm-generic/int-*.h>
    generic include files.
    
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>
    Cc: Geert Uytterhoeven <geert at linux-m68k.org>
    Cc: Roman Zippel <zippel at linux-m68k.org>

commit ff704db3d4d9354712df2683b62f89dc0611632a
Author: H. Peter Anvin <hpa at zytor.com>
Date:   Sun Apr 6 10:35:05 2008 -0700

    m32r: types: use <asm-generic/int-*.h> for the m32r architecture
    
    This modifies <asm-m32r/types.h> to use the <asm-generic/int-*.h>
    generic include files.
    
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>
    Cc: Hirokazu Takata <takata at linux-m32r.org>

commit 4a4bb4cee14905dd8b2b471b6998d62eeae8199c
Author: H. Peter Anvin <hpa at zytor.com>
Date:   Sun Apr 6 10:35:04 2008 -0700

    ia64: types: use <asm-generic/int-*.h> for the ia64 architecture
    
    This modifies <asm-ia64/types.h> to use the <asm-generic/int-*.h>
    generic include files.
    
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>
    Acked-by: Tony Luck <tony.luck at intel.com>

commit 861531555dfac342c1c40668af8ac2f88af26e71
Author: H. Peter Anvin <hpa at zytor.com>
Date:   Sun Apr 6 10:35:04 2008 -0700

    h8300: types: use <asm-generic/int-*.h> for the h8300 architecture
    
    This modifies <asm-h8300/types.h> to use the <asm-generic/int-*.h>
    generic include files.
    
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>
    Cc: Yoshinori Sato <ysato at users.sourceforge.jp>

commit 8f337b5399302e41ed44e999e0cc518f92d0a509
Author: H. Peter Anvin <hpa at zytor.com>
Date:   Sun Apr 6 10:35:03 2008 -0700

    frv: types: use <asm-generic/int-*.h> for the frv architecture
    
    This modifies <asm-frv/types.h> to use the <asm-generic/int-*.h>
    generic include files.
    
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>
    Cc: David Howells <dhowells at redhat.com>

commit e3b8cf047eb2702178b8cc16f03f8194af840732
Author: H. Peter Anvin <hpa at zytor.com>
Date:   Sun Apr 6 10:35:02 2008 -0700

    cris: types: use <asm-generic/int-*.h> for the cris architecture
    
    This modifies <asm-cris/types.h> to use the <asm-generic/int-*.h>
    generic include files.
    
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>
    Cc: Mikael Starvik <starvik at axis.com>
    Cc: Jesper Nilsson <jesper.nilsson at axis.com>

commit 5424a328d281f54bbc62bf9b5118c45f8113a8b8
Author: H. Peter Anvin <hpa at zytor.com>
Date:   Sun Apr 6 10:35:02 2008 -0700

    blackfin: types: use <asm-generic/int-*.h> for the blackfin architecture
    
    This modifies <asm-blackfin/types.h> to use the <asm-generic/int-*.h>
    generic include files.
    
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>
    Cc: Bryan Wu <cooloney at kernel.org>

commit 63eae0ccacd67fd5ee238c6ba68f83f0ab91a1df
Author: H. Peter Anvin <hpa at zytor.com>
Date:   Sun Apr 6 10:35:01 2008 -0700

    avr32: types: use <asm-generic/int-*.h> for the avr32 architecture
    
    This modifies <asm-avr32/types.h> to use the <asm-generic/int-*.h>
    generic include files.
    
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>
    Cc: Haavard Skinnemoen <hskinnemoen at atmel.com>

commit 4cc1a102b049ff2890e3a97c23ca88e7205b42fd
Author: H. Peter Anvin <hpa at zytor.com>
Date:   Sun Apr 6 10:35:00 2008 -0700

    arm: types: use <asm-generic/int-*.h> for the arm architecture
    
    This modifies <asm-arm/types.h> to use the <asm-generic/int-*.h>
    generic include files.
    
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>
    Cc: Russell King <rmk at arm.linux.org.uk>
    Cc: Lennert Buytenhek <kernel at wantstofly.org>
    Cc: Ben Dooks <ben-linux at fluff.org>

commit 3726c23df8e4d95b6f2b335dfa90e3f4850a8a00
Author: H. Peter Anvin <hpa at zytor.com>
Date:   Sun Apr 6 10:35:00 2008 -0700

    alpha: types: use <asm-generic/int-*.h> for the alpha architecture
    
    This modifies <asm-alpha/types.h> to use the <asm-generic/int-*.h>
    generic include files.
    
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>
    Cc: Richard Henderson <rth at twiddle.net>
    Cc: Ivan Kokshaysky <ink at jurassic.park.msu.ru>

commit d13ff31cfeedbf2fefc7ba13cb753775648eac0c
Author: H. Peter Anvin <hpa at zytor.com>
Date:   Thu Apr 24 12:56:52 2008 -0700

    types: create <asm-generic/int-*.h>
    
    This creates two generic files with common integer definitions; one
    where 64 bits is "long" (most 64-bit architectures) and one where 64
    bits is "long long" (all 32-bit architectures and x86-64.)
    
    Signed-off-by: H. Peter Anvin <hpa at zytor.com>
    Cc: Anton Blanchard <anton at samba.org>
    Cc: Ben Dooks <ben-linux at fluff.org>
    Cc: Bryan Wu <cooloney at kernel.org>
    Cc: Chris Zankel <chris at zankel.net>
    Cc: David Howells <dhowells at redhat.com>
    Cc: David S. Miller <davem at davemloft.net>
    Cc: Geert Uytterhoeven <geert at linux-m68k.org>
    Cc: Grant Grundler <grundler at parisc-linux.org>
    Cc: H. Peter Anvin <hpa at zytor.com>
    Cc: Haavard Skinnemoen <hskinnemoen at atmel.com>
    Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
    Cc: Hirokazu Takata <takata at linux-m32r.org>
    Cc: Ingo Molnar <mingo at elte.hu>
    Cc: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
    Cc: Jesper Nilsson <jesper.nilsson at axis.com>
    Cc: Koichi Yasutake <yasutake.koichi at jp.panasonic.com>
    Cc: Kyle McMartin <kyle at parisc-linux.org>
    Cc: Lennert Buytenhek <kernel at wantstofly.org>
    Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
    Cc: Matthew Wilcox <matthew at wil.cx>
    Cc: Mikael Starvik <starvik at axis.com>
    Cc: Paul Mackerras <paulus at samba.org>
    Cc: Paul Mundt <lethal at linux-sh.org>
    Cc: Ralf Baechle <ralf at linux-mips.org>
    Cc: Richard Henderson <rth at twiddle.net>
    Cc: Roman Zippel <zippel at linux-m68k.org>
    Cc: Russell King <rmk at arm.linux.org.uk>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Cc: Tony Luck <tony.luck at intel.com>
    Cc: William L. Irwin <wli at holomorphy.com>
    Cc: Yoshinori Sato <ysato at users.sourceforge.jp>

commit be2e88011bd800222bfd7b477c727966f93186a9
Merge: d626e3bf728c47746f2129aa00c775d4e8c2a73b 4ba1c5bfd2e5a6c9528eb7777b66c297e70f61ca
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Fri May 2 13:53:07 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:
      ocfs2: Use GFP_NOFS in kmalloc during localalloc window move
      ocfs2: Allow uid/gid/perm changes of symlinks
      ocfs2/dlm: dlmdebug.c: make 2 functions static
      ocfs2: make struct o2cb_stack_ops static
      ocfs2: make struct ocfs2_control_device static
      ocfs2: Correct merge of 52f7c21 (Move /sys/o2cb to /sys/fs/o2cb)

commit d626e3bf728c47746f2129aa00c775d4e8c2a73b
Merge: b66e1f11ebc429569a3784aaf64123633d9e3ed1 7ad4a485002c141f156a014e89542e01e7f8e36a
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Fri May 2 13:52:35 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6:
      [SCSI] aic94xx: fix section mismatch
      [SCSI] u14-34f: Fix 32bit only problem
      [SCSI] dpt_i2o: sysfs code
      [SCSI] dpt_i2o: 64 bit support
      [SCSI] dpt_i2o: move from virt_to_bus/bus_to_virt to dma_alloc_coherent
      [SCSI] dpt_i2o: use standard __init / __exit code
      [SCSI] megaraid_sas: fix suspend/resume sections
      [SCSI] aacraid: Add Power Management support
      [SCSI] aacraid: Fix jbod operations scan issues
      [SCSI] aacraid: Fix warning about macro side-effects
      [SCSI] add support for variable length extended commands
      [SCSI] Let scsi_cmnd->cmnd use request->cmd buffer
      [SCSI] bsg: add large command support
      [SCSI] aacraid: Fix down_interruptible() to check the return value correctly
      [SCSI] megaraid_sas; Update the Version and Changelog
      [SCSI] ibmvscsi: Handle non SCSI error status
      [SCSI] bug fix for free list handling
      [SCSI] ipr: Rename ipr's state scsi host attribute to prevent collisions
      [SCSI] megaraid_mbox: fix Dell CERC firmware problem

commit 7ad4a485002c141f156a014e89542e01e7f8e36a
Author: Sam Ravnborg <sam at ravnborg.org>
Date:   Fri Apr 18 13:57:22 2008 -0700

    [SCSI] aic94xx: fix section mismatch
    
    Fix following warnings:
    WARNING: vmlinux.o(.data+0x17aa88): Section mismatch in reference from the variable asd_pcidev_data to the function .devinit.text:asd_aic9410_setup()
    WARNING: vmlinux.o(.data+0x17aa98): Section mismatch in reference from the variable asd_pcidev_data to the function .devinit.text:asd_aic9410_setup()
    WARNING: vmlinux.o(.data+0x17aaa8): Section mismatch in reference from the variable asd_pcidev_data to the function .devinit.text:asd_aic9405_setup()
    
    asd_pcidev_data is only used by __devinit asd_pci_probe.  So mark is const and
    annotate it __devinitconst to fix the warnings.
    
    [akpm at linux-foundation.org: fix warning]
    Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit b66e1f11ebc429569a3784aaf64123633d9e3ed1
Merge: 1be1d6b7f3f6e3a87f872dd5e7a867d03d8a6851 5c598b3428c372a1209597cee99a70da20625876
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Fri May 2 11:23:14 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] fix sysctl_nr_open bugs
      [PATCH] sanitize anon_inode_getfd()
      [PATCH] split linux/file.h
      [PATCH] make osf_select() use core_sys_select()
      [PATCH] remove horrors with irix tty ioctls handling
      [PATCH] fix file and descriptor handling in perfmon

commit 392512fbf9407fa1647225143e3f9c28a869ac57
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Fri May 2 14:21:50 2008 +0100

    [SCSI] u14-34f: Fix 32bit only problem
    
    Another user of 32bit time
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit 1ed43910956f5faec690ea3214451779e93bbb52
Author: Miquel van Smoorenburg <miquels at cistron.nl>
Date:   Fri May 2 01:08:19 2008 +0200

    [SCSI] dpt_i2o: sysfs code
    
    Create a /sys/class/dpt_i2o directory and populate it with
    dptiN directories. Each dptiN directory contains a "dev" file
    that makes udev create /dev/dptiN
    
    Signed-off-by: Miquel van Smoorenburg <miquels at cistron.nl>
    Acked-by: Mark Salyzyn <Mark_Salyzyn at adaptec.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit 62ac5aedc51485d672a5d91c262a001acecbe447
Author: Miquel van Smoorenburg <miquels at cistron.nl>
Date:   Fri May 2 01:07:27 2008 +0200

    [SCSI] dpt_i2o: 64 bit support
    
    This is the code to actually support 64 bit platforms. 64 bit
    DMA is enabled on both x86_32 PAE and 64 bit platforms.
    
    This code is based in part on the unofficial adaptec 64-bit
    dpt_i2o driver update that I got from Mark Salyzyn at Adaptec.
    
    Signed-off-by: Miquel van Smoorenburg <miquels at cistron.nl>
    Acked-by: Mark Salyzyn <Mark_Salyzyn at adaptec.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit 67af2b060e027c84b8e48d77e00b2369d997c0d4
Author: Miquel van Smoorenburg <miquels at cistron.nl>
Date:   Fri May 2 01:06:39 2008 +0200

    [SCSI] dpt_i2o: move from virt_to_bus/bus_to_virt to dma_alloc_coherent
    
    Remove virt_to_bus/bus_to_virt code from dpt_i2o, and use
    dma_alloc_coherent() / dma_free_coherent().
    
    This is in preparation of 64-bit support, dma_alloc_coherent()
    can allocate memory in the lower 32 bits of physical memory
    which is needed because the HBA only supports message blocks under 4GB
    
    This code is based in part on the unofficial adaptec 64-bit
    dpt_i2o driver update that I got from Mark Salyzyn at Adaptec.
    
    Signed-off-by: Miquel van Smoorenburg <miquels at cistron.nl>
    Acked-by: Mark Salyzyn <Mark_Salyzyn at adaptec.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit c864cb145dc2218cfad9fe53d323b54b48dbab6c
Author: Miquel van Smoorenburg <miquels at cistron.nl>
Date:   Fri May 2 01:05:33 2008 +0200

    [SCSI] dpt_i2o: use standard __init / __exit code
    
    Update dpt_i2o.c to use the standard __init / __exit
    code instead of the legacy '#include "scsi_module.c"' code.
    
    This is needed in preparation of 64-bit support. scsi_module.c
    calls scsi_add_host() with the device pointer set to NULL, and that
    crashes code like arch/x64/kernel/pci-gart_64.c::need_iommu().
    
    The reboot_notifier code is deleted because it wasn't compiled
    in ever anyway, and it would be useless to duplicate it in
    the new code.
    
    Signed-off-by: Miquel van Smoorenburg <miquels at cistron.nl>
    Acked-by: Mark Salyzyn <Mark_Salyzyn at adaptec.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit 33139b21013aba815924b421159fab35e5175483
Author: Jiri Slaby <jirislaby at gmail.com>
Date:   Thu May 1 17:56:02 2008 +0200

    [SCSI] megaraid_sas: fix suspend/resume sections
    
    megaraid_sas suspend and resume are inappropriatelly placed in
    __devinit section. Remove those placements and make the stuff
    dependent on CONFIG_PM.
    
    While at it, mark remove function as __devexit.
    
    Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
    Acked-by: "Yang, Bo" <Bo.Yang at lsi.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit 655d722cf7812078306f975a3afe88b96a1306b8
Author: Mark Salyzyn <Mark_Salyzyn at adaptec.com>
Date:   Wed Apr 30 16:03:42 2008 -0400

    [SCSI] aacraid: Add Power Management support
    
    For firmware that supports the feature(s), add the ability to start or
    stop an array using the associated SCSI commands, to automatically
    manage the spin-up of an array on new I/O reporting back the
    appropriate check conditions and actions in cooperation with the
    normal timeout mechanisms and enable the blackout period management in
    the Firmware associated with the background spin-down of the arrays
    when the Firmware times out and deems the arrays as idle.
    
    Signed-off-by: Mark Salyzyn <aacraid at adaptec.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit a4576b5da671563187ac388e36e1d077bd20e43a
Author: Mark Salyzyn <Mark_Salyzyn at adaptec.com>
Date:   Wed Apr 30 15:47:35 2008 -0400

    [SCSI] aacraid: Fix jbod operations scan issues
    
    As JBOD devices (really just Simple Single Drive Volumes exported to
    the SCSI channel) are managed, they fail to update correctly when the
    driver triggers a SCSI scan. In addition, the ability to change
    multiple arrays or JBODs at the same time was resulting in dropped
    scans, set up a mechanism to issue a list of single target scans on a
    single configuration change notification from the Firmware.
    
    Performed some additional sundry cosmetic code style cleanups.
    
    Signed-off-by: Mark Salyzyn <aacraid at adaptec.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit e2efe7aa24dc7b430d2ea109fa117bd3c60ae8e6
Author: Mark Salyzyn <Mark_Salyzyn at adaptec.com>
Date:   Wed Apr 30 15:28:32 2008 -0400

    [SCSI] aacraid: Fix warning about macro side-effects
    
    On some compile environments, warnings are produced regarding the
    usage of aac_logical_to_phys macro.
    
    Signed-off-by: Mark Salyzyn <aacraid at adaptec.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit 1be1d6b7f3f6e3a87f872dd5e7a867d03d8a6851
Merge: 37b6a04fd9fc887bbcc1a27d9354a5e7a5a4cdd8 62fd2cac5bf5cf9e6fcb2fc40b32e7271e605c53
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Fri May 2 11:03:08 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: (32 commits)
      USB GADGET/PERIPHERAL: g_file_storage Bulk-Only Transport compliance, clear-feature ignore
      USB GADGET/PERIPHERAL: g_file_storage Bulk-Only Transport compliance
      usb_serial: some coding style fixes
      USB: Remove redundant dependencies on USB_ATM.
      USB: UHCI: disable remote wakeup when it's not needed
      USB: OHCI: work around bogus compiler warning
      USB: add Cypress c67x00 OTG controller HCD driver
      USB: add Cypress c67x00 OTG controller core driver
      USB: add Cypress c67x00 low level interface code
      USB: airprime: unlock mutex instead of trying to lock it again
      USB: storage: Update mailling list address
      USB: storage: UNUSUAL_DEVS() for PanDigital Picture frame.
      USB: Add the USB 2.0 extension descriptor.
      USB: add more FTDI device ids
      USB: fix cannot work usb storage when using ohci-sm501
      usb: gadget zero timer init fix
      usb: gadget zero style fixups (mostly whitespace)
      usb serial gadget: CDC ACM fixes
      usb: pxa27x_udc driver
      USB: INTOVA Pixtreme camera mass storage device
      ...

commit 37b6a04fd9fc887bbcc1a27d9354a5e7a5a4cdd8
Merge: 3482a6f1d1447b618d37049529cf36a8dc3bd3e3 06916639e2fed9ee475efef2747a1b7429f8fe76
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Fri May 2 11:02:53 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: add dev_name() to help transition away from using bus_id

commit 77a8d5741f3ee2c79554382179cca7b5893d6ae9
Author: Steve Wise <swise at opengridcomputing.com>
Date:   Fri May 2 10:57:09 2008 -0700

    RDMA/cxgb3: Bump up the MPA connection setup timeout.
    
    Testing on large clusters shows its way too short at 10 secs.
    
    Signed-off-by: Steve Wise <swise at opengridcomputing.com>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit c4d49776e8f5bf2d900d2b6d4855c1670a535ac5
Author: Steve Wise <swise at opengridcomputing.com>
Date:   Fri May 2 10:57:09 2008 -0700

    RDMA/cxgb3: Silently ignore close reply after abort.
    
    Remove bad BUG_ON() that can trigger in correct operation from
    close_con_rpl().  It is possible to get a close_rpl message on a dead
    connection.  The sequence is:
    
    	- host refs ep for close exchange
    	- host posts close_req
    	- hw posts PEER_ABORT from incoming RST
    	- host marks ep DEAD
    	- host posts ABORT_RPL and releases ep resources
    	- hw posts CLOSE_RPL
    	- host derefs ep and ep freed.
    
    Signed-off-by: Steve Wise <swise at opengridcomputing.com>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit c8286944b802c5ce4063ec3c334b38c6757a9434
Author: Steve Wise <swise at opengridcomputing.com>
Date:   Fri May 2 11:17:41 2008 -0500

    RDMA/cxgb3: QP flush fixes
    
    - Flush the QP only after the HW disables the connection.  Currently
      we flush the QP when transitioning to CLOSING.  This exposes a race
      condition where the HW can complete a RECV WR, for instance, -and-
      the SW can flush that same WR.
    
    - Only call CQ event handlers on flush IFF we actually flushed something.
    
    Signed-off-by: Steve Wise <swise at opengridcomputing.com>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit 62fd2cac5bf5cf9e6fcb2fc40b32e7271e605c53
Author: David Lopo <lopo.david at gmail.com>
Date:   Tue Apr 29 10:14:38 2008 +0100

    USB GADGET/PERIPHERAL: g_file_storage Bulk-Only Transport compliance, clear-feature ignore
    
    Gadget tells controller driver to ignore Clear-Feature(HALT_ENDPOINT)
    
    Signed-off-by: David Lopo <lopo.david at gmail.com>
    Acked-by: Alan Stern <stern at rowland.harvard.edu>

commit a5e54b0dbb6a099793caf508b1d6c7d82f965ec3
Author: David Lopo <lopo.david at gmail.com>
Date:   Tue Apr 29 10:12:37 2008 +0100

    USB GADGET/PERIPHERAL: g_file_storage Bulk-Only Transport compliance
    
    Gadget can tell controller driver to ignore Clear-Feature(HALT_ENDPOINT)
    This API change enables future support for Bulk-Only Transport compliance
    
    Signed-off-by: David Lopo <lopo.david at gmail.com>
    Acked-by: Alan Stern <stern at rowland.harvard.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit c4d0f8cbca3a97900f85b082064a63c7a5928bd7
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Tue Apr 29 14:35:39 2008 +0100

    usb_serial: some coding style fixes
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit e5430f889ce04301152044cce15a4a11a3e21e7d
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date:   Fri Apr 25 17:06:35 2008 -0400

    USB: Remove redundant dependencies on USB_ATM.
    
    Given that the bulk of the Kconfig file is enclosed in "if USB_ATM",
    remove the unnecessary dependencies.
    
    Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit d8f12ab5d984761726e638a4222299a9fc516233
Author: Alan Stern <stern at rowland.harvard.edu>
Date:   Tue Apr 22 10:49:15 2008 -0400

    USB: UHCI: disable remote wakeup when it's not needed
    
    This patch (as1084b) fixes the way uhci-hcd handles polling and
    remote wakeups for its root hubs.  When remote wakeup is disabled,
    neither interrupts nor polling should be enabled during a root-hub
    suspend.  Likewise, if interrupts are enabled during suspend then
    polling isn't needed.
    
    Furthermore the EGSM (Enter Global Suspend Mode) bit shouldn't be set
    in the Command register unless remote wakeup is enabled.  Apparently
    some controllers will issue a remote-wakeup interrupt whenever EGSM
    is on, even if Resume-Detect interrupts are supposedly disabled.
    
    Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 1b7b61c5d4071b9a25f6a9aae6f0a1e0efdbb2ae
Author: Alan Stern <stern at rowland.harvard.edu>
Date:   Tue Apr 22 10:50:18 2008 -0400

    USB: OHCI: work around bogus compiler warning
    
    The patch (as1086) works around a bogus "uninitialized variable"
    warning generated by some versions of GCC.
    
    Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit e9b29ffc519b9e63d4e1c0b1278bb951bb418a9d
Author: Peter Korsgaard <jacmet at sunsite.dk>
Date:   Sun Apr 27 08:59:45 2008 +0200

    USB: add Cypress c67x00 OTG controller HCD driver
    
    This patch adds HCD support for the Cypress c67x00 family of devices.
    
    Signed-off-by: Peter Korsgaard <jacmet at sunsite.dk>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit b02b371e6d14961ad458ca9d88b30eefef77003d
Author: Peter Korsgaard <jacmet at sunsite.dk>
Date:   Sun Apr 27 08:59:44 2008 +0200

    USB: add Cypress c67x00 OTG controller core driver
    
    This patch add the core driver for the c67x00 USB OTG controller.  The core
    driver is responsible for the platform bus binding and creating either
    USB HCD or USB Gadget instances for each of the serial interface engines
    on the chip.
    
    This driver does not directly implement the HCD or gadget behaviours; it
    just controls access to the chip.
    
    Signed-off-by: Peter Korsgaard <jacmet at sunsite.dk>
    Acked-by: David Brownell <dbrownell at users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit d6f945044ee3b91a170183e8e34c3db29696d9b8
Author: Peter Korsgaard <jacmet at sunsite.dk>
Date:   Sun Apr 27 08:59:43 2008 +0200

    USB: add Cypress c67x00 low level interface code
    
    This patch adds the low level support code for the Cypress c67x00 family of
    OTG controllers.  The low level code is responsible for register access and
    implements the software protocol for communicating with the 16bit
    microcontroller inside the c67x00 device.
    
    Communication is done over the HPI interface (16bit SRAM-like parallel bus).
    
    Signed-off-by: Peter Korsgaard <jacmet at sunsite.dk>
    Acked-by: David Brownell <dbrownell at users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 21ae1dd1d4948968ad2d923c5e104d38fb35b4e4
Author: Leonardo Chiquitto <leonardo at iken.com.br>
Date:   Tue Apr 22 16:02:03 2008 -0300

    USB: airprime: unlock mutex instead of trying to lock it again
    
    The following patch fixes a [probable] copy & paste mistake in
    airprime.c. Instead of unlocking an acquired mutex, the actual
    code tries to lock it again.
    
    Signed-off-by: Leonardo Chiquitto <lchiquitto at novell.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit cef03f8f1d5042e85de431d739eeded89d79999b
Author: Andrew Lunn <andrew at lunn.ch>
Date:   Wed Apr 23 22:04:30 2008 +0200

    USB: storage: Update mailling list address
    
    drivers/usb/storage/unusual_devs.h lists the address
    linux-usb-devel at lists.sourceforge.net for patches to that file. This
    address results in a bounce and a pointer to vger. This patch updates
    the address in the header file.
    
    Signed-off-by: Andrew Lunn <andrew at lunn.ch>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit f7687217ddb5e20ca855fadef2f9eb3c3202acca
Author: Andrew Lunn <andrew at lunn.ch>
Date:   Thu Apr 24 19:36:39 2008 +0200

    USB: storage: UNUSUAL_DEVS() for PanDigital Picture frame.
    
    Signed-off-by: Andrew Lunn <andrew at lunn.ch>
    Signed-off-by: Matthew Dharm <mdharm-usb at one-eyed-alien.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 35e5437e8c8cd013e1e573ac4671d556819edbcb
Author: Sarah Sharp <sarah.a.sharp at intel.com>
Date:   Fri Apr 25 16:46:45 2008 -0700

    USB: Add the USB 2.0 extension descriptor.
    
    This device descriptor was added by the recent USB Link Power Management (LPM)
    ECN.  It indicates whether the USB device supports LPM.
    
    This descriptor is grouped under a Binary Device Object Store (BOS) descriptor.
    Update the BOS comments to indicate any USB device (not just wireless USB
    devices) can implement BOS descriptors.
    
    Signed-off-by: Sarah Sharp <sarah.a.sharp at intel.com>
    Acked-by: David Brownell <dbrownell at users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 6e1ab3ed825418320319f44af1b990c9c3f4c45b
Author: Peter Mack <Peter.Mack at scs-ptc.com>
Date:   Tue Apr 22 13:25:11 2008 +0200

    USB: add more FTDI device ids
    
    Add more usb device ids to the ftdi driver.
    
    From: Peter Mack <Peter.Mack at scs-ptc.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit e2722528ce688eecf574c237f7656d3934d4f23c
Author: Yoshihiro Shimoda <shimoda.yoshihiro at renesas.com>
Date:   Mon Apr 21 13:48:22 2008 +0900

    USB: fix cannot work usb storage when using ohci-sm501
    
    When I used ohci-sm501, hcd_alloc_coherent() in map_urb_for_dma() is not
    called, because usb_sg_init() always sets URB_NO_TRANSFER_DMA_MAP.
    
    dmesg (CONFIG_USB_STORAGE_DEBUG enabled):
    
    usb-storage: Bulk Command S 0x43425355 T 0x1 L 36 F 128 Trg 0 LUN 0 CL 6
    usb-storage: usb_stor_bulk_transfer_buf: xfer 31 bytes
    usb-storage: Status code 0; transferred 31/31
    usb-storage: -- transfer complete
    usb-storage: Bulk command transfer result=0
    usb-storage: usb_stor_bulk_transfer_sglist: xfer 36 bytes, 1 entries
    usb-storage: Status code -75; transferred 0/36
    usb-storage: -- babble
    usb-storage: Bulk data transfer result 0x3
    usb-storage: Attempting to get CSW...
    usb-storage: usb_stor_bulk_transfer_buf: xfer 13 bytes
    usb-storage: Status code 0; transferred 13/13
    usb-storage: -- transfer complete
    usb-storage: Bulk status result = 0
    usb-storage: Bulk Status S 0x53425355 T 0x1 R 0 Stat 0x0
    usb-storage: scsi cmd done, result=0x2
    
    Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro at renesas.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 7a6ad1dd86a45da8f235300349d4abd9ae7d1a21
Author: David Lopo <lopo.david at gmail.com>
Date:   Fri Apr 18 18:49:01 2008 -0700

    usb: gadget zero timer init fix
    
    Initialize timer earlier so if an error occurs allocating USB request
    or buffer request (zero_bind) Gadget Zero will not hang trying to
    delete an uninitialized timer (zero_unbind).
    
    Signed-off-by: David Lopo <lopo.david at gmail.com>
    Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 7472f38b10c884f47241529d1367f77c2e1b3551
Author: David Brownell <dbrownell at users.sourceforge.net>
Date:   Fri Apr 18 18:47:54 2008 -0700

    usb: gadget zero style fixups (mostly whitespace)
    
    Minor updates to "Gadget Zero".
    
     - Primarily these are whitespace updates to address the fact that since
       this was written, Documentation/CodingStyle was changed to disapprove
       of parts of the original coding style.
    
     - Update a few comments that weren't quite correct, notably mentioning
       the "autoresume" module parameter.
    
    Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit f371e750c9324f3498842ee833a0242a11b359e6
Author: David Brownell <david-b at pacbell.net>
Date:   Fri Apr 18 17:37:49 2008 -0700

    usb serial gadget: CDC ACM fixes
    
    Based on a patch from <Aurel.Thomi at ruag.com>, this makes the
    CDC-ACM support in the serial gadget handle the SET_LINE_CODING
    and SET_CONTROL_LINE_STATE requests ... which should improve
    interop with at least MS-Windows "usbser.sys" if not some other
    ACM host drivers.
    
    It also adds a few REVISIT comments where this code plays a bit
    loose with the CDC ACM spec.  If this were used to hook up to a
    real RS232 or modem link, those places would need a bit of work.
    
    Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit d75379a538708c5a8e3dba673d866c3f5f856620
Author: Robert Jarzmik <rjarzmik at free.fr>
Date:   Fri Apr 18 15:56:49 2008 -0700

    usb: pxa27x_udc driver
    
    Adds pxa27x udc driver to support USB peripherals on pxa27x chips.
    
    The driver is compatible with: Gadget Zero, the File Storage
    gadget, and the Ethernet gadget (only in CDC subset mode).
    
    The driver can't properly support multiple interfaces, because
    of hardware bugs without possible workaround.  That means no
    RNDIS support from g_ether, and no CDC ACM support in g_serial.
    
    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 d301f528eb7b204fc99fb9ebbf289f84a69bfa19
Author: Rohan Hart <rohan.hart17 at gmail.com>
Date:   Fri Apr 18 21:19:33 2008 +1200

    USB: INTOVA Pixtreme camera mass storage device
    
    FIX_CAPACITY is all that's needed.
    
    
    Cc: Alan Stern <stern at rowland.harvard.edu>
    Cc: Phil Dibowitz <phil at ipom.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 87521c46f63f0e1cac2bf8af08942ac47bb25de5
Author: Roel Kluin <12o3l at tiscali.nl>
Date:   Thu Apr 17 06:16:24 2008 +0200

    USB: mos7840: test and propagate set_uart_reg return value
    
    The test for an mos7840_set_uart_reg() error return value only works when
    status is signed. propagate its error value.
    
    Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
    Cc: SL Baur <steve at xemacs.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 28ffd79c31a7bed6f610511a4d104d1255cd1d95
Author: David Brownell <david-b at pacbell.net>
Date:   Fri Apr 25 18:51:10 2008 -0700

    USB: usbtest displays diagnostics again
    
    Minor cleanup to the "usbtest" driver, mostly to resolve a regression:
    all the important diagnostics were at KERN_DEBUG, so that when the
    "#define DEBUG" was removed from the top of that file it stopped
    providing diagnostics.  Fix by using KERN_ERROR.  Also:
    
     - Stop using the legacy dbg() calls
     - Simplify the internal debug macros
     - Correct some test descriptions:
    	* Test #10 subcase 7 should *always* stall
    	* Test #10 subcase 8 *may* stall
     - Diagnostic about control queue test failures is more informative
     - Fix some whitespace "bugs"
    
    And add a warning about the rude interaction between usbfs ioctl()
    and khubd during device disconnect ... don't unplug a device under
    test, that will wedge.
    
    Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 9029b174ba22918d0a0aa3b71859854bd50c39cc
Author: Pete Zaitcev <zaitcev at redhat.com>
Date:   Sat Apr 19 14:45:24 2008 -0700

    ub: Cosmetics
    
    Fix a few comments and printk statements.
    
    Signed-off-by: Pete Zaitcev <zaitcev at redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 0da13c8c3dfb1ab6c56f2a70fadfddd57e0d7c42
Author: Pete Zaitcev <zaitcev at redhat.com>
Date:   Sat Apr 19 14:42:49 2008 -0700

    ub: Ignore bad residue
    
    I hoped to continue to ignore this problem or use libusual, but these
    days it's simpler to work around than to deal with it. Let's attempt to
    use bad residue devices and hope that upper level integrity checks catch
    any problems (e.g. please use sha1sum on your backups).
    
    Signed-off-by: Pete Zaitcev <zaitcev at redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 82fe26ba7a21d9bcc77e6142c941683eede32940
Author: Pete Zaitcev <zaitcev at redhat.com>
Date:   Sat Apr 19 14:35:30 2008 -0700

    ub: Tune retries
    
    Make ub to fail faster in hopeless cases.
    
    Signed-off-by: Pete Zaitcev <zaitcev at redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 2c51ae70ede5a90d8ccb67d965c1b4e20fc4e110
Author: Pete Zaitcev <zaitcev at redhat.com>
Date:   Sat Apr 19 14:32:18 2008 -0700

    ub: Fix timeouts
    
    The wodim says:
    "close track/session scsi sendcmd: cmd timeout after 5.000 (480) s"
    This happened because we ignored the supplied timeout and used 5s.
    
    It's not completely correct to apply a timeout meant for the complete
    command to any single URB, but we don't have many URBs per command, so
    this is simple and works.
    
    Signed-off-by: Pete Zaitcev <zaitcev at redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 043042109b24a1bd418db7cd509dadc5d120daf1
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Mon Apr 21 06:38:34 2008 +1000

    usb: libusual kthread_run() called with wrong format.
    
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit b28884c1729940df83d87c515a5e66e5afbe9dea
Author: Alan Stern <stern at rowland.harvard.edu>
Date:   Mon Apr 28 10:26:13 2008 -0400

    usb-storage: add unusual_devs entry for Samsung YP-U3
    
    This patch (as1088) adds an unusual_devs entry for Samsung's YP-U3.
    
    Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
    Cc: Phil Dibowitz <phil at ipom.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 43c1e98c87013757ef02c50a6e43bafeb6871f68
Author: Adrian Bunk <bunk at kernel.org>
Date:   Mon Apr 28 18:39:37 2008 +0300

    USB: storage/onetouch.c: make a function static
    
    This patch makes the needlessly global onetouch_release_input() static.
    
    Signed-off-by: Adrian Bunk <bunk at kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit e42dc36b2cf9849362967ea836196c8ef6079ec7
Author: Dmitry Torokhov <dmitry.torokhov at gmail.com>
Date:   Mon Apr 28 16:57:14 2008 -0400

    usb-storage: fix build failure in OneTouch driver
    
    If USB storage is built-in but input subsystem is made modular then
    OneTouch button functionality can not be selected.
    
    Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
    Cc: Matthew Dharm <mdharm-usb at one-eyed-alien.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit ce0d7d3f575fc1ba6a89c3c651e710355590daff
Author: Daniel Walker <dwalker at mvista.com>
Date:   Mon Apr 28 10:34:56 2008 -0700

    usb: ldusb: ld_usb semaphore to mutex
    
    Signed-off-by: Daniel Walker <dwalker at mvista.com>
    Acked-by: Matthew Wilcox <willy at linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit db11e47dd7b09b7f76c7eaa236277f23391331e7
Author: Sebastian Siewior <bigeasy at linutronix.de>
Date:   Thu Apr 24 00:37:04 2008 +0200

    USB: ISP1760 HCD driver
    
    This driver has been written from scratch and supports the ISP1760. ISP1761
    might (should) work as well but the OTG isn't supported. Also ISO packets are
    not. However, it works on my little PowerPC board.
    
    Signed-off-by: Sebastian Siewior <bigeasy at linutronix.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 06916639e2fed9ee475efef2747a1b7429f8fe76
Author: Kay Sievers <kay.sievers at vrfy.org>
Date:   Fri May 2 06:02:41 2008 +0200

    driver-core: add dev_name() to help transition away from using bus_id
    
    Signed-off-by: Kay Sievers <kay.sievers at vrfy.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit db4742dd8f0aa9125b74f9b2516336a75f3d9106
Author: Boaz Harrosh <bharrosh at panasas.com>
Date:   Wed Apr 30 11:27:26 2008 +0300

    [SCSI] add support for variable length extended commands
    
    Add support for variable-length, extended, and vendor specific
    CDBs to scsi-ml. It is now possible for initiators and ULD's
    to issue these types of commands. LLDs need not change much.
    All they need is to raise the .max_cmd_len to the longest command
    they support (see iscsi patch).
    
    - clean-up some code paths that did not expect commands to be
      larger than 16, and change cmd_len members' type to short as
      char is not enough.
    
    Signed-off-by: Boaz Harrosh <bharrosh at panasas.com>
    Signed-off-by: Benny Halevy <bhalevy at panasas.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit 3482a6f1d1447b618d37049529cf36a8dc3bd3e3
Merge: 59d42c0eb1d8fdfeec18f4ff088de8084bda906b 1adb0850a1254333d81e64121c80af100c6d6e06
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Fri May 2 08:22:36 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-genirq
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-genirq:
      genirq: reenable a nobody cared disabled irq when a new driver arrives

commit 59d42c0eb1d8fdfeec18f4ff088de8084bda906b
Merge: 02cdf0827b61d51f0e9cc1b5ddd486950830ba08 62478fa4b7cd1bdf0ba8ff8a5e3a95c45c7b8ac8
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Fri May 2 08:20:43 2008 -0700

    Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
    
    * 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev:
      m32r: cleanup: drop .data.idt section in vmlinux.lds script
      m32r: use KBUILD_DEFCONFIG

commit 02cdf0827b61d51f0e9cc1b5ddd486950830ba08
Merge: 8bec4a5d9305c86d028a519b08f05b81cd63cc55 a007a751d98fe97142e4724a83a4e31ec66b7532
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Fri May 2 08:20:04 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: make Launcher see device status updates
      lguest: remove bogus NULL cpu check
      lguest: avoid using NR_CPUS as a bounds check.
      virtio: add virtio disk geometry feature
      virtio: explicit advertisement of driver features
      virtio: change config to guest endian.
      virtio: finer-grained features for virtio_net
      virtio: wean net driver off NETDEV_TX_BUSY
      virtio-blk: fix remove oops
      virtio: fix scatterlist sizing in net driver.
      virtio: de-structify virtio_block status byte
      virtio: export more headers to userspace
      virtio: fix sparse return void-valued expression warnings
      virtio: fix tx_ stats in virtio_net
      virtio: ignore corrupted virtqueues rather than spinning.

commit 64a87b244b9297667ca80264aab849a36f494884
Author: Boaz Harrosh <bharrosh at panasas.com>
Date:   Wed Apr 30 11:19:47 2008 +0300

    [SCSI] Let scsi_cmnd->cmnd use request->cmd buffer
    
     - struct scsi_cmnd had a 16 bytes command buffer of its own.
       This is an unnecessary duplication and copy of request's
       cmd. It is probably left overs from the time that scsi_cmnd
       could function without a request attached. So clean that up.
    
     - Once above is done, few places, apart from scsi-ml, needed
       adjustments due to changing the data type of scsi_cmnd->cmnd.
    
     - Lots of drivers still use MAX_COMMAND_SIZE. So I have left
       that #define but equate it to BLK_MAX_CDB. The way I see it
       and is reflected in the patch below is.
       MAX_COMMAND_SIZE - means: The longest fixed-length (*) SCSI CDB
                          as per the SCSI standard and is not related
                          to the implementation.
       BLK_MAX_CDB.     - The allocated space at the request level
    
     - I have audit all ISA drivers and made sure none use ->cmnd in a DMA
       Operation. Same audit was done by Andi Kleen.
    
    (*)fixed-length here means commands that their size can be determined
       by their opcode and the CDB does not carry a length specifier, (unlike
       the VARIABLE_LENGTH_CMD(0x7f) command). This is actually not exactly
       true and the SCSI standard also defines extended commands and
       vendor specific commands that can be bigger than 16 bytes. The kernel
       will support these using the same infrastructure used for VARLEN CDB's.
       So in effect MAX_COMMAND_SIZE means the maximum size command
       scsi-ml supports without specifying a cmd_len by ULD's
    
    Signed-off-by: Boaz Harrosh <bharrosh at panasas.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit 8bec4a5d9305c86d028a519b08f05b81cd63cc55
Merge: 886c35fbcf6fb2eee15687efc2d64d99b6ad9a4a f8e811b98935f702b48abc92563462a15c226eb8
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Fri May 2 08:17:58 2008 -0700

    Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
      [IA64] fix file and descriptor handling in perfmon
      [IA64] TS_RESTORE_SIGMASK
      [IA64] smp.c coding style fix
      [IA64] fix section mismatch in arch/ia64/kernel/topology.c
      [IA64] fix section mismatch in arch/ia64/kernel/palinfo.c
      [IA64] fix section mismatch in arch/ia64/kernel/irq.c
      [IA64] fix section mismatch in arch/ia64/kernel/acpi.c

commit 9f5de6b105bfa45911d46566df0b36720b648c42
Author: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Date:   Wed Apr 30 13:16:21 2008 +0900

    [SCSI] bsg: add large command support
    
    This enables bsg to handle the request length larger than BLK_MAX_CDB
    (mainly for the variable length CDB format).
    
    Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
    Acked-by: Jens Axboe <jens.axboe at oracle.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit 0462590efe9a562dd2aa976ae2dc9cd2e6f5a0c6
Author: Mark Salyzyn <Mark_Salyzyn at adaptec.com>
Date:   Wed Apr 23 08:16:06 2008 -0400

    [SCSI] aacraid: Fix down_interruptible() to check the return value correctly
    
    On Apr 21, 2008, at 8:42 PM, Yinghai Lu wrote:
    > bisected to:
    >
    > commit e6990c6448ca9359b6d4ad027c0a6efbf4379e64
    > Author: Mark Salyzyn <Mark_Salyzyn at adaptec.com>
    > Date:   Mon Apr 14 14:20:16 2008 -0400
    >
    >    [SCSI] aacraid: Fix down_interruptible() to check the return value
    
    The return value for down_interruptible was incorrectly checked!
    updated patch enclosed.
    
    Signed-off-by: Mark Salyzyn <aacraid at adaptec.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit 4a1236ac6ee3bb3a2f585e66871de3c39ab38f7c
Author: David S. Miller <davem at davemloft.net>
Date:   Thu May 1 22:33:04 2008 -0700

    sparc32: Delete prom_stdin and prom_stdout.
    
    They are written, but never used.
    
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 9f2b2a5f68c27c00f1e1f1922de5aa2f24505ed8
Author: David S. Miller <davem at davemloft.net>
Date:   Thu May 1 22:28:17 2008 -0700

    sparc32: More memory probing consolidation.
    
    The PROM library function prom_meminit() builds a table,
    prom_phys_avail[], just so that probe_memory() in
    arch/sparc/mm/fault.c can copy it into sp_banks[].
    
    Just have prom_meminit() fill in the sp_banks[] array directly, and
    remove duplicated sort() function.
    
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit ccc34028d46230f715eeda4c8cce27e919934fad
Author: David S. Miller <davem at davemloft.net>
Date:   Thu May 1 21:28:59 2008 -0700

    sparc32: Kill totally unused memory information tables.
    
    The code in arch/sparc/prom/memory.c computes three tables, the list
    of total memory, the list of available memory (total minus what
    firmware is using), and the list of firmware taken memory.
    
    Only the available memory list is even used.
    
    Therefore, kill those unused tables and make prom_meminfo() return
    just the available memory list.
    
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 2678fefedbbc03a3ae6f5c254791bf147d6c52fd
Author: David S. Miller <davem at davemloft.net>
Date:   Thu May 1 03:30:22 2008 -0700

    sparc64: Fix syscall restart, for real...
    
    The change I put into copy_thread() just papered over the real
    problem.
    
    When we are looking to see if we should do a syscall restart, when
    deliverying a signal, we should only interpret the syscall return
    value as an error if the carry condition code(s) are set.
    
    Otherwise it's a success return.
    
    Also, sigreturn paths should do a pt_regs_clear_trap_type().
    
    It turns out that doing a syscall restart when returning from a fork()
    does and should happen, from time to time.  Even if copy_thread()
    returns success, copy_process() can still unwind and signal
    -ERESTARTNOINTR in the parent.
    
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 32039f4954938e4d761032d7046254d08d0db54c
Author: David S. Miller <davem at davemloft.net>
Date:   Thu May 1 01:14:27 2008 -0700

    serial: Fix sparc driver name strings.
    
    They were all "serial" so if multiple of these drivers registered,
    we'd trigger sysfs directory creation errors:
    
    [    1.695793] proc_dir_entry 'serial' already registered
    [    1.695839] Call Trace:
    [    1.831891]  [00000000004f2534] create_proc_entry+0x7c/0x98
    [    1.833608]  [00000000004f3a58] proc_tty_register_driver+0x40/0x70
    [    1.833663]  [0000000000594700] tty_register_driver+0x1fc/0x208
    [    1.835371]  [00000000005aade4] uart_register_driver+0x134/0x16c
    [    1.841762]  [00000000005ac274] sunserial_register_minors+0x34/0x68
    [    1.841818]  [00000000007db2a4] sunsu_init+0xf8/0x150
    [    1.867697]  [00000000007c62a4] kernel_init+0x190/0x330
    [    1.939147]  [0000000000426cf8] kernel_thread+0x38/0x48
    [    1.939198]  [00000000006a0d90] rest_init+0x18/0x5c
    
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit c26d3c0138970778fabe114df99dffb34a04b1d7
Author: David S. Miller <davem at davemloft.net>
Date:   Thu May 1 01:12:40 2008 -0700

    sparc64: Stop creating dummy root PCI host controller devices.
    
    It just creates confusion, errors, and bugs.
    
    For one thing, this can cause dup sysfs or procfs nodes to get
    created:
    
    [    1.198015] proc_dir_entry '00.0' already registered
    [    1.198036] Call Trace:
    [    1.198052]  [00000000004f2534] create_proc_entry+0x7c/0x98
    [    1.198092]  [00000000005719e4] pci_proc_attach_device+0xa4/0xd4
    [    1.198126]  [00000000007d991c] pci_proc_init+0x64/0x88
    [    1.198158]  [00000000007c62a4] kernel_init+0x190/0x330
    [    1.198183]  [0000000000426cf8] kernel_thread+0x38/0x48
    [    1.198210]  [00000000006a0d90] rest_init+0x18/0x5c
    
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit a007a751d98fe97142e4724a83a4e31ec66b7532
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Fri May 2 21:50:53 2008 -0500

    lguest: make Launcher see device status updates
    
    This brings us closer to Real Life, where we'd examine the device
    features once it's set the DRIVER_OK status bit.
    
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>

commit 9f3f746741d917fe3c6c544c7d319d533176d90b
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Fri May 2 21:50:51 2008 -0500

    lguest: remove bogus NULL cpu check
    
    If lg isn't NULL, and cpu_id is sane, &lg->cpus[cpu_id] can't be NULL.
    
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>

commit 24adf12722b4f2800e5b5f0955d57033f0d0c9e5
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Fri May 2 21:50:51 2008 -0500

    lguest: avoid using NR_CPUS as a bounds check.
    
    NR_CPUS (being a host number) is an arbitrary limit for the Guest.
    Using the array size directly (which currently happes to be NR_CPUS)
    is more futureproof.
    
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>

commit 48e4043d4529523cbc7fa8dd745bd8e2c45ce1d3
Author: Ryan Harper <ryanh at us.ibm.com>
Date:   Wed Apr 16 13:56:37 2008 -0500

    virtio: add virtio disk geometry feature
    
    Rather than faking up some geometry, allow the backend to push the disk
    geometry via virtio pci config option.  Keep the old geo code around for
    compatibility.
    
    Signed-off-by: Ryan Harper <ryanh at us.ibm.com>
    Reviewed-by: Anthony Liguori <aliguori at us.ibm.com>
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au> (modified to single struct)

commit c45a6816c19dee67b8f725e6646d428901a6dc24
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Fri May 2 21:50:50 2008 -0500

    virtio: explicit advertisement of driver features
    
    A recent proposed feature addition to the virtio block driver revealed
    some flaws in the API: in particular, we assume that feature
    negotiation is complete once a driver's probe function returns.
    
    There is nothing in the API to require this, however, and even I
    didn't notice when it was violated.
    
    So instead, we require the driver to specify what features it supports
    in a table, we can then move the feature negotiation into the virtio
    core.  The intersection of device and driver features are presented in
    a new 'features' bitmap in the struct virtio_device.
    
    Note that this highlights the difference between Linux unsigned-long
    bitmaps where each unsigned long is in native endian, and a
    straight-forward little-endian array of bytes.
    
    Drivers can still remove feature bits in their probe routine if they
    really have to.
    
    API changes:
    - dev->config->feature() no longer gets and acks a feature.
    - drivers should advertise their features in the 'feature_table' field
    - use virtio_has_feature() for extra sanity when checking feature bits
    
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>

commit 72e61eb40b55dd57031ec5971e810649f82b0259
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Fri May 2 21:50:49 2008 -0500

    virtio: change config to guest endian.
    
    A recent proposed feature addition to the virtio block driver revealed
    some flaws in the API, in particular how easy it is to break big
    endian machines.
    
    The virtio config space was originally chosen to be little-endian,
    because we thought the config might be part of the PCI config space
    for virtio_pci.  It's actually a separate mmio region, so that
    argument holds little water; as only x86 is currently using the virtio
    mechanism, we can change this (but must do so now, before the
    impending s390 merge).
    
    API changes:
    - __virtio_config_val() just becomes a striaght vdev->config_get() call.
    
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>

commit 5539ae9613587e4a4eec42d420b8bdd9ff552a65
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Fri May 2 21:50:46 2008 -0500

    virtio: finer-grained features for virtio_net
    
    So, we previously had a 'VIRTIO_NET_F_GSO' bit which meant that 'the
    host can handle csum offload, and any TSO (v4&v6 incl ECN) or UFO
    packets you might want to send.  I thought this was good enough for
    Linux, but it actually isn't, since we don't do UFO in software.
    
    So, add separate feature bits for what the host can handle.  Add
    equivalent ones for the guest to say what it can handle, because LRO
    is coming too (thanks Herbert!).
    
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>

commit 99ffc696d10b28580fe93441d627cf290ac4484c
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Fri May 2 21:50:46 2008 -0500

    virtio: wean net driver off NETDEV_TX_BUSY
    
    Herbert tells me that returning NETDEV_TX_BUSY from hard_start_xmit is
    seen as a poor thing to do; we should cache the packet and stop the queue.
    
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
    Acked-by: Herbert Xu <herbert at gondor.apana.org.au>

commit 2e895e4c23b7f73dba7238db5c5c2dcffb2a4d9d
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Thu Apr 24 15:49:53 2008 -0300

    virtio-blk: fix remove oops
    
    Do not unregister the major at device remove, since there might be
    another device instances around.
    
    (qemu) pci_del 0 11
    (qemu) ACPI: PCI interrupt for device 0000:00:0b.0 disabled
    (qemu) pci_del 0 10
    (qemu) ------------[ cut here ]------------
    WARNING: at block/genhd.c:126 unregister_blkdev+0x74/0x9e()
    ACPI: PCI interrupt for device 0000:00:0a.0 disabled
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>

commit 0527168522c25121bdd5d5f1d3c5b484d972ea14
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Fri May 2 21:50:45 2008 -0500

    virtio: fix scatterlist sizing in net driver.
    
    Herbert Xu points out (within another patch) that my scatterlists are
    too short: one entry for the gso header, one for the skb->data, and
    MAX_SKB_FRAGS for all the fragments.
    
    Fix both xmit and recv sides (recv currently unused, coming in later
    patch).
    
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>

commit cb38fa23c17519faf46a76d2f71a8430705fe474
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Fri May 2 21:50:45 2008 -0500

    virtio: de-structify virtio_block status byte
    
    Ron Minnich points out that a struct containing a char is not always
    sizeof(char); simplest to remove the structure to avoid confusion.
    
    Cc: "ron minnich" <rminnich at gmail.com>
    
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>

commit 81473132878f8a1d0c6a78cffa0cf84c8a19c1be
Author: Christian Borntraeger <borntraeger at de.ibm.com>
Date:   Wed Apr 23 12:57:00 2008 +0200

    virtio: export more headers to userspace
    
    Rusty,
    
    is there a reason why we dont export the virtio headers for
    9p, balloon, console, pci, and virtio_ring? kvm uses make sync,
    but I think it is still useful to heave these headers exported
    as they might be useful for other userspace tools.
    
    I dont export virtio.h, because it does not seem to have useful
    information for userspace and it requires scatterlist.h which is
    also not exported. See also my other mail about your "virtio:
    change config to guest endian." patch.
    
    Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>

commit 597d56e4b51fc3385e097e52d6e92bf596ff21ec
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Mon Mar 31 17:53:55 2008 -0700

    virtio: fix sparse return void-valued expression warnings
    
    drivers/virtio/virtio_pci.c:148:2: warning: returning void-valued expression
    drivers/virtio/virtio_pci.c:155:2: warning: returning void-valued expression
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>

commit 655aa31f028c4498e8896576571ee1ea68dd26e0
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Fri May 2 21:50:43 2008 -0500

    virtio: fix tx_ stats in virtio_net
    
    get_buf() gives the length written by the other side, which will be
    zero.  We want to add the skb length.
    
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>

commit 5ef827526fc01820a7a80827802e9fad3f34f937
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Fri May 2 21:50:43 2008 -0500

    virtio: ignore corrupted virtqueues rather than spinning.
    
    A corrupt virtqueue (caused by the other end screwing up) can have
    strange results such as a driver spinning: just bail when we try to
    get a buffer from a known-broken queue.
    
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>

commit 1adb0850a1254333d81e64121c80af100c6d6e06
Author: Thomas Gleixner <tglx at linutronix.de>
Date:   Mon Apr 28 17:01:56 2008 +0200

    genirq: reenable a nobody cared disabled irq when a new driver arrives
    
    Uwe Kleine-Koenig has some strange hardware where one of the shared
    interrupts can be asserted during boot before the appropriate driver
    loads. Requesting the shared irq line from another driver result in a
    spurious interrupt storm which finally disables the interrupt line.
    
    I have seen similar behaviour on resume before (the hardware does not
    work anymore so I can not verify).
    
    Change the spurious disable logic to increment the disable depth and
    mark the interrupt with an extra flag which allows us to reenable the
    interrupt when a new driver arrives which requests the same irq
    line. In the worst case this will disable the irq again via the
    spurious trap, but there is a decent chance that the new driver is the
    one which can handle the already asserted interrupt and makes the box
    usable again.
    
    Eric Biederman said further: This case also happens on a regular basis
    in kdump kernels where we deliberately don't shutdown the hardware
    before starting the new kernel.  This patch should reduce the need for
    using irqpoll in that situation by a small amount.
    
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
    Tested-and-Acked-by: Uwe Kleine-König <Uwe.Kleine-Koenig at digi.com>

commit 78e92b99ec4eb73755abd4e357b0b211eadafd88
Author: Denis V. Lunev <den at openvz.org>
Date:   Fri May 2 04:12:41 2008 -0700

    netns: assign PDE->data before gluing entry into /proc tree
    
    In this unfortunate case, proc_mkdir_mode wrapper can't be used anymore and
    this is no way to reuse proc_create_data due to nlinks assignment. So,
    copy the code from proc_mkdir and assign PDE->data at the appropriate
    moment.
    
    Signed-off-by: Denis V. Lunev <den at openvz.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 8b169240e266d7fc58d9b9077d18d50a548d9732
Author: Denis V. Lunev <den at openvz.org>
Date:   Fri May 2 04:11:52 2008 -0700

    netfilter: assign PDE->data before gluing PDE into /proc tree
    
    Replace proc_net_fops_create with proc_create_data.
    
    Signed-off-by: Denis V. Lunev <den at openvz.org>
    Acked-by: Patrick McHardy <kaber at trash.net>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 52c0e111fa082082060c4d43c05f20b756d5f06a
Author: Denis V. Lunev <den at openvz.org>
Date:   Fri May 2 04:10:57 2008 -0700

    netfilter: assign PDE->fops before gluing PDE into /proc tree
    
    Replace create_proc_entry with specially created for this purpose proc_create.
    
    Signed-off-by: Denis V. Lunev <den at openvz.org>
    Acked-by: Patrick McHardy <kaber at trash.net>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 84841c3c6cf2ed9a8e0dfd842fb35ef6e2bce091
Author: Denis V. Lunev <den at openvz.org>
Date:   Fri May 2 04:10:08 2008 -0700

    ipv4: assign PDE->data before gluing PDE into /proc tree
    
    The check for PDE->data != NULL becomes useless after the replacement
    of proc_net_fops_create with proc_create_data.
    
    Signed-off-by: Denis V. Lunev <den at openvz.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 1d3faa390df9f009d7d76134b2aa1f07990945a4
Author: Denis V. Lunev <den at openvz.org>
Date:   Fri May 2 04:09:11 2008 -0700

    vlan: assign PDE->data before gluing PDE into /proc tree
    
    Simply replace proc_create and further data assigned with proc_create_data.
    
    Signed-off-by: Denis V. Lunev <den at openvz.org>
    Acked-by: Patrick McHardy <kaber at trash.net>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 0c89652a741cce71661d561c4466115c60c752d1
Author: Denis V. Lunev <den at openvz.org>
Date:   Fri May 2 04:08:30 2008 -0700

    atm: assign PDE->data before gluing PDE into /proc tree
    
    Simply replace proc_create and further data assigned with proc_create_data.
    proc_atm_dev_ops holds proper referrence.
    
    Signed-off-by: Denis V. Lunev <den at openvz.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 0bb53a66fe1258b1cb5eb1ea70768386f0c2a1ca
Author: Denis V. Lunev <den at openvz.org>
Date:   Fri May 2 02:46:55 2008 -0700

    ipv6: assign PDE->data before gluing PDE into /proc tree
    
    Simply replace proc_create and further data assigned with proc_create_data.
    
    Signed-off-by: Denis V. Lunev <den at openvz.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 5efdccbcda20d3e5fbaa85f726dcc9cfeb005577
Author: Denis V. Lunev <den at openvz.org>
Date:   Fri May 2 02:46:22 2008 -0700

    net: assign PDE->data before gluing PDE into /proc tree
    
    Simply replace proc_create and further data assigned with proc_create_data.
    Additionally, there is no need to assign NULL to PDE->data after creation,
    /proc generic has already done this for us.
    
    Signed-off-by: Denis V. Lunev <den at openvz.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 6e79d85d9a6b7a149dd3666b079c96cfbf57fdb8
Author: Denis V. Lunev <den at openvz.org>
Date:   Fri May 2 02:45:42 2008 -0700

    netfilter: assign PDE->data before gluing PDE into /proc tree
    
    Simply replace proc_create and further data assigned with proc_create_data.
    
    Signed-off-by: Denis V. Lunev <den at openvz.org>
    Acked-by: Patrick McHardy <kaber at trash.net>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit e7fe23363bab0488c7ce09626900e7d621ea2292
Author: Denis V. Lunev <den at openvz.org>
Date:   Fri May 2 02:44:36 2008 -0700

    sunrpc: assign PDE->data before gluing PDE into /proc tree
    
    Simply replace proc_create and further data assigned with proc_create_data.
    
    Signed-off-by: Denis V. Lunev <den at openvz.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 3b5750644b2ffa2a76fdfe7b4e00e4af2ecf3539
Author: Paul Mackerras <paulus at samba.org>
Date:   Fri May 2 14:29:12 2008 +1000

    [POWERPC] Bolt in SLB entry for kernel stack on secondary cpus
    
    This fixes a regression reported by Kamalesh Bulabel where a POWER4
    machine would crash because of an SLB miss at a point where the SLB
    miss exception was unrecoverable.  This regression is tracked at:
    
    http://bugzilla.kernel.org/show_bug.cgi?id=10082
    
    SLB misses at such points shouldn't happen because the kernel stack is
    the only memory accessed other than things in the first segment of the
    linear mapping (which is mapped at all times by entry 0 of the SLB).
    The context switch code ensures that SLB entry 2 covers the kernel
    stack, if it is not already covered by entry 0.  None of entries 0
    to 2 are ever replaced by the SLB miss handler.
    
    Where this went wrong is that the context switch code assumes it
    doesn't have to write to SLB entry 2 if the new kernel stack is in the
    same segment as the old kernel stack, since entry 2 should already be
    correct.  However, when we start up a secondary cpu, it calls
    slb_initialize, which doesn't set up entry 2.  This is correct for
    the boot cpu, where we will be using a stack in the kernel BSS at this
    point (i.e. init_thread_union), but not necessarily for secondary
    cpus, whose initial stack can be allocated anywhere.  This doesn't
    cause any immediate problem since the SLB miss handler will just
    create an SLB entry somewhere else to cover the initial stack.
    
    In fact it's possible for the cpu to go quite a long time without SLB
    entry 2 being valid.  Eventually, though, the entry created by the SLB
    miss handler will get overwritten by some other entry, and if the next
    access to the stack is at an unrecoverable point, we get the crash.
    
    This fixes the problem by making slb_initialize create a suitable
    entry for the kernel stack, if we are on a secondary cpu and the stack
    isn't covered by SLB entry 0.  This requires initializing the
    get_paca()->kstack field earlier, so I do that in smp_create_idle
    where the current field is initialized.  This also abstracts a bit of
    the computation that mk_esid_data in slb.c does so that it can be used
    in slb_initialize.
    
    Signed-off-by: Paul Mackerras <paulus at samba.org>

commit d9f2f3f537acb8aa04280509b2eed50c855fd3ef
Author: Geoff Levand <geoffrey.levand at am.sony.com>
Date:   Thu May 1 08:25:36 2008 +1000

    [POWERPC] PS3: Update ps3_defconfig
    
    Update ps3_defconfig.
    
    Signed-off-by: Geoff Levand <geoffrey.levand at am.sony.com>
    Signed-off-by: Paul Mackerras <paulus at samba.org>

commit 5442381cdd311633d18f8bb52a66ede2d0fa502c
Author: Geoff Levand <geoffrey.levand at am.sony.com>
Date:   Thu May 1 08:25:30 2008 +1000

    [POWERPC] PS3: Remove unsupported wakeup sources
    
    Other OS wakeup is not supported from the IR controller,
    the bluetooth controller nor the RTC.  Remove references
    to these in the PS3 sys-manager source.
    
    Signed-off-by: Geoff Levand <geoffrey.levand at am.sony.com>
    Signed-off-by: Paul Mackerras <paulus at samba.org>

commit fdedb4caea36cfc00571928a727ac87906037712
Author: Geert Uytterhoeven <Geert.Uytterhoeven at sonycom.com>
Date:   Thu May 1 08:25:18 2008 +1000

    [POWERPC] PS3: Make ps3_virq_setup and ps3_virq_destroy static
    
    The routines ps3_virq_setup() and ps3_virq_destroy() are used
    in only one file, so make them static.
    
    Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven at sonycom.com>
    Signed-off-by: Geoff Levand <geoffrey.levand at am.sony.com>
    Signed-off-by: Paul Mackerras <paulus at samba.org>

commit 483d8876f75aa5707a646442377051f1b90db206
Author: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Date:   Thu May 1 08:25:09 2008 +1000

    [POWERPC] PS3: Add time include to lpm
    
    Add an include <asm/time.h> statement for get_tb().
    
    Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
    Signed-off-by: Geoff Levand <geoffrey.levand at am.sony.com>
    Signed-off-by: Paul Mackerras <paulus at samba.org>

commit bbea34606269efedf7d12c608924b47bafb344f5
Author: Geoff Levand <geoffrey.levand at am.sony.com>
Date:   Thu May 1 08:24:58 2008 +1000

    [POWERPC] Fix slb.c compile warnings
    
    Arrange for a syntax check to always be done on the powerpc/mm/slb.c
    DBG() macro by defining it to pr_debug() for non-debug builds.
    
    Also, fix these related compile warnings:
    
      slb.c:273: warning: format '%04x' expects type 'unsigned int', but argument 2 has type 'long unsigned int
      slb.c:274: warning: format '%04x' expects type 'unsigned int', but argument 2 has type 'long unsigned int'
    
    Signed-off-by: Geoff Levand <geoffrey.levand at am.sony.com>
    Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
    Signed-off-by: Paul Mackerras <paulus at samba.org>

commit 5be661a28b12aa43cc83ba935ba2b2c273d0da45
Merge: fbe543b412cef02350fab35526a6d4dc3d20d182 b17b8181c97e88e6fac5aa704879ad61fdd67351
Author: Paul Mackerras <paulus at samba.org>
Date:   Fri May 2 14:45:50 2008 +1000

    Merge branch 'powerpc-next' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc

commit b17b8181c97e88e6fac5aa704879ad61fdd67351
Author: Kumar Gala <galak at kernel.crashing.org>
Date:   Wed Apr 30 10:24:44 2008 -0500

    [POWERPC] Xilinx: Fix compile warnings
    
    arch/powerpc/sysdev/xilinx_intc.c: In function 'xilinx_intc_init':
    arch/powerpc/sysdev/xilinx_intc.c:111: warning: format '%08X' expects type 'unsigned int', but argument 2 has type 'resource_size_t'
    drivers/char/xilinx_hwicap/xilinx_hwicap.c: In function 'hwicap_setup':
    drivers/char/xilinx_hwicap/xilinx_hwicap.c:626: warning: cast to pointer from integer of different size
    drivers/char/xilinx_hwicap/xilinx_hwicap.c:646: warning: format '%x' expects type 'unsigned int', but argument 6 has type 'resource_size_t'
    
    Signed-off-by: Kumar Gala <galak at kernel.crashing.org>

commit 128cf7f2eb952a85875834c0d274da05ee0f02aa
Author: Becky Bruce <bgill at freescale.com>
Date:   Thu May 1 18:15:45 2008 -0500

    [POWERPC] Squash build warning for print of resource_size_t in fsl_soc.c
    
    When resource_size_t is larger than an int, the current code
    generates a build warning.  Kill it.
    
    Signed-off-by: Becky Bruce <becky.bruce at freescale.com>
    Signed-off-by: Kumar Gala <galak at kernel.crashing.org>

commit 9941d945f491320bc121d86c558b1288ac0ad6ca
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date:   Wed Apr 30 16:45:58 2008 -0700

    [RAPIDIO] fix current kernel-doc notation
    
    Fix current (-git16) missing docbook/kernel-doc notation in RapidIO files.
    
    Warning(linux-2.6.25-git16//include/linux/rio.h:187): No description found for parameter 'sys_size'
    Warning(linux-2.6.25-git16//include/linux/rio.h:187): No description found for parameter 'phy_type'
    
    Warning(linux-2.6.25-git16//arch/powerpc/sysdev/fsl_rio.c:188): No description found for parameter 'mport'
    Warning(linux-2.6.25-git16//arch/powerpc/sysdev/fsl_rio.c:224): No description found for parameter 'mport'
    Warning(linux-2.6.25-git16//arch/powerpc/sysdev/fsl_rio.c:245): No description found for parameter 'mport'
    Warning(linux-2.6.25-git16//arch/powerpc/sysdev/fsl_rio.c:270): No description found for parameter 'mport'
    Warning(linux-2.6.25-git16//arch/powerpc/sysdev/fsl_rio.c:311): No description found for parameter 'mport'
    Warning(linux-2.6.25-git16//arch/powerpc/sysdev/fsl_rio.c:996): No description found for parameter 'dev'
    
    Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
    Signed-off-by: Kumar Gala <galak at kernel.crashing.org>

commit e598477a3a9679bd04565ef2be20cc985b8954ae
Author: Anton Vorontsov <avorontsov at ru.mvista.com>
Date:   Tue Apr 29 20:41:12 2008 +0400

    [POWERPC] 86xx: mpc8610_hpcd: add support for PCI Express x8 slot
    
    This patch adds pcie node which is resposible for PCI-E x8 slot
    functioning. Though, this was tested using only x1 SKY2 NIC.
    
    Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
    Signed-off-by: Kumar Gala <galak at kernel.crashing.org>

commit fb65f180e02dde224af256b43d3ab2c28b9689d7
Merge: ab59859de1946a098b091308380179e92dc7683b 61c2b682b8391f13b67e2d95990a0aba34697d9c
Author: David S. Miller <davem at davemloft.net>
Date:   Thu May 1 16:04:59 2008 -0700

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

commit 61c2b682b8391f13b67e2d95990a0aba34697d9c
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date:   Mon Apr 21 19:01:09 2008 +0200

    rt2x00: Fix quality/activity led handling
    
    There was an obvious typo in LED structure
    initialization which caused the radio and quality/activity
    leds to be incorrectly initialized which resulted in
    the leds not being enabled.
    
    Additionally add the rt2x00led_led_activity() handler
    that will enable TX/RX activity leds when the radio
    is being enabled.
    
    Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 44a9809b97ec5acd1c549c3120bdd35613897d7c
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date:   Mon Apr 21 19:00:17 2008 +0200

    rt2x00: Don't enable short preamble for 1MBs
    
    The timing settings for 1MBs should exclude
    the short preamble bit since that only applies
    to 2MBs, 5.5MBs and 11MBs.
    
    Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 2218228392080f0ca2fc2974604e79f57b12c436
Author: Kirill A. Shutemov <kirill at shutemov.name>
Date:   Tue Apr 22 16:38:55 2008 +0300

    Make linux/wireless.h be able to compile
    
    Signed-off-by: Kirill A. Shutemov <kirill at shutemov.name>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 786b4557075ae0d8a23e73c316dc4204b41ccb4d
Author: Bill Moss <bmoss at clemson.edu>
Date:   Thu Apr 17 16:03:40 2008 -0700

    iwlwifi: fix debug messages during scanning
    
    direct_mask will be set when we are not associated and requesting a
    direct scan. The second debug print will be confusing as priv->essid
    is not set at that time and it will thus print "<hidden>" while it is
    known to which AP a direct scan is requested - as previous debug message
    also indicates.
    
    Now make all debugging consistent.
    
    Signed-off-by: Bill Moss <bmoss at clemson.edu>
    Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit f52764886540b16e7962bd1d150bd939aec9248c
Author: Guy Cohen <guy.cohen at intel.com>
Date:   Mon Apr 21 15:41:57 2008 -0700

    iwlwifi: fix current channel is not scanned
    
    All channels should be scanned, including the current channel
    when the client is associated.
    
    Removed also unused flag to scan only active channels.
    
    Signed-off-by: Guy Cohen <guy.cohen at intel.com>
    Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
    Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 21a75d7788f4e29b6c6d28e08f9f0310c4de828d
Author: Michael Buesch <mb at bu3sch.de>
Date:   Fri Apr 25 19:29:08 2008 +0200

    b43: Fix some TX/RX locking issues
    
    This fixes some TX/RX related locking issues.
    With this patch applied, some of the PHY transmission errors are fixed.
    
    Signed-off-by: Michael Buesch <mb at bu3sch.de>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit f8e811b98935f702b48abc92563462a15c226eb8
Author: Al Viro <viro at ftp.linux.org.uk>
Date:   Thu May 1 14:36:36 2008 -0700

    [IA64] fix file and descriptor handling in perfmon
    
    Races galore...  General rule: as soon as it's in descriptor table,
    it's over; another thread might have started IO on it/dup2() it
    elsewhere/dup2() something *over* it/etc.  fd_install() is the very
    last step one should take - it's a point of no return.
    
    Besides, the damn thing leaked on failure exits...
    
    Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
    Signed-off-by: Tony Luck <tony.luck at intel.com>

commit 848376c774a941c29e4fa083d96d84a5f2190857
Author: Roland McGrath <roland at redhat.com>
Date:   Wed Apr 30 14:40:14 2008 -0700

    [IA64] TS_RESTORE_SIGMASK
    
    Replace TIF_RESTORE_SIGMASK with TS_RESTORE_SIGMASK and define
    our own set_restore_sigmask() function.  This saves the costly
    SMP-safe set_bit operation, which we do not need for the sigmask
    flag since TIF_SIGPENDING always has to be set too.
    
    Signed-off-by: Roland McGrath <roland at redhat.com>
    Signed-off-by: Tony Luck <tony.luck at intel.com>

commit c0cd661b1b0ad83dac54420169ec9ca14df409e9
Author: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Date:   Wed Apr 30 18:55:48 2008 +0900

    [IA64] smp.c coding style fix
    
    Fix indenting of switch statement to follow CodingStyle, and
    pull out handling of call_data into an inlined function.
    
    I confirmed that applying this fix doesn't affect assembled code.
    
    Signed-off-by: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
    Signed-off-by: Tony Luck <tony.luck at intel.com>

commit f6acb63508700b5f8cd817082b62c96ba907775e
Author: Christoph Lameter <clameter at sgi.com>
Date:   Tue Apr 29 16:16:06 2008 -0700

    slub: #ifdef simplification
    
    If we make SLUB_DEBUG depend on SYSFS then we can simplify some
    #ifdefs and avoid others.
    
    Signed-off-by: Christoph Lameter <clameter at sgi.com>
    Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi>

commit f715e6f15ee167026581a8a2e09b2ed644b974aa
Author: Christoph Lameter <clameter at sgi.com>
Date:   Tue Apr 29 16:14:46 2008 -0700

    slabinfo: Support printout of the number of fallbacks
    
    Add functionality to slabinfo to print out the number of fallbacks
    that have occurred for each slab cache when the -D option is specified.
    Also widen the allocation / free field since the numbers became
    too big after a week.
    
    Signed-off-by: Christoph Lameter <clameter at sgi.com>
    Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi>

commit 0121c619d03820d965745e56f80f6eb5994533fe
Author: Christoph Lameter <clameter at sgi.com>
Date:   Tue Apr 29 16:11:12 2008 -0700

    slub: Whitespace cleanup and use of strict_strtoul
    
    Fix some issues with wrapping and use strict_strtoul to make parameter
    passing from sysfs safer.
    
    Signed-off-by: Christoph Lameter <clameter at sgi.com>
    Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi>

commit 886c35fbcf6fb2eee15687efc2d64d99b6ad9a4a
Merge: 6ed7b6a05dc4332c391134809387220123e82ea7 f32ddaddf95d8a30be5a41cf681bc8792bc42ec7
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu May 1 11:31:38 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: fw-sbp2: log scsi_target ID at release
      ieee1394: fix NULL pointer dereference in sysfs access

commit 6ed7b6a05dc4332c391134809387220123e82ea7
Merge: 2c4aabcca847ac4c92aa5e960c3f6053e1051b62 90ebd878a5900839106664fae40a6cc83dbe86ab
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu May 1 11:31:24 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-linus
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-linus:
      kbuild: fix vmlinux.o link
      kconfig: made check-lxdialog more portable

commit 2c4aabcca847ac4c92aa5e960c3f6053e1051b62
Merge: bcf35afb528109a31264b45d4851fa6ae72dbe18 a98889f3d8882995b5aa2255b931cf0202325cc0
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu May 1 11:15:28 2008 -0700

    Merge git://git.infradead.org/mtd-2.6
    
    * git://git.infradead.org/mtd-2.6:
      [MTD][NOR] Add physical address to point() method
      [JFFS2] Track parent inode for directories (for NFS export)
      [JFFS2] Invert last argument of jffs2_gc_fetch_inode(), make it boolean.
      [JFFS2] Quiet lockdep false positive.
      [JFFS2] Clean up jffs2_alloc_inode() and jffs2_i_init_once()
      [MTD] Delete long-unused jedec.h header file.
      [MTD] [NAND] at91_nand: use at91_nand_{en,dis}able consistently.

commit fbe543b412cef02350fab35526a6d4dc3d20d182
Author: Andrew Liu <shengping.liu at windriver.com>
Date:   Tue Apr 29 17:36:25 2008 +1000

    Fix a potential issue in mpc52xx uart driver
    
    mpc52xx_uart_int and __uart_put_char both try to acquire the
    port->lock. Therefore the function sequence of:
    
    mpc52xx_uart_int--> ...-->flush_to_ldisc-->...-->__uart_put_char
    
    can potentially trigger a deadlock. To avoid this deadlock a fix
    similar to that found in the 8250.c serial driver is applied. The
    deadlock is avoided by releasing the lock before pushing a buffer
    and reacquiring it when completed.
    
    Signed-off-by: Andrew Liu <shengping.liu at windriver.com>
    Signed-off-by: Grant Likely <grant.likely at secretlab.ca>

commit a98889f3d8882995b5aa2255b931cf0202325cc0
Author: Jared Hulbert <jaredeh at gmail.com>
Date:   Tue Apr 29 23:26:49 2008 -0700

    [MTD][NOR] Add physical address to point() method
    
    Adding the ability to get a physical address from point() in addition
    to virtual address.  This physical address is required for XIP of
    userspace code from flash.
    
    Signed-off-by: Jared Hulbert <jaredeh at gmail.com>
    Reviewed-by: Jörn Engel <joern at logfs.org>
    Acked-by: Nicolas Pitre <nico at cam.org>
    Acked-by: Greg Ungerer <gerg at uclinux.org>
    Signed-off-by: David Woodhouse <dwmw2 at infradead.org>

commit f32ddaddf95d8a30be5a41cf681bc8792bc42ec7
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date:   Thu Apr 24 23:17:47 2008 +0200

    firewire: fw-sbp2: log scsi_target ID at release
    
    Makes the good-by message more informative.
    
    Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
    Signed-off-by: Jarod Wilson <jwilson at redhat.com>

commit 07c7224cf74c3977c69c7c9a0b0fba264f2df36a
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date:   Thu May 1 10:43:04 2008 +0200

    ieee1394: fix NULL pointer dereference in sysfs access
    
    Regression since "ieee1394: prevent device binding of raw1394,
    video1394, dv1394", commit d2ace29fa44589da51fedc06a67b3f05301f3bfd:
    $ cat /sys/bus/ieee1394/drivers/raw1394/device_ids
    triggers a NULL pointer dereference in fw_show_drv_device_ids.
    Reported by Miles Lane.
    
    Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
    Tested-by: Miles Lane <miles.lane at gmail.com>

commit 27c72b040c0be8f3704ed0b6b84c12cbba24a7e8
Author: David Woodhouse <dwmw2 at infradead.org>
Date:   Thu May 1 18:47:17 2008 +0100

    [JFFS2] Track parent inode for directories (for NFS export)
    
    To support NFS export, we need to know the parent inode of directories.
    Rather than growing the jffs2_inode_cache structure, share space with
    the nlink field -- which was always set to 1 for directories anyway.
    
    Signed-off-by: David Woodhouse <dwmw2 at infradead.org>

commit 90ebd878a5900839106664fae40a6cc83dbe86ab
Author: Sam Ravnborg <sam at uranus.ravnborg.org>
Date:   Thu May 1 19:31:35 2008 +0200

    kbuild: fix vmlinux.o link
    
    We always linked vmliux.o.
    Remove init/built-in.o dependency so we avoid this
    
    Signed-off-by: Sam Ravnborg <sam at ravnborg.org>

commit b44158de9e318fbc92ac6c665ad3d0c948e80ac3
Author: Sam Ravnborg <sam at uranus.ravnborg.org>
Date:   Thu May 1 19:29:47 2008 +0200

    kconfig: made check-lxdialog more portable
    
    OS-X shell did not like 'echo -e' so implement
    suggestion from Al Viro to use a more portable construct.
    
    Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
    Cc: Al Viro <viro at ZenIV.linux.org.uk>
    Acked-By: Timur Tabi <timur at freescale.com>

commit bcf35afb528109a31264b45d4851fa6ae72dbe18
Author: Christoph Hellwig <hch at lst.de>
Date:   Thu May 1 18:43:12 2008 +0200

    make generic sys_ptrace unconditional
    
    With s390 the last arch switched to the generic sys_ptrace yesterday so
    we can now kill the ifdef around it to enforce every new port it using
    it instead of introducing new weirdo versions.
    
    Signed-off-by: Christoph Hellwig <hch at lst.de>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 5c598b3428c372a1209597cee99a70da20625876
Author: Al Viro <viro at zeniv.linux.org.uk>
Date:   Sun Apr 27 20:04:15 2008 -0400

    [PATCH] fix sysctl_nr_open bugs
    
    * if luser with root sets it to something that is not a multiple of
      BITS_PER_LONG, the system is screwed.
    * if it gets decreased at the wrong time, we can get expand_files()
      returning success and _not_ increasing the size of table as asked.
    
    Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>

commit 2030a42cecd4dd1985a2ab03e25f3cd6106a5ca8
Author: Al Viro <viro at zeniv.linux.org.uk>
Date:   Sat Feb 23 06:46:49 2008 -0500

    [PATCH] sanitize anon_inode_getfd()
    
    a) none of the callers even looks at inode or file returned by anon_inode_getfd()
    b) any caller that would try to look at those would be racy, since by the time
    it returns we might have raced with close() from another thread and that
    file would be pining for fjords.
    
    Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>

commit 9f3acc3140444a900ab280de942291959f0f615d
Author: Al Viro <viro at zeniv.linux.org.uk>
Date:   Thu Apr 24 07:44:08 2008 -0400

    [PATCH] split linux/file.h
    
    Initial splitoff of the low-level stuff; taken to fdtable.h
    
    Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>

commit a2dcb44c3c5a8151d2d9f6ac8ad0789efcdbe184
Author: Al Viro <viro at zeniv.linux.org.uk>
Date:   Wed Apr 23 14:05:15 2008 -0400

    [PATCH] make osf_select() use core_sys_select()
    
    ... instead of open-coding it
    
    Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>

commit bf7da7bcfb38409b4cdea34b0905bdf344f1b36d
Author: Al Viro <viro at zeniv.linux.org.uk>
Date:   Wed Apr 23 00:49:25 2008 -0400

    [PATCH] remove horrors with irix tty ioctls handling
    
    Existing code in there (get_tty(), etc.) is both severely
    racy *and* pointless: ioctls in question have Linux equivalents
    and there's no need to play silly buggers in irix_ioctl() -
    just need to replace arguments and, in case of TIOCGSID,
    deal with API differences - Linux one expects pid_t __user *
    while Irix one does unsigned long __user *.  BFD...
    
    Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>

commit 74d92abc6143b124db03f0d341f02bde72fba6f5
Author: Al Viro <viro at zeniv.linux.org.uk>
Date:   Tue Apr 22 19:46:10 2008 -0400

    [PATCH] fix file and descriptor handling in perfmon
    
    Races galore...  General rule: as soon as it's in descriptor table,
    it's over; another thread might have started IO on it/dup2() it
    elsewhere/dup2() something *over* it/etc.  fd_install() is the very
    last step one should take - it's a point of no return.
    
    Besides, the damn thing leaked on failure exits...
    
    Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>

commit 80791be11145f7dd7f68c84741fc66e5164b7353
Author: Grant Likely <grant.likely at secretlab.ca>
Date:   Thu May 1 11:05:58 2008 -0600

    [POWERPC] mpc5200: Allow for fixed speed MII configurations
    
    Various improvements for configuring the MPC5200 MII link from the
    device tree:
    * Look for 'current-speed' property for fixed speed MII links
    * Look for 'fsl,7-wire-mode' property for boards using the 7 wire mode
    * move definition of private data structure out of the header file
    
    Signed-off-by: Grant Likely <grant.likely at secretlab.ca>
    Acked-by: Wolfgang Grandegger <wg at grandegger.com>

commit 1b690b48786229571e590dd22fe01ecc22a8746b
Author: David Woodhouse <dwmw2 at infradead.org>
Date:   Thu May 1 16:59:24 2008 +0100

    [JFFS2] Invert last argument of jffs2_gc_fetch_inode(), make it boolean.
    
    We don't actually care about nlink; we only care whether the inode in
    question is unlinked or not.
    
    Signed-off-by: David Woodhouse <dwmw2 at infradead.org>

commit 9fc3ace937a675bf42cbe6e6ef8950a6731ca16f
Merge: c92758ceda477b1333fde35327cfa867dcc47bd1 23f8e4bf7cf0e2125b6d798cc85c031951c763d3
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu May 1 08:45:19 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:
      ide: fix early setup of hwif->host_flags

commit c92758ceda477b1333fde35327cfa867dcc47bd1
Merge: 03fc922f4085a0139f313831fe2dc6fed467cd2d 4f02f8220562591322c118d07a32bebf705318b7
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu May 1 08:28:26 2008 -0700

    Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6
    
    * 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6:
      hwmon: (adt7473) minor cleanup / refactoring
      hwmon: (asb100) Remove some dead code
      hwmon: (lm75) Fix an incorrect comment
      hwmon: (w83793) VID and VRM handling cleanups
      hwmon: (w83l785ts) Don't ask the user to report failures
      hwmon: (smsc47b397) add a new chip id (0x8c)

commit 03fc922f4085a0139f313831fe2dc6fed467cd2d
Merge: a0be7522b25f17ac2c3964a24b88b5fe7c9404b8 df4b565e1fbc777bb6e274378a41fa8ff7485680
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu May 1 08:26:56 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:
      module: add MODULE_STATE_GOING notifier call
      module: Enhance verify_export_symbols
      module: set unused_gpl_crcs instead of overwriting unused_crcs
      module: neaten __find_symbol, rename to find_symbol
      module: reduce module image and resident size
      module: make module_sect_attrs private to kernel/module.c

commit a0be7522b25f17ac2c3964a24b88b5fe7c9404b8
Merge: 3b2b74cad34e7a0cf6d4929ee9e8ad4e11a84867 b1145ce395f7785487c128fe8faf8624e6586d84
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Thu May 1 08:15:36 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] cryptd: Correct kzalloc error test
      [CRYPTO] eseqiv: Fix off-by-one encryption
      [CRYPTO] api: Fix scatterwalk_sg_chain
      [CRYPTO] authenc: Fix async crypto crash in crypto_authenc_genicv()

commit 3b2b74cad34e7a0cf6d4929ee9e8ad4e11a84867
Author: Sebastian Siewior <bigeasy at linutronix.de>
Date:   Thu May 1 14:08:12 2008 +1000

    m68knommu: fix FEC driver locking
    
    It's easy: grab locks before talking to hardware and realease
    them afterwards. The one big lock has been splitted into a hw_lock
    and mii_lock.
    
    Signed-off-by: Sebastian Siewior <bigeasy at linutronix.de>
    Signed-off-by: Greg Ungerer <gerg at uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit c1d9615680c3f43a305b1f66dff0f933d5079273
Author: Sebastian Siewior <bigeasy at linutronix.de>
Date:   Thu May 1 14:04:02 2008 +1000

    m68knommu: kill warnings in FEC driver
    
    linux-2.6-mk68/drivers/net/fec.c: In function 'fec_enet_module_init':
    linux-2.6-mk68/drivers/net/fec.c:2627: warning: unused variable 'j'
    linux-2.6-mk68/drivers/net/fec.c: At top level:
    linux-2.6-mk68/drivers/net/fec.c:2136: warning: 'mii_link_interrupt' defined but not used
    
    Signed-off-by: Sebastian Siewior <bigeasy at linutronix.de>
    Signed-off-by: Greg Ungerer <gerg at uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 398ec922b9cd5fdec26d2ca75b9389bed2432557
Author: Greg Ungerer <gerg at snapgear.com>
Date:   Thu May 1 13:47:09 2008 +1000

    m68knommu: remove unused interrupts in FEC driver
    
    Remove the acquisition of unused interrupt types. We don't need to
    register all the TX and RX varients used on some ColdFire FEC hardware.
    
    Signed-off-by: Greg Ungerer <gerg at uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit cc462f7df0a78df568fd4e1d19f0874476f3c002
Author: Greg Ungerer <gerg at snapgear.com>
Date:   Thu May 1 13:35:34 2008 +1000

    m68knommu: fix ColdFire 5272 fec driver hash registers
    
    Renamed the 5272 hash_table registers to match the "grp" hash_table
    registers of the other ColdFire parts. They are actually a group hash.
    The makes for consistent setup across all ColdFire parts.
    
    Signed-off-by: Greg Ungerer <gerg at uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 6c5a7d504fb0e27aa90b96267177d434642a393d
Author: Sebastian Siewior <bigeasy at linutronix.de>
Date:   Thu May 1 12:17:49 2008 +1000

    m68knommu: fix compare race in sched related code
    
    The interrupts must be disabled before considering the need resched
    bit of the task struct and they have to be disabled before calling
    schedule()
    
    Signed-off-by: Sebastian Siewior <bigeasy at linutronix.de>
    Signed-off-by: Greg Ungerer <gerg at uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 0042a1f7ecbc5d40eb2164f375ec87ecf3494418
Author: Greg Ungerer <gerg at snapgear.com>
Date:   Thu May 1 12:17:41 2008 +1000

    m68knommu: rework definition of HZ
    
    Rework the HZ definition to be more consistent with other architectures.
    Non-kernel includers will see a constant HZ setting of 100.
    
    Signed-off-by: Greg Ungerer <gerg at uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 6cca49173198e1666cb9852649f66e1dba99d88a
Author: Sebastian Siewior <bigeasy at linutronix.de>
Date:   Thu May 1 12:17:36 2008 +1000

    m68knommu: update MAX_M68K_DMA_CHANNELS for some plattforms
    
    include/asm-m68knommu/mcfdma.h defines base0-3 for M523x,
    M527x and M528x so it looks this has been forgotten.
    
    Signed-off-by: Sebastian Siewior <bigeasy at linutronix.de>
    Signed-off-by: Greg Ungerer <gerg at uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit cff28b56bdafd314836f4193b638b88d9b3cb5b1
Author: Greg Ungerer <gerg at snapgear.com>
Date:   Thu May 1 12:17:21 2008 +1000

    m68knommu: remove unused CONFIG_DISKtel
    
    Remove unused CONFIG_DISKtel support.
    Missing config definition pointed out by
    Robert P. J. Day <rpjday at mindspring.com>
    
    Signed-off-by: Greg Ungerer <gerg at uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 188a9a4841c9b4a56cdd9b58761a882db4873f0c
Author: Steve Bennett <steveb at workware.net.au>
Date:   Thu May 1 12:17:08 2008 +1000

    m68knommu: add WilFire and WildfireMod board support
    
    This patch adds linux-2.6.x kernel support for the Intec Automation
    ColdFire 5282-based boards, the WildFire and WildFireMod
    
    Signed-Off-By: Steve Bennett <steveb at workware.net.au>
    Signed-off-by: Greg Ungerer <gerg at uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 653620d6190670a7e2e3a6c7c0a4f78badb0e31f
Author: Greg Ungerer <gerg at snapgear.com>
Date:   Thu May 1 12:17:00 2008 +1000

    m68knommu: remove unused CONFIG_MTD_KeyTechnology
    
    Remove unused board type CONFIG_MTD_KeyTechnology.
    Pointed out by Robert P. J. Day <rpjday at mindspring.com>
    
    Signed-off-by: Greg Ungerer <gerg at uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit d259c329835bc1c17eca1dac7604baaf2d895e73
Author: Greg Ungerer <gerg at snapgear.com>
Date:   Thu May 1 12:16:53 2008 +1000

    m68knommu: fix 5206e UART init function naming
    
    Fix ColdFire 5206e platform UART init function naming.
    
    Signed-off-by: Greg Ungerer <gerg at uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 779125c274446e873f262e24853353eaf0002719
Author: Sebastian Siewior <bigeasy at linutronix.de>
Date:   Thu May 1 12:16:46 2008 +1000

    m68knommu: add some missing sections into the linker script
    
    Add some missing sections into the linker script.
    Those are required for spinlocks & kallsyms.
    
    Signed-off-by: Sebastian Siewior <bigeasy at linutronix.de>
    Signed-off-by: Greg Ungerer <gerg at uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit f6054e2131d8f5d43f6686ecc7687994adecc5a2
Author: Sebastian Siewior <bigeasy at linutronix.de>
Date:   Thu May 1 12:16:38 2008 +1000

    m68knommu: add pretty back strace
    
    With this patch and
     CONFIG_FRAME_POINTER=y
     CONFIG_KALLSYMS=y
    The backtrace shows resolved function names and their numeric
    address.
    
    Signed-off-by: Sebastian Siewior <bigeasy at linutronix.de>
    Signed-off-by: Greg Ungerer <gerg at uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 008150f53729d188a5c14b1a86725972e15fe5f4
Author: Sebastian Siewior <bigeasy at linutronix.de>
Date:   Thu May 1 12:16:33 2008 +1000

    m68knommu: add a missing backslash n in setup code
    
    add a missing backslash n in setup code
    
    Signed-off-by: Sebastian Siewior <bigeasy at linutronix.de>
    Signed-off-by: Greg Ungerer <gerg at uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit a19325a77432338d2710b3ebbe7fd8e6627e81e3
Author: Sebastian Siewior <bigeasy at linutronix.de>
Date:   Thu May 1 12:16:29 2008 +1000

    m68knommu: ColdFire add support for kernel preemption
    
    As the subject says this patch adds the support for kernel preemption
    on m68knommu Coldfire. I thing the same changes could be applied to
    68360 & 68328 but since I don't have the HW for testing, I don't touch it.
    
    Signed-off-by: Sebastian Siewior <bigeasy at linutronix.de>
    Signed-off-by: Greg Ungerer <gerg at uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 2d7f16d6d12682c41fb287ea8261df8e4679f638
Author: Wilson Callan <wcallan at savantav.com>
Date:   Thu May 1 12:16:28 2008 +1000

    m68knommu: fix signal handling return path
    
    The return from software signal handling pushes code on the stack
    that system calls to the kernels cleanup code. This is borrowed
    directly from the m68k linux signal handler.
    
    The rt signal case is not quite right for the restricted instruction
    set of the ColdFire parts. And neither the normal signal case or rt
    signal case properly flushes/pushes the appropriate cache lines.
    
    Rework the return path to just call back through some code fragments
    in the kernel proper (with no MMU in the way we can do this). No
    cache problems, and less code overall.
    
    Original patch submitted by Wilson Callan <wcallan at savantav.com>
    
    Greg fixed the rt signal return path to use the proper system call
    
    Signed-off-by: Greg Ungerer <gerg at uclinux.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 10ed2195bb8aef4358223f07bb00e8cf9b278bf2
Author: Andrew Morton <akpm at linux-foundation.org>
Date:   Thu May 1 04:35:20 2008 -0700

    drivers/scsi/mvsas.c: fix printk warnings
    
    drivers/scsi/mvsas.c: In function `mvs_update_phyinfo':
    drivers/scsi/mvsas.c:2822: warning: long long unsigned int format, u64 arg (arg 5)
    drivers/scsi/mvsas.c:2822: warning: long long unsigned int format, u64 arg (arg 6)
    
    We do not know what type the arch uses to implement u64.
    
    Cc: Ke Wei <kewei at marvell.com>
    Cc: James Bottomley <James.Bottomley at HansenPartnership.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 726792b26b66c41f650e4a0c2f7b9e1fc16473a4
Author: Andrew Morton <akpm at linux-foundation.org>
Date:   Thu May 1 04:35:20 2008 -0700

    drivers/scsi/ncr53c8xx.c: fix warning
    
    drivers/scsi/ncr53c8xx.c: In function 'process_waiting_list':
    drivers/scsi/ncr53c8xx.c:8225: warning: suggest parentheses around assignment used as truth value
    
    recently added by
    
    commit 172c122df5186e7cbd413d61757ff90267331002
    Author: Harvey Harrison <harvey.harrison at gmail.com>
    Date:   Mon Apr 28 16:50:03 2008 -0700
    
        scsi: fix integer as NULL pointer warnings
    
    Cc: James Bottomley <James.Bottomley at HansenPartnership.com>
    Cc: Harvey Harrison <harvey.harrison at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 5098021e1ed91388ab7f3984650e95a5584450c3
Author: Andrew Morton <akpm at linux-foundation.org>
Date:   Thu May 1 04:35:19 2008 -0700

    drivers-char-synclinkc-inbreak-mgsl_put_char-fix
    
    Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
    Cc: Jiri Slaby <jirislaby at gmail.com>
    Cc: Paul Fulghum <paulkf at microgate.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 076482307ff1acfe88d5ad1a3fbfbac5cc8d7ad4
Author: Andrew Morton <akpm at linux-foundation.org>
Date:   Thu May 1 04:35:18 2008 -0700

    drivers/char/synclink.c: unbreak mgsl_put_char()
    
    Repair the effects of
    
    commit 55da77899c1472d83452c914fa179d00ea96df65
    Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
    Date:   Wed Apr 30 00:54:07 2008 -0700
    
        synclink series: switch to int put_char method
    
        Signed-off-by: Alan Cox <alan at redhat.com>
        Cc: Paul Fulghum <paulkf at microgate.com>
        Cc: Jiri Slaby <jirislaby at gmail.com>
    
    drivers/char/synclink_gt.c: In function 'put_char':
    drivers/char/synclink_gt.c:919: warning: 'ret' may be used uninitialized in this function
    
    and do some whitespace repair and unneeded-cast-removal in there as well.
    
    Cc: Paul Fulghum <paulkf at microgate.com>
    Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
    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 24c03d47d0481ed7b172b398f6c9b7ca1fafb9fa
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Thu May 1 04:35:17 2008 -0700

    block: remove remaining __FUNCTION__ occurrences
    
    __FUNCTION__ is gcc specific, use __func__
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Cc: Jens Axboe <jens.axboe at oracle.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit e37d05dad7ff9744efd8ea95a70d389e9a65a6fc
Author: Mike Travis <travis at sgi.com>
Date:   Thu May 1 04:35:16 2008 -0700

    cpu: change cpu_sys_devices from array to per_cpu variable
    
    Change cpu_sys_devices from array to per_cpu variable in drivers/base/cpu.c.
    
    Signed-off-by: Mike Travis <travis at sgi.com>
    Cc: Ashok Raj <ashok.raj at intel.com>
    Cc: Vivek Goyal <vgoyal at in.ibm.com>
    Cc: Greg Kroah-Hartman <gregkh at suse.de>
    Cc: Suresh Siddha <suresh.b.siddha at intel.com>
    Cc: Kay Sievers <kay.sievers at vrfy.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit bd7309677c937bf23296f6c81027123c84c5cc5c
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Thu May 1 04:35:15 2008 -0700

    fuse: use clamp() rather than nested min/max
    
    clamp() exists for this use.
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Cc: Miklos Szeredi <miklos at szeredi.hu>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 3dfcf9c4bf1fda4aa75861bcf6c50607dd322fe5
Author: Denis V. Lunev <den at openvz.org>
Date:   Thu May 1 04:35:14 2008 -0700

    cciss: assign PDE->data before gluing PDE into /proc tree
    
    Simply replace proc_create and further data assigned with proc_create_data.
    
    Signed-off-by: Denis V. Lunev <den at openvz.org>
    Cc: Alexey Dobriyan <adobriyan at openvz.org>
    Cc: Eric W. Biederman <ebiederm at xmission.com>
    Acked-by: Mike Miller <mike.miller at hp.com>
    Cc: Greg Kroah-Hartman <gregkh at suse.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 8a3e77cc212f3bc8eccc95e0d046405cf2a02764
Author: Andrew Liu <shengping.liu at windriver.com>
Date:   Thu May 1 04:35:14 2008 -0700

    workqueue: remove redundant function invocation
    
    timer_stats_timer_set_start_info is invoked twice, additionally, the
    invocation of this function can be moved to where it is only called when a
    delay is really required.
    
    Signed-off-by: Andrew Liu <shengping.liu at windriver.com>
    Cc: Pavel Machek <pavel at ucw.cz>
    Cc: Ingo Molnar <mingo at elte.hu>
    Cc: Oleg Nesterov <oleg at tv-sign.ru>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 55e462b05b5df4fd113c4a304c4f487d44b0898e
Author: Balaji Rao <balajirrao at gmail.com>
Date:   Thu May 1 04:35:12 2008 -0700

    memcg: simple stats for memory resource controller
    
    Implement trivial statistics for the memory resource controller.
    
    Signed-off-by: Balaji Rao <balajirrao at gmail.com>
    Acked-by: Balbir Singh <balbir at linux.vnet.ibm.com>
    Cc: Dhaval Giani <dhaval at linux.vnet.ibm.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit f39e578172f30d3bdd4533465c7ec00db738eb9d
Author: Will Newton <will.newton at gmail.com>
Date:   Thu May 1 04:35:10 2008 -0700

    gpio: pca953x: add support for pca9555 I2C I/O expander
    
    Add support for pca9555 I2C I/O expander.  As the comment suggests this part
    is software compatible with the pca9539.
    
    Signed-off-by: Will Newton <will.newton at imgtec.com>
    Cc: "eric miao" <eric.miao at marvell.com>
    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 868eb7a8539d3e8c494209be2b1f4084a274dfef
Author: Jan Blunck <jblunck at suse.de>
Date:   Thu May 1 04:35:10 2008 -0700

    autofs: path_{get,put}() cleanups
    
    Here are some more places where path_{get,put}() can be used instead of
    dput()/mntput() pair.  Besides that it fixes a bug in autofs4_mount_busy()
    where mntput() was called before dput().
    
    Signed-off-by: Jan Blunck <jblunck at suse.de>
    Cc: Ian Kent <raven at themaw.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 9d2de6ad2a78bb8b60bf7a54e6043dca44e9a801
Author: Jeff Moyer <jmoyer at redhat.com>
Date:   Thu May 1 04:35:09 2008 -0700

    autofs4: fix incorrect return from root.c:try_to_fill_dentry()
    
    Jeff Moyer has identified a case where the autofs4 function
    root.c:try_to_fill_dentry() can return -EBUSY when it should return 0.
    
    Jeff's description of the way this happens is:
    
    "automount starts an expire for directory d.  after the callout to the daemon,
    but before the rmdir, another process tries to walk into the same directory.
    It puts itself onto the waitq, pending the expiration.
    
    When the expire finishes, the second process is woken up.  In
    try_to_fill_dentry, it does this check:
    
                    status = d_invalidate(dentry);
                    if (status != -EBUSY)
                            return -EAGAIN;
    
    And status is EBUSY.  The dentry still has a non-zero d_inode, and the
    flags do not contain LOOKUP_CONTINUE or LOOKUP_DIRECTORY
    
    So, we fall through and return -EBUSY to the caller."
    
    Signed-off-by: Jeff Moyer <jmoyer at redhat.com>
    Signed-off-by: Ian Kent <raven at themaw.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 033790449ba9c4dcf8478a87693d33df625c23b5
Author: Jeff Moyer <jmoyer at redhat.com>
Date:   Thu May 1 04:35:08 2008 -0700

    autofs4: fix execution order race in mount request code
    
    Jeff Moyer has identified a race in due to an execution order dependency
    in the autofs4 function root.c:try_to_fill_dentry().
    
    Jeff's description of this race is:
    
    "P1 does a lookup of /mount/submount/foo.  Since the VFS can't find an entry
    for "foo" under /mount/submount, it calls into the autofs4 kernel module to
    allocate a new dentry, D1.  The kernel creates a new waitq for this lookup and
    calls the daemon to perform the mount.
    
    The daemon performs a mkdir of the "foo" directory under /mount/submount,
    which ends up creating a *new* dentry, D2.
    
    Then, P2 does a lookup of /mount/submount/foo.  The VFS path walking logic
    finds a dentry in the dcache, D2, and calls the revalidate function with this.
     In the autofs4 revalidate code, we then trigger a mount, since the dentry is
    an empty directory that isn't a mountpoint, and so set DCACHE_AUTOFS_PENDING
    and call into the wait code to trigger the mount.
    
    The wait code finds our existing waitq entry (since it is keyed off of the
    directory name) and adds itself to the list of waiters.
    
    After the daemon finishes the mount, it calls back into the kernel to release
    the waiters.  When this happens, P1 is woken up and goes about clearing the
    DCACHE_AUTOFS_PENDING flag, but it does this in D1!  So, given that P1 in our
    case is a program that will immediately try to access a file under
    /mount/submount/foo, we end up finding the dentry D2 which still has the
    pending flag set, and we set out to wait for a mount *again*!
    
    So, one way to address this is to re-do the lookup at the end of
    try_to_fill_dentry, and to clear the pending flag on the hashed dentry.  This
    seems a sane approach to me."
    
    And Jeff's patch does this.
    
    Signed-off-by: Jeff Moyer <jmoyer at redhat.com>
    Signed-off-by-by: Ian Kent <raven at themaw.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit cab0936aac8aa907c6bb814c2cf26385478f254b
Author: Ian Kent <raven at themaw.net>
Date:   Thu May 1 04:35:07 2008 -0700

    autofs4: check for invalid dentry in getpath
    
    Catch invalid dentry when calculating its path.
    
    Signed-off-by: Ian Kent <raven at themaw.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit afec570c32a0d116e3c68af583ed1d11110f12fc
Author: Ian Kent <raven at themaw.net>
Date:   Thu May 1 04:35:06 2008 -0700

    autofs4: fix sparse warning in waitq.c:autofs4_expire_indirect()
    
    Re-order some code in expire.c:autofs4_expire_indirect() to avoid compile
    warning, reported by Harvey Harrison:
    
     CHECK   fs/autofs4/expire.c
    fs/autofs4/expire.c:383:2: warning: context imbalance in
    'autofs4_expire_indirect' - unexpected unlock
    
    Signed-off-by: Ian Kent <raven at themaw.net>
    Reviewed-by: Harvey Harrison <harvey.harrison at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit c32e026efc1e1a4f9e36babebf123f2b88205b0b
Author: Jan Kara <jack at suse.cz>
Date:   Thu May 1 04:35:05 2008 -0700

    quota: add a convenience macro for filesystems
    
    Note that it cannot be an inline function because we don't have struct
    super_block prototype...
    
    Signed-off-by: Jan Kara <jack at suse.cz>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 0d34aa4d5a3e5d141bb4d07ed5d4bf02d4d4998a
Author: Matthew Wilcox <matthew at wil.cx>
Date:   Thu May 1 04:35:04 2008 -0700

    spi_s3c24xx signedness fix
    
    On Fri, Apr 18, 2008 at 09:08:55PM +0200, Julia Lawall wrote:
    > I found 63 occurrences of this problem with the following semantic match
    > (http://www.emn.fr/x-info/coccinelle/):
    >
    > @@ unsigned int i; @@
    >
    > * i < 0
    >
    
    Since this one's always in the range 0-255, it could probably be made
    signed, but it's just as easy to make it work unsigned.
    
    Reported-by: Julia Lawall <julia at diku.dk>
    Signed-off-by: Matthew Wilcox <willy at linux.intel.com>
    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 8eeb12e5a2486ab958fa27ec97e71dabf234b73b
Author: Vitja Makarov <vitja.makarov at gmail.com>
Date:   Thu May 1 04:35:03 2008 -0700

    spi_bfin5xx: use PIO for full duplex, not DMA
    
    Use PIO for full-duplex transfers, instead of DMA.
    
    Signed-off-by: Vitja Makarov <vitja.makarov at gmail.com>
    Signed-off-by: Bryan Wu <cooloney at kernel.org>
    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 ef3fb66ced1a890769d71a4f4ae9f68b8afa98b6
Author: Jean Delvare <khali at linux-fr.org>
Date:   Thu May 1 04:35:01 2008 -0700

    dmi: clean-up dmi helper declarations
    
    The declaration of dmi helper functions is a bit messy and inconsistent at the
    moment:
    
    * On ia64 they are declared in <asm/io.h>.
    * On x86-64 they are declared in <asm/dmi.h>.
    * On i386 they are declared both in <asm/io.h> and <asm/dmi.h>.
    
    Fix the header files so that the dmi helper functions are consistently
    defined in <asm/dmi.h>.
    
    Signed-off-by: Jean Delvare <khali at linux-fr.org>
    Cc: Matt Domsch <Matt_Domsch at dell.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 99da9047e675a4a8d671bbd67b34eb096c308b0d
Author: Scott Kilau <scottk at digi.com>
Date:   Thu May 1 04:35:00 2008 -0700

    jsm: add new supported board to jsm serial driver
    
    Add new PCI Express Neo/JSM board to the supported list of drivers in
    the JSM driver.
    
    Signed-off-by: Scott Kilau <scottk at digi.com>
    Acked-by: Ananda V <avenkat 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 6f441fe99814f64315b8c11890744230b990c460
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Thu May 1 04:34:59 2008 -0700

    8250: switch 8250 drivers to use _nocache ioremaps
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Cc: Russell King <rmk at arm.linux.org.uk>
    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 4ed99a27d161ce6f1eb6657c5cd5e6aef365c665
Author: Jochen Eisinger <jochen at penguin-breeder.org>
Date:   Thu May 1 04:34:58 2008 -0700

    i8k: make fan multiplier tunable with a module parameter
    
    The i8k driver multiplies the fan speed reported by the BIOS with a factor of
    30.  On my Dell Latitude D800, this factor is not required.
    
    I'd suggest to make this configurable.
    
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit af8e2a4cb9b3e14b919ae1cd4012825aefddbeb0
Author: Nadia Derbey <Nadia.Derbey at bull.net>
Date:   Thu May 1 04:34:57 2008 -0700

    idr: fix idr_remove()
    
    The return inside the loop makes us free only a single layer.
    
    Signed-off-by: Nadia Derbey <Nadia.Derbey at bull.net>
    Cc: "Paul E. McKenney" <paulmck at us.ibm.com>
    Cc: Manfred Spraul <manfred at colorfullife.com>
    Cc: Jim Houston <jim.houston at comcast.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 7793bfcfccc91d036d61618d90baf2be3d76e710
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date:   Thu May 1 04:34:55 2008 -0700

    PNP: fix printk format warnings
    
    next-20080430/drivers/pnp/pnpbios/rsparser.c:594: warning: format '%d' expects type 'int', but argument 4 has type 'resource_size_t'
    next-20080430/drivers/pnp/pnpbios/rsparser.c:605: warning: format '%d' expects type 'int', but argument 4 has type 'resource_size_t'
    
    [joe at perches.com: fix it]
    [akpm at linux-foundation.org: coding-style fixes]
    Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
    Cc: Bjorn Helgaas <bjorn.helgaas at hp.com>
    Signed-off-by: Joe Perches <joe at perches.com>
    
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 2e11cb4c52ffbadab4844b28803577ba7272b221
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Thu May 1 04:34:54 2008 -0700

    pcmcia: replace remaining __FUNCTION__ occurrences
    
    __FUNCTION__ is gcc-specific, use __func__
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 23d077e28127ea96408032edcf9dd7062a0daaa3
Author: Andrew Morton <akpm at linux-foundation.org>
Date:   Thu May 1 04:34:54 2008 -0700

    drivers/pcmcia/soc_common.c: convert soc_pcmcia_sockets_lock into a mutex and make it static
    
    Cc: Russell King <rmk at arm.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 12d1e75d3d4d2748f5db308d9b5d5b873435c308
Author: Matthias Kaehlcke <matthias at kaehlcke.net>
Date:   Thu May 1 04:34:53 2008 -0700

    Alchemy Semi Au1000 pcmcia driver: convert pcmcia_sockets_lock in a mutex
    
    Alchemy Semi Au1000 pcmcia driver: The semaphore pcmcia_sockets_lock
    is used as a mutex, convert it to the mutex API
    
    (akpm: make it static too)
    
    Signed-off-by: Matthias Kaehlcke <matthias at kaehlcke.net>
    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 e772d782a6b0f14d491a95445f0ec6767d66fb29
Author: Sam Ravnborg <sam at ravnborg.org>
Date:   Thu May 1 04:34:52 2008 -0700

    pcmcia: annotate cb_alloc with __ref
    
    cb_alloc() uses a function (pci_scan_slot) that will be annotated __devinit.
    
    Annotate cb_alloc() with __ref to tell modpost to ignore this reference.
    
    Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
    Cc: Dominik Brodowski <linux at dominikbrodowski.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit ba66ddfa613886cbb554f7b064dc05bdc2c7138b
Author: Sam Ravnborg <sam at ravnborg.org>
Date:   Thu May 1 04:34:51 2008 -0700

    pcmcia: silence section mismatch warnings from pci_driver variables
    
    Silence following warnings:
    WARNING: drivers/pcmcia/built-in.o(.data+0x14e0): Section mismatch in reference from the variable pd6729_pci_drv to the function .devinit.text:pd6729_pci_probe()
    WARNING: drivers/pcmcia/built-in.o(.data+0x14e8): Section mismatch in reference from the variable pd6729_pci_drv to the function .devexit.text:pd6729_pci_remove()
    WARNING: drivers/pcmcia/built-in.o(.data+0x16c0): Section mismatch in reference from the variable i82092aa_pci_drv to the function .devinit.text:i82092aa_pci_probe()
    WARNING: drivers/pcmcia/built-in.o(.data+0x16c8): Section mismatch in reference from the variable i82092aa_pci_drv to the function .devexit.text:i82092aa_pci_remove()
    
    Rename the variables from *_drv to *_driver so modpost ignore the OK
    references to __devinit/__devexit functions.
    
    Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
    Cc: Dominik Brodowski <linux at dominikbrodowski.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit ed49f5d0015927334dcca3607a9bfc1478ff8f55
Author: Sam Ravnborg <sam at ravnborg.org>
Date:   Thu May 1 04:34:50 2008 -0700

    pcmcia: silence section mismatch warnings from class_interface variables
    
    Silence the following warnings:
    WARNING: drivers/pcmcia/built-in.o(.data+0x6e8): Section mismatch in reference from the variable pcmcia_bus_interface to the function .devinit.text:pcmcia_bus_add_socket()
    WARNING: drivers/pcmcia/built-in.o(.data+0xa88): Section mismatch in reference from the variable pccard_rsrc_interface to the function .devinit.text:pccard_sysfs_add_rsrc()
    WARNING: drivers/pcmcia/built-in.o(.data+0xa90): Section mismatch in reference from the variable pccard_rsrc_interface to the function .devexit.text:pccard_sysfs_remove_rsrc()
    
    The variables of type class_interface contains references
    to __devinit and __devexit functions which is OK.
    Silence warnings by annotating the variables with __refdata.
    
    Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
    Cc: Dominik Brodowski <linux at dominikbrodowski.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit be089d79c46f5efa77fbdf03c5e576e220bf143f
Author: Michael Ellerman <michael at ellerman.id.au>
Date:   Thu May 1 04:34:49 2008 -0700

    kexec: make extended crashkernel= syntax less confusing
    
    The extended crashkernel syntax is a little confusing in the way it handles
    ranges.  eg:
    
     crashkernel=512M-2G:64M,2G-:128M
    
    Means if the machine has between 512M and 2G of memory the crash region should
    be 64M, and if the machine has 2G of memory the region should be 64M.  Only if
    the machine has more than 2G memory will 128M be allocated.
    
    Although that semantic is correct, it is somewhat baffling.  Instead I propose
    that the end of the range means the first address past the end of the range,
    ie: 512M up to but not including 2G.
    
    [bwalle at suse.de: clarify inclusive/exclusive in crashkernel commandline in documentation]
    Signed-off-by: Michael Ellerman <michael at ellerman.id.au>
    Acked-by: Bernhard Walle <bwalle at suse.de>
    Cc: "Eric W. Biederman" <ebiederm at xmission.com>
    Cc: Simon Horman <horms at verge.net.au>
    Signed-off-by: Bernhard Walle <bwalle at suse.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit c85d194bfd2e36c5254b8058c1f35cfce0dfa10a
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date:   Thu May 1 04:34:48 2008 -0700

    docbook: fix vmalloc missing parameter notation
    
    Fix vmalloc kernel-doc warning:
    
    Warning(linux-2.6.25-git14//mm/vmalloc.c:555): No description found for parameter 'caller'
    
    Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 5045790589bd426b5d515d78fa71f0fc92dd4e83
Author: Ingo Molnar <mingo at elte.hu>
Date:   Thu May 1 04:34:47 2008 -0700

    isdn: hysdn_procconf.c build fix
    
    x86.git randconfig testing found the following build error in latest
    -git:
    
      CC [M]  drivers/isdn/hysdn/hysdn_procconf.o
      CC [M]  drivers/isdn/hysdn/hysdn_init.o
      drivers/isdn/hysdn/hysdn_procconf.c: In function 'hysdn_procconf_init':
      drivers/isdn/hysdn/hysdn_procconf.c:408: error: too few arguments to function 'proc_create'
    
    with the following config:
    
      http://redhat.com/~mingo/misc/config-Wed_Apr_30_15_12_48_CEST_2008.bad
    
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Cc: "Denis V. Lunev" <den at openvz.org>
    Cc: Karsten Keil <kkeil at suse.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 3e3a7d666d6db19406ba0865e8116ff59c8af6f1
Author: David Woodhouse <dwmw2 at infradead.org>
Date:   Thu May 1 04:34:46 2008 -0700

    Embedded Maintainer(s), linux-embedded at vger list
    
    Add Paul and myself, and the linux-embedded list, to MAINTAINERS.
    
    Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
    Signed-off-by: Paul Gortmaker <paul.gortmaker at windriver.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 02c6be615f1fcd37ac5ed93a3ad6692ad8991cd9
Author: Miklos Szeredi <mszeredi at suse.cz>
Date:   Thu May 1 04:34:45 2008 -0700

    vfs: fix permission checking in sys_utimensat
    
    If utimensat() is called with both times set to UTIME_NOW or one of them to
    UTIME_NOW and the other to UTIME_OMIT, then it will update the file time
    without any permission checking.
    
    I don't think this can be used for anything other than a local DoS, but could
    be quite bewildering at that (e.g.  "Why was that large source tree rebuilt
    when I didn't modify anything???")
    
    This affects all kernels from 2.6.22, when the utimensat() syscall was
    introduced.
    
    Fix by doing the same permission checking as for the "times == NULL" case.
    
    Thanks to Michael Kerrisk, whose utimensat-non-conformances-and-fixes.patch in
    -mm also fixes this (and breaks other stuff), only he didn't realize the
    security implications of this bug.
    
    Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
    Cc: Ulrich Drepper <drepper at redhat.com>
    Cc: Michael Kerrisk <mtk-manpages at gmx.net>
    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 2850699c59d513a0cd0c68f60f75609a5f9d4d32
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date:   Thu May 1 04:34:43 2008 -0700

    sysfs: sysfs_update_group stub for CONFIG_SYSFS=n
    
    scsi_transport_spi uses sysfs_update_group() when CONFIG_SYSFS=n, so provide a
    stub for it.
    
    next-20080423/drivers/scsi/scsi_transport_spi.c:1467: error: implicit declaration of function 'sysfs_update_group'
    make[3]: *** [drivers/scsi/scsi_transport_spi.o] Error 1
    
    Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
    Cc: Greg KH <greg at kroah.com>
    Cc: James Bottomley <James.Bottomley at HansenPartnership.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 34990cf702bdf2b4964e0629dab4af7669f8b2c5
Author: David Brownell <david-b at pacbell.net>
Date:   Thu May 1 04:34:42 2008 -0700

    Add a new sysfs_streq() string comparison function
    
    Add a new sysfs_streq() string comparison function, which ignores
    the trailing newlines found in sysfs inputs.  By example:
    
    	sysfs_streq("a", "b")	==> false
    	sysfs_streq("a", "a")	==> true
    	sysfs_streq("a", "a\n")	==> true
    	sysfs_streq("a\n", "a")	==> true
    
    This is intended to simplify parsing of sysfs inputs, letting them
    avoid the need to manually strip off newlines from inputs.
    
    Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
    Acked-by: Greg KH <greg at kroah.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 7dffa3c673fbcf835cd7be80bb4aec8ad3f51168
Author: Roman Zippel <zippel at linux-m68k.org>
Date:   Thu May 1 04:34:41 2008 -0700

    ntp: handle leap second via timer
    
    Remove the leap second handling from second_overflow(), which doesn't have to
    check for it every second anymore.  With CONFIG_NO_HZ this also makes sure the
    leap second is handled close to the full second.  Additionally this makes it
    possible to abort a leap second properly by resetting the STA_INS/STA_DEL
    status bits.
    
    Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
    Cc: john stultz <johnstul at us.ibm.com>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 8383c42399f394a89bd6c2f03632c53689bdde7a
Author: Roman Zippel <zippel at linux-m68k.org>
Date:   Thu May 1 04:34:39 2008 -0700

    ntp: remove current_tick_length()
    
    current_tick_length used to do a little more, but now it just returns
    tick_length, which we can also access directly at the few places, where it's
    needed.
    
    Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
    Cc: john stultz <johnstul at us.ibm.com>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 7fc5c78409479d826341b103bdf734cb4fb02436
Author: Roman Zippel <zippel at linux-m68k.org>
Date:   Thu May 1 04:34:38 2008 -0700

    ntp: rename TICK_LENGTH_SHIFT to NTP_SCALE_SHIFT
    
    As TICK_LENGTH_SHIFT is used for more than just the tick length, the name
    isn't quite approriate anymore, so this renames it to NTP_SCALE_SHIFT.
    
    Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
    Cc: john stultz <johnstul at us.ibm.com>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 153b5d054ac2d98ea0d86504884326b6777f683d
Author: Roman Zippel <zippel at linux-m68k.org>
Date:   Thu May 1 04:34:37 2008 -0700

    ntp: support for TAI
    
    This adds support for setting the TAI value (International Atomic Time).  The
    value is reported back to userspace via timex (as we don't have a
    ntp_gettime() syscall).
    
    Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
    Cc: john stultz <johnstul at us.ibm.com>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 9f14f669d18477fe3df071e2fa4da36c00acee8e
Author: Roman Zippel <zippel at linux-m68k.org>
Date:   Thu May 1 04:34:36 2008 -0700

    ntp: increase time_offset resolution
    
    time_offset is already a 64bit value but its resolution barely used, so this
    makes better use of it by replacing SHIFT_UPDATE with TICK_LENGTH_SHIFT.
    
    Side note: the SHIFT_HZ in SHIFT_UPDATE was incorrect for CONFIG_NO_HZ and the
    primary reason for changing time_offset to 64bit to avoid the overflow.
    
    Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
    Cc: john stultz <johnstul at us.ibm.com>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 074b3b87941c99bc0ce35385b5817924b1ed0c23
Author: Roman Zippel <zippel at linux-m68k.org>
Date:   Thu May 1 04:34:34 2008 -0700

    ntp: increase time_freq resolution
    
    This changes time_freq to a 64bit value and makes it static (the only outside
    user had no real need to modify it).  Intermediate values were already 64bit,
    so the change isn't that big, but it saves a little in shifts by replacing
    SHIFT_NSEC with TICK_LENGTH_SHIFT.  PPM_SCALE is then used to convert between
    user space and kernel space representation.
    
    Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
    Cc: john stultz <johnstul at us.ibm.com>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit eea83d896e318bda54be2d2770d2c5d6668d11db
Author: Roman Zippel <zippel at linux-m68k.org>
Date:   Thu May 1 04:34:33 2008 -0700

    ntp: NTP4 user space bits update
    
    This adds a few more things from the ntp nanokernel related to user space.
    It's now possible to select the resolution used of some values via STA_NANO
    and the kernel reports in which mode it works (pll/fll).
    
    If some values for adjtimex() are outside the acceptable range, they are now
    simply normalized instead of letting the syscall fail.  I removed
    MOD_CLKA/MOD_CLKB as the mapping didn't really makes any sense, the kernel
    doesn't support setting the clock.
    
    Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
    Cc: john stultz <johnstul at us.ibm.com>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit ee9851b218b8bafa22942b5404505ff3d2d34324
Author: Roman Zippel <zippel at linux-m68k.org>
Date:   Thu May 1 04:34:32 2008 -0700

    ntp: cleanup ntp.c
    
    This is mostly a style cleanup of ntp.c and extracts part of do_adjtimex as
    ntp_update_offset().  Otherwise the functionality is still the same as before.
    
    Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
    Cc: john stultz <johnstul at us.ibm.com>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit f8bd2258e2d520dff28c855658bd24bdafb5102d
Author: Roman Zippel <zippel at linux-m68k.org>
Date:   Thu May 1 04:34:31 2008 -0700

    remove div_long_long_rem
    
    x86 is the only arch right now, which provides an optimized for
    div_long_long_rem and it has the downside that one has to be very careful that
    the divide doesn't overflow.
    
    The API is a little akward, as the arguments for the unsigned divide are
    signed.  The signed version also doesn't handle a negative divisor and
    produces worse code on 64bit archs.
    
    There is little incentive to keep this API alive, so this converts the few
    users to the new API.
    
    Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
    Cc: Ralf Baechle <ralf at linux-mips.org>
    Cc: Ingo Molnar <mingo at elte.hu>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Cc: john stultz <johnstul at us.ibm.com>
    Cc: Christoph Lameter <clameter at sgi.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 6f6d6a1a6a1336431a6cba60ace9e97c3a496a19
Author: Roman Zippel <zippel at linux-m68k.org>
Date:   Thu May 1 04:34:28 2008 -0700

    rename div64_64 to div64_u64
    
    Rename div64_64 to div64_u64 to make it consistent with the other divide
    functions, so it clearly includes the type of the divide.  Move its definition
    to math64.h as currently no architecture overrides the generic implementation.
     They can still override it of course, but the duplicated declarations are
    avoided.
    
    Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
    Cc: Avi Kivity <avi at qumranet.com>
    Cc: Russell King <rmk at arm.linux.org.uk>
    Cc: Geert Uytterhoeven <geert at linux-m68k.org>
    Cc: Ralf Baechle <ralf at linux-mips.org>
    Cc: David Howells <dhowells at redhat.com>
    Cc: Jeff Dike <jdike at addtoit.com>
    Cc: Ingo Molnar <mingo at elte.hu>
    Cc: "David S. Miller" <davem at davemloft.net>
    Cc: Patrick McHardy <kaber at trash.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 71abb3af62dfa52930755f3b6497eafbe1d6ec85
Author: Roman Zippel <zippel at linux-m68k.org>
Date:   Thu May 1 04:34:26 2008 -0700

    convert a few do_div users
    
    This converts a few users of do_div to div_[su]64 and this demonstrates nicely
    how it can reduce some expressions to one-liners.
    
    Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
    Cc: john stultz <johnstul at us.ibm.com>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 2418f4f28f8467b92a6177af32d05737ebf6206c
Author: Roman Zippel <zippel at linux-m68k.org>
Date:   Thu May 1 04:34:25 2008 -0700

    introduce explicit signed/unsigned 64bit divide
    
    The current do_div doesn't explicitly say that it's unsigned and the signed
    counterpart is missing, which is e.g.  needed when dealing with time values.
    
    This introduces 64bit signed/unsigned divide functions which also attempts to
    cleanup the somewhat awkward calling API, which often requires the use of
    temporary variables for the dividend.  To avoid the need for temporary
    variables everywhere for the remainder, each divide variant also provides a
    version which doesn't return the remainder.
    
    Each architecture can now provide optimized versions of these function,
    otherwise generic fallback implementations will be used.
    
    As an example I provided an alternative for the current x86 divide, which
    avoids the asm casts and using an union allows gcc to generate better code.
    It also avoids the upper divde in a few more cases, where the result is known
    (i.e.  upper quotient is zero).
    
    Signed-off-by: Roman Zippel <zippel at linux-m68k.org>
    Cc: john stultz <johnstul at us.ibm.com>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit adafbedf0c31ae1cde62035c82857f5e376af553
Author: David Howells <dhowells at redhat.com>
Date:   Thu May 1 04:34:24 2008 -0700

    frv: unbreak misalignment handling changes
    
    Fix a reference in a arch/frv/mm/Makefile to unaligned.c which has now been
    deleted.
    
    Also revert the change to the guard macro name in include/asm-frv/unaligned.h.
    
    Signed-off-by: David Howells <dhowells at redhat.com>
    Cc: Harvey Harrison <harvey.harrison at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit e5e417232e7c9ecc58a77902d2e8dd46792cd092
Author: Christian Borntraeger <borntraeger at de.ibm.com>
Date:   Thu May 1 04:34:23 2008 -0700

    Fix cpu hotplug problem in softirq code
    
    currently cpu hotplug (unplug) seems broken on s390 and likely others. On cpu
    unplug the system starts to behave very strange and hangs.
    
    I bisected the problem to the following commit:
    
    commit 48f20a9a9488c432fc86df1ff4b7f4fa895d1183
    Author: Olof Johansson <olof at lixom.net>
    Date: Tue Mar 4 15:23:25 2008 -0800
    	tasklets: execute tasklets in the same order they were queued
    
    Reverting this patch seems to fix the problem.  I looked into takeover_tasklet
    and it seems that there is a way to corrupt the tail pointer of the current
    cpu.  If the tasklet list of the frozen cpu is empty, the tail pointer of the
    current cpu points to the address of the head pointer of the stopped cpu and
    not to the next pointer of a tasklet_struct.
    
    This patch avoids the list splice of the list is empty and cpu hotplug seems
    to work as the tail pointer is not corrupted.  Olof, can you look into that
    patch and ACK/NACK it so Andrew can push this to Linus, if appropriate?
    Please note that some lines are longer than 80 chars, but line-wrapping looked
    worse that this version.
    
    Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
    Acked-by: Olof Johansson <olof at lixom.net>
    Acked-by: 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 6bffd7b57d747d74ec2962d7c822f4b86e9f64d4
Author: Paul Jackson <pj at sgi.com>
Date:   Thu May 1 04:34:21 2008 -0700

    cpusets: update maintainers
    
    Update CPUSETS MAINTAINERS to reflect the more active role of Paul Menage
    (secondary to his work on cgroups) and the retirement of the original author
    of cpusets, Simon Derr.  Thanks, Simon!  Best of luck to you.
    
    Signed-off-by: Paul Jackson <pj at sgi.com>
    Acked-by: Paul Menage <menage at google.com>
    Acked-by: Simon Derr <simon.derr at bull.net>
    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 590fe34c47cb5c2d836ac76fabc5f160bf31a3f1
Author: David Woodhouse <dwmw2 at infradead.org>
Date:   Thu May 1 15:53:28 2008 +0100

    [JFFS2] Quiet lockdep false positive.
    
    Don't hold f->sem while calling into jffs2_do_create(). It makes lockdep
    unhappy, and we don't really need it -- the _reason_ it's a false
    positive is because nobody else can see this inode yet and so nobody
    will be trying to lock it anyway.
    
    Signed-off-by: David Woodhouse <dwmw2 at infradead.org>

commit 23f8e4bf7cf0e2125b6d798cc85c031951c763d3
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date:   Thu May 1 14:08:51 2008 +0200

    ide: fix early setup of hwif->host_flags
    
    On Thursday 01 May 2008, Jeremy Kerr wrote:
    > Hi all,
    >
    > On QS20 Cell machines, Linus' current git tree explodes on boot:
    >
    > SiI680: IDE controller (0x1095:0x0680 rev 0x02) at  PCI slot
    > 0000:00:0a.0
    > SiI680: BASE CLOCK == 133
    > SiI680: 100% native mode on irq 51
    >     ide0: MMIO-DMA
    >     ide1: MMIO-DMA
    > Unable to handle kernel paging request for data at address
    > 0xa000100081220080
    > Faulting instruction address: 0xc000000000024748
    > cpu 0x2: Vector: 300 (Data Access) at [c00000001e143420]
    >     pc: c000000000024748: ._insw_ns+0x10/0x30
    >     lr: c000000000037fc4: .spiderpci_readsw+0x24/0x6c
    >     sp: c00000001e1436a0
    >    msr: 9000000000001032
    >    dar: a000100081220080
    >  dsisr: 40000000
    >   current = 0xc00000003d060000
    >   paca    = 0xc000000000623880
    >     pid   = 1, comm = swapper
    > enter ? for help
    > [link register   ] c000000000037fc4 .spiderpci_readsw+0x24/0x6c
    > [c00000001e1436a0] c00000000062ce63 (unreliable)
    > [c00000001e143730] c0000000000379d4 .iowa_readsw+0x78/0xa8
    > [c00000001e1437c0] c000000000037a98 .iowa_insw+0x94/0xd4
    > [c00000001e143850] c00000000022a190 .ata_input_data+0x298/0x2ec
    > [c00000001e143910] c00000000022b600 .try_to_identify+0x2c0/0x6d4
    > [c00000001e1439d0] c00000000022bb54 .do_probe+0x140/0x35c
    > [c00000001e143a80] c00000000022bfbc .ide_probe_port+0x24c/0x670
    > [c00000001e143b50] c00000000022d09c .ide_device_add_all+0x2ec/0x690
    > [c00000001e143c00] c00000000022d4a4 .ide_device_add+0x64/0x74
    > [c00000001e143c90] c00000000022f834 .ide_setup_pci_device+0x58/0x7c
    > [c00000001e143d30] c00000000038bdf8
    > [c00000001e143e10] c000000000486fb0 .ide_scan_pcibus+0x8c/0x178
    > [c00000001e143ea0] c000000000460c00 .kernel_init+0x1c4/0x344
    > [c00000001e143f90] c000000000024a1c .kernel_thread+0x4c/0x68
    >
    > It looks like we're trying to do PIO accesses (which appear to be
    > broken, but that's another issue) to this MMIO device. In
    > ata_input_data, we see that:
    >
    > 	u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0;
    >
    > Gives mmio == 0.
    >
    > (what's the difference between hwif->mmio and ID_HFLAG_MMIO?)
    >
    > In the siimage driver, hwif->host flags is initially set up correctly
    > (host_flags includes IDE_HFLAG_MMIO), but we then *clear* this bit in
    > ide_init_port:
    >
    > 	hwif->host_flags = d->host_flags;
    >
    > where d is the struct ide_port_info for this chipset. In my case,
    > d->host_flags is 0x0. It looks like this will be the same for all of
    > the siimage chipsets.
    
    Don't over-write hwif->host_flags in ide_init_port(), some host drivers
    set IDE_HFLAG_MMIO or IDE_HFLAG_NO_IO_32BIT host flag early.
    
    Thanks to Jeremy Kerr for the excellent analysis of the bug.
    
    Reported-by: Jeremy Kerr <jk at ozlabs.org>
    Tested-by: Jeremy Kerr <jk at ozlabs.org>
    Cc: Sergei Shtylyov <sshtylyov at ru.mvista.com>
    Cc: Ben Herrenschmidt <benh at kernel.crashing.org>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>

commit 4f02f8220562591322c118d07a32bebf705318b7
Merge: 1852448652fd526d56099256dadc4ef32cb1b10e 809307768cb177621b8f45f87fa840993ca4cb60
Author: Mark M. Hoffman <mhoffman at lightlink.com>
Date:   Thu May 1 07:33:17 2008 -0400

    Merge branch 'smsc47b397-new-id' into release

commit 4e571aba7bb25a3a069a7b88c0f63fe5a14c05c6
Author: David Woodhouse <dwmw2 at infradead.org>
Date:   Thu May 1 12:28:04 2008 +0100

    [JFFS2] Clean up jffs2_alloc_inode() and jffs2_i_init_once()
    
    Ditch a couple of pointless casts from void *, and use the normal
    variable name 'f' for jffs2_inode_info pointers -- especially since
    it actually shows up in lockdep reports.
    
    Signed-off-by: David Woodhouse <dwmw2 at infradead.org>

commit df4b565e1fbc777bb6e274378a41fa8ff7485680
Author: Peter Oberparleiter <peter.oberparleiter at de.ibm.com>
Date:   Mon Apr 21 14:34:31 2008 +0200

    module: add MODULE_STATE_GOING notifier call
    
    Provide module unload callback. Required by the gcov profiling
    infrastructure to keep track of profiling data structures.
    
    Signed-off-by: Peter Oberparleiter <peter.oberparleiter at de.ibm.com>
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>

commit b211104d111c99dbb97c636b57bd9db711455684
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Thu May 1 21:15:00 2008 -0500

    module: Enhance verify_export_symbols
    
    Make verify_export_symbols check the modules unused, unused_gpl and
    gpl_future syms.
    
    Inspired by Jan Beulich's fix, but table-driven.
    
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>

commit 4e2d92454b2d822fe1d474efabccc2a3806d5f86
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Thu May 1 21:15:00 2008 -0500

    module: set unused_gpl_crcs instead of overwriting unused_crcs
    
    Obvious typo, but I don't know of any modules with unused GPL exports,
    and then it would take someone noticing that the version shouldn't
    have matched in a dependent module.
    
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>

commit ad9546c9917d44eddc7676b639296d624cee455e
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Thu May 1 21:14:59 2008 -0500

    module: neaten __find_symbol, rename to find_symbol
    
    __find_symbol() has grown over time: there are now 5 different arrays
    of symbols it traverses.  It also shouldn't print out a warning on
    some calls (ie. verify_symbol which simply checks for name clashes,
    and __symbol_put which checks for bugs).
    
    1) Rename to find_symbol: no need for underscores.
    2) Use bool and add "warn" parameter to suppress warnings.
    3) Make table-driven rather than open coded.
    
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>

commit ea01e798e2d27fd04142e0473ca36570fa9d9218
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Thu Mar 13 09:02:17 2008 +0000

    module: reduce module image and resident size
    
    Resulting reduction (x86-64, gcc 4.1.2) with my (special purpose, i.e.
    much reduced) configurations:
    - 16k kernel resident size
    - 180k module resident size
    - 10k module image size
    
    Signed-off-by: Jan Beulich <jbeulich at novell.com>
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>

commit a58730c42174672fe0012a4edbe3e38f94ef2bad
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Thu Mar 13 09:03:44 2008 +0000

    module: make module_sect_attrs private to kernel/module.c
    
    No-one else is using these afaics.
    
    Signed-off-by: Jan Beulich <jbeulich at novell.com>
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>

commit b1145ce395f7785487c128fe8faf8624e6586d84
Author: Julia Lawall <julia at diku.dk>
Date:   Wed Apr 30 00:27:14 2008 +0800

    [CRYPTO] cryptd: Correct kzalloc error test
    
    Normally, kzalloc returns NULL or a valid pointer value, not a value to be
    tested using IS_ERR.
    
    Signed-off-by: Julia Lawall <julia at diku.dk>
    Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>

commit 46f8153cc59384eb09a426d044668d4801f818ce
Author: Herbert Xu <herbert at gondor.apana.org.au>
Date:   Tue Apr 29 21:57:01 2008 +0800

    [CRYPTO] eseqiv: Fix off-by-one encryption
    
    After attaching the IV to the head during encryption, eseqiv does not
    increase the encryption length by that amount.  As such the last block
    of the actual plain text will be left unencrypted.
    
    Fortunately the only user of this code hifn currently crashes so this
    shouldn't affect anyone :)
    
    Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>

commit 8ec970d8561abb5645d4602433b772e268c96d05
Author: Herbert Xu <herbert at gondor.apana.org.au>
Date:   Tue Apr 29 21:53:52 2008 +0800

    [CRYPTO] api: Fix scatterwalk_sg_chain
    
    When I backed out of using the generic sg chaining (as it isn't currently
    portable) and introduced scatterwalk_sg_chain/scatterwalk_sg_next I left
    out the sg_is_last check in the latter.  This causes it to potentially
    dereference beyond the end of the sg array.
    
    As most uses of scatterwalk_sg_next are bound by an overall length, this
    only affected the chaining code in authenc and eseqiv. Thanks to Patrick
    McHardy for identifying this problem.
    
    This patch also clears the "last" bit on the head of the chained list as
    it's no longer last.  This also went missing in scatterwalk_sg_chain and
    is present in sg_chain.
    
    Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>

commit 161613293fd4b7d5ceb1faab788f47e688e07a67
Author: Patrick McHardy <kaber at trash.net>
Date:   Tue Apr 29 21:44:28 2008 +0800

    [CRYPTO] authenc: Fix async crypto crash in crypto_authenc_genicv()
    
    crypto_authenc_givencrypt_done uses req->data as struct aead_givcrypt_request,
    while it really points to a struct aead_request, causing this crash:
    
    BUG: unable to handle kernel paging request at 6b6b6b6b
    IP: [<dc87517b>] :authenc:crypto_authenc_genicv+0x23/0x109
    *pde = 00000000
    Oops: 0000 [#1] PREEMPT DEBUG_PAGEALLOC
    Modules linked in: hifn_795x authenc esp4 aead xfrm4_mode_tunnel sha1_generic hmac crypto_hash]
    
    Pid: 3074, comm: ping Not tainted (2.6.25 #4)
    EIP: 0060:[<dc87517b>] EFLAGS: 00010296 CPU: 0
    EIP is at crypto_authenc_genicv+0x23/0x109 [authenc]
    EAX: daa04690 EBX: daa046e0 ECX: dab0a100 EDX: daa046b0
    ESI: 6b6b6b6b EDI: dc872054 EBP: c033ff60 ESP: c033ff0c
     DS: 007b ES: 007b FS: 0000 GS: 0033 SS: 0068
    Process ping (pid: 3074, ti=c033f000 task=db883a80 task.ti=dab6c000)
    Stack: 00000000 daa046b0 c0215a3e daa04690 dab0a100 00000000 ffffffff db9fd7f0
           dba208c0 dbbb1720 00000001 daa04720 00000001 c033ff54 c0119ca9 dc852a75
           c033ff60 c033ff60 daa046e0 00000000 00000001 c033ff6c dc87527b 00000001
    Call Trace:
     [<c0215a3e>] ? dev_alloc_skb+0x14/0x29
     [<c0119ca9>] ? printk+0x15/0x17
     [<dc87527b>] ? crypto_authenc_givencrypt_done+0x1a/0x27 [authenc]
     [<dc850cca>] ? hifn_process_ready+0x34a/0x352 [hifn_795x]
     [<dc8353c7>] ? rhine_napipoll+0x3f2/0x3fd [via_rhine]
     [<dc851a56>] ? hifn_check_for_completion+0x4d/0xa6 [hifn_795x]
     [<dc851ab9>] ? hifn_tasklet_callback+0xa/0xc [hifn_795x]
     [<c011d046>] ? tasklet_action+0x3f/0x66
     [<c011d230>] ? __do_softirq+0x38/0x7a
     [<c0105a5f>] ? do_softirq+0x3e/0x71
     [<c011d17c>] ? irq_exit+0x2c/0x65
     [<c010e0c0>] ? smp_apic_timer_interrupt+0x5f/0x6a
     [<c01042e4>] ? apic_timer_interrupt+0x28/0x30
     [<dc851640>] ? hifn_handle_req+0x44a/0x50d [hifn_795x]
     ...
    
    Signed-off-by: Patrick McHardy <kaber at trash.net>
    Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>

commit ab59859de1946a098b091308380179e92dc7683b
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Thu May 1 02:47:38 2008 -0700

    net: fix returning void-valued expression warnings
    
    drivers/net/8390.c:37:2: warning: returning void-valued expression
    drivers/net/bnx2.c:1635:3: warning: returning void-valued expression
    drivers/net/xen-netfront.c:1806:2: warning: returning void-valued expression
    net/ipv4/tcp_hybla.c:105:3: warning: returning void-valued expression
    net/ipv4/tcp_vegas.c:171:3: warning: returning void-valued expression
    net/ipv4/tcp_veno.c:123:3: warning: returning void-valued expression
    net/sysctl_net.c:85:2: warning: returning void-valued expression
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Acked-by: Alan Cox <alan at redhat.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit c2a3b233450d5bc426c063ea2d8a74351db29ea4
Merge: e4c576b911e364737b1bf4f5bfdab1c440713f26 c0d43990768b6ca83604ff4be80425b89d317e2f
Author: David S. Miller <davem at davemloft.net>
Date:   Thu May 1 02:06:32 2008 -0700

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

commit e4c576b911e364737b1bf4f5bfdab1c440713f26
Author: Theodore Ts'o <tytso at MIT.EDU>
Date:   Wed Apr 30 21:55:48 2008 -0400

    Update .gitignore to include include/linux/bounds.h
    
    (which is autogenerated by kbuild)
    
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit ccc751841567816532874afcaeb449dbf6ca7d3a
Merge: 214b7049a7929f03bbd2786aaef04b8b79db34e2 809917903127804c2b2ac76342ab0f29f4b394d3
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Apr 30 20:13:22 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:
      ipv6: Compilation fix for compat MCAST_MSFILTER sockopts.

commit 214b7049a7929f03bbd2786aaef04b8b79db34e2
Author: Al Viro <viro at ZenIV.linux.org.uk>
Date:   Thu May 1 03:52:22 2008 +0100

    Fix dnotify/close race
    
    We have a race between fcntl() and close() that can lead to
    dnotify_struct inserted into inode's list *after* the last descriptor
    had been gone from current->files.
    
    Since that's the only point where dnotify_struct gets evicted, we are
    screwed - it will stick around indefinitely.  Even after struct file in
    question is gone and freed.  Worse, we can trigger send_sigio() on it at
    any later point, which allows to send an arbitrary signal to arbitrary
    process if we manage to apply enough memory pressure to get the page
    that used to host that struct file and fill it with the right pattern...
    
    Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 6d98ca736441029e4e87ad3b6dc4a8645dc4c6d3
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Apr 30 19:50:03 2008 -0700

    x86: Mark OPTIMIZE_INLINING broken
    
    So Ingo finally did figure out why UML broke with this option: UML
    passes gcc the -fno-unit-at-a-time flag, and apparently that wreaks
    havoc with gcc's inlining.
    
    We could turn off -fno-unit-at-a-time for UML for gcc4+ (which is what
    x86 does), but there's bad blood about this whole option, and it does
    show that the thing is just fragile as heck.
    
    So let tempers cool, and disable the thing, and we can revisit the
    decision later.
    
    Cc: Adrian Bunk <bunk at kernel.org>
    Cc: David Miller <davem at davemloft.net>
    Acked-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 57ce41d1d18279cc90223f3deadca70c7de1cfca
Author: Eli Cohen <eli at dev.mellanox.co.il>
Date:   Wed Apr 30 20:02:45 2008 -0700

    IB/ipoib: Fix transmit queue stalling forever
    
    Commit f56bcd80 ("IPoIB: Use separate CQ for UD send completions")
    introduced a bug where the transmit queue could get stopped and never
    woken up.  The problem is that send completions are only polled at the
    end of the xmit function, so if the send queue fills up and the xmit
    path stops the queue, then there is no way for send completions to
    ever get polled, and so the transmit queue stays stopped forever.
    
    Fix this by arming the send CQ just before posting the last send
    request that fills the send queue.  Then, when the completion event
    handler is called, drain the send CQ.  Since it is possible that not
    enough send completions are in the CQ, verify that the the net queue
    has been woken up after draining the send CQ, and if not arm a timer
    and drain again at the timer function.
    
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit 3ae15e1623b9d32eb410c2a23d90e47b16e6acd0
Author: Roland Dreier <rolandd at cisco.com>
Date:   Wed Apr 30 19:52:55 2008 -0700

    IB/mlx4: Fix off-by-one errors in calls to mlx4_ib_free_cq_buf()
    
    When I merged bbf8eed1 ("IB/mlx4: Add support for resizing CQs") I
    changed things around so that mlx4_ib_alloc_cq_buf() and
    mlx4_ib_free_cq_buf() were used everywhere they could be.  However, I
    screwed up the number of entries passed into mlx4_ib_alloc_cq_buf()
    in a couple places -- the function bumps the number of entries
    internally, so the caller shouldn't add 1 as well.
    
    Passing a too-big value for the number of entries to mlx4_ib_free_cq_buf()
    can cause the cleanup to go off the end of an array and corrupt
    allocator state in interesting ways.
    
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit 958a2f29a6520a1d2973077ce7854ea9a44f48a2
Merge: 6de3d58dcfbab516dbe9aff36ea9542f40cd1bf2 895d30935ebe05f192e844792668bf8d19deaae7
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Apr 30 19:31:52 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes3
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes3: (21 commits)
      x86: numaq fix
      x86: 8K stacks by default
      x86: ioremap ram check fix
      x86: fix HT cpu booting on 32-bit
      x86: optimize inlining off
      x86: CONFIG_X86_ELAN fix
      x86: Kconfig fix
      x86 PAT: fix performance drop for glx, use UC minus for ioremap(), ioremap_nocache() and pci_mmap_page_range()
      x86: use defconfigs from x86/configs/*
      toshiba: use ioremap_cached
      revert: "x86: ioremap(), extend check to all RAM pages"
      x86: don't bother printing compat vdso address
      fix: x86: support for new UV apic
      x86: fix early-BUG message
      x86: iommu_sac_force can become static
      x86: add proper header for reboot_force
      x86 VISWS: build fix
      x86, voyager: fix ioremap_nocache()
      hpet: fix
      x86: unexport kmap_atomic_to_page
      ...

commit c0d43990768b6ca83604ff4be80425b89d317e2f
Author: Holger Schurig <hs4233 at mail.mn-solutions.de>
Date:   Tue Apr 29 10:07:56 2008 +0200

    libertas: fix use-before-check violation
    
    According to Coverity (kudo's to Adrian Bunk), we had one use-before-check
    bug in libe libertas driver. This patch fixes this issue.
    
    Signed-off-by: Holger Schurig <hs4233 at mail.mn-solutions.de>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 2e35af143a1380173ba292e48e9b4913ef16b4ee
Author: Michael Buesch <mb at bu3sch.de>
Date:   Sun Apr 27 19:06:18 2008 +0200

    b43: Fix dual-PHY devices
    
    This fixes operation of dual-PHY (A/B/G) devices.
    Do not anounce the A-PHY to mac80211, as that's not supported, yet.
    
    Signed-off-by: Michael Buesch <mb at bu3sch.de>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 17f830459d6116ae13dbcfc9d09a406e6717b1a6
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Sun Apr 27 03:48:40 2008 -0700

    mac80211: incorrect shift direction
    
    Looks like  5d2cdcd4e85c5187db30a6b29f79fbbe59f39f78 ("mac80211: get a
    TKIP phase key from skb") got the shifts wrong.
    
    Noticed by sparse:
    net/mac80211/tkip.c:234:25: warning: right shift by bigger than source value
    net/mac80211/tkip.c:235:25: warning: right shift by bigger than source value
    net/mac80211/tkip.c:236:25: warning: right shift by bigger than source value
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 636c5d488bc0b349e01cf5bfbf85588134af70a0
Author: Johannes Berg <johannes at sipsolutions.net>
Date:   Thu Apr 24 14:18:37 2008 +0200

    mac80211: insert WDS peer after adding interface
    
    This reorders the open code so that WDS peer STA info entries
    are added after the corresponding interface is added to the
    driver so that driver callbacks aren't invoked out of order.
    Also make any master device startup fatal.
    
    Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit e94e106831403d5028e7bb73c3163951134de1ba
Author: Johannes Berg <johannes at sipsolutions.net>
Date:   Thu Apr 24 14:16:36 2008 +0200

    mac80211: don't allow invalid WDS peer addresses
    
    Rather than just disallowing the zero address, disallow all
    invalid ones.
    
    Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 8b808bf29bdafe9270cb283ea093bb87f5a3be19
Author: Johannes Berg <johannes at sipsolutions.net>
Date:   Wed Apr 23 23:35:09 2008 +0200

    mac80211: assign conf.beacon_control for mesh
    
    Drivers can rightfully assume that they get a beacon_control
    if the beacon is set.
    
    Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 51ceddade0fb1e15f080b2555f3b3e1d68c6707e
Author: Luis Carlos Cobo <luisca at cozybit.com>
Date:   Wed Apr 23 12:15:29 2008 -0700

    mac80211: use 4-byte mesh sequence number
    
    This follows the new 802.11s/D2.0 draft.
    
    Signed-off-by: Luis Carlos Cobo <luisca at cozybit.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

commit 4ba1c5bfd2e5a6c9528eb7777b66c297e70f61ca
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Fri Apr 18 15:03:59 2008 -0700

    ocfs2: Use GFP_NOFS in kmalloc during localalloc window move
    
    kmalloc() during a localalloc window move can trigger the mm to prune
    the dcache which inturn can trigger the fs to delete an inode causing
    it start a recursive transaction.
    
    The fix also makes the change in kmalloc during localalloc shutdown
    just to be safe.
    
    Fixes oss bugzilla#901
    http://oss.oracle.com/bugzilla/show_bug.cgi?id=901
    
    Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
    Signed-off-by: Mark Fasheh <mfasheh at suse.com>

commit bc535809c06ada210d89f5a43b335c68ecbb8e1b
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date:   Fri Apr 18 10:23:53 2008 -0700

    ocfs2: Allow uid/gid/perm changes of symlinks
    
    This patch adds the ability to change attributes of a symlink.
    Fixes oss bugzilla#963
    http://oss.oracle.com/bugzilla/show_bug.cgi?id=963
    
    Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
    Signed-off-by: Mark Fasheh <mfasheh at suse.com>

commit 95642e56647d84963428a1168baa8a73cb782ac3
Author: Adrian Bunk <bunk at kernel.org>
Date:   Mon Apr 21 11:49:37 2008 +0300

    ocfs2/dlm: dlmdebug.c: make 2 functions static
    
    This patch makes the following needlessly global functions static:
    - stringify_lockname()
    - dlm_debug_put()
    
    Signed-off-by: Adrian Bunk <bunk at kernel.org>
    Acked-by: Sunil Mushran <sunil.mushran at oracle.com>
    Signed-off-by: Mark Fasheh <mfasheh at suse.com>

commit 4af694e672aaa85940d6e29d27b7eeea5f6eb258
Author: Adrian Bunk <bunk at kernel.org>
Date:   Mon Apr 21 11:49:31 2008 +0300

    ocfs2: make struct o2cb_stack_ops static
    
    This patch makes the needlessly global struct o2cb_stack_ops static.
    
    Signed-off-by: Adrian Bunk <bunk at kernel.org>
    Acked-by: Joel Becker <joel.becker at oracle.com>
    Signed-off-by: Mark Fasheh <mfasheh at suse.com>

commit 4d8755b5e667df8f01647773ba744a5ac97e68e6
Author: Adrian Bunk <bunk at kernel.org>
Date:   Mon Apr 21 11:49:26 2008 +0300

    ocfs2: make struct ocfs2_control_device static
    
    This patch makes the needlessly global struct ocfs2_control_device
    static.
    
    Signed-off-by: Adrian Bunk <bunk at kernel.org>
    Acked-by: Joel Becker <joel.becker at oracle.com>
    Signed-off-by: Mark Fasheh <mfasheh at suse.com>

commit 9d80f7539a91c0154e40fc9e4ae5e818dd8f102e
Author: Joel Becker <Joel.Becker at oracle.com>
Date:   Tue Apr 22 11:46:44 2008 -0700

    ocfs2: Correct merge of 52f7c21 (Move /sys/o2cb to /sys/fs/o2cb)
    
    Commit 52f7c21b613f80cb425d115c9e5b4ed958a133c0 was intended to move
    /sys/o2cb to /sys/fs/o2cb, providing /sys/o2cb as a symlink for
    backwards compatibility.  However, the merge apparently added the
    symlink but failed to move the directory, resulting in a duplicate
    filename error.  It's a one-line change that was missing.
    
    Signed-off-by: Joel Becker <joel.becker at oracle.com>
    Acked-by: Randy Dunlap <randy.dunlap at oracle.com>
    Signed-off-by: Mark Fasheh <mfasheh at suse.com>

commit 6de3d58dcfbab516dbe9aff36ea9542f40cd1bf2
Merge: e0066c4ea9ffa420cb79814411ff74fdc7b7d98e c3bb7fadaf52de3637b834002dac27f6250b4b49
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Apr 30 17:05:21 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:
      klist: fix coding style errors in klist.h and klist.c
      driver core: remove no longer used "struct class_device"
      pcmcia: remove pccard_sysfs_interface warnings
      devres: support addresses greater than an unsigned long via dev_ioremap
      kobject: do not copy vargs, just pass them around
      sysfs: sysfs_update_group stub for CONFIG_SYSFS=n
      DEBUGFS: Correct location of debugfs API documentation.
      driver core: warn about duplicate driver names on the same bus
      klist: implement klist_add_{after|before}()
      klist: implement KLIST_INIT() and DEFINE_KLIST()
      sysfs: Disallow truncation of files in sysfs

commit c3bb7fadaf52de3637b834002dac27f6250b4b49
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Wed Apr 30 16:43:45 2008 -0700

    klist: fix coding style errors in klist.h and klist.c
    
    Finally clean up the odd spacing in these files.
    
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit c3b19ff06e0808555403491d61e8f0cbbb53e933
Author: Kay Sievers <kay.sievers at vrfy.org>
Date:   Wed Mar 12 20:47:35 2008 +0100

    driver core: remove no longer used "struct class_device"
    
    Signed-off-by: Kay Sievers <kay.sievers at vrfy.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 4356d73d028ad0726cfaf31ad30c5d28fcd98795
Author: David Brownell <dbrownell at users.sourceforge.net>
Date:   Mon Apr 28 01:03:20 2008 -0700

    pcmcia: remove pccard_sysfs_interface warnings
    
    Make the PCMCIA core stop using class_interface to hide socket attribute
    registration.  This removes the associated section mismatch warnings, and
    helps get to the point where that mechanism can finally be removed.
    
    Simplify that attribute registration by using an attribute_group.
    This is a net shrink in object size.
    
    Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 4f452e8aa492c0b8028ca9b4bdb4d018ba28c6c7
Author: Kumar Gala <galak at kernel.crashing.org>
Date:   Tue Apr 29 10:25:48 2008 -0500

    devres: support addresses greater than an unsigned long via dev_ioremap
    
    Use a resource_size_t instead of unsigned long since some arch's are
    capable of having ioremap deal with addresses greater than the size of a
    unsigned long.
    
    Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
    Cc: Tejun Heo <htejun at gmail.com>
    Cc: Jeff Garzik <jgarzik at pobox.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit a4ca6617421188f50774780cdc91c3782b7d08fe
Author: Kay Sievers <kay.sievers at vrfy.org>
Date:   Wed Apr 30 02:06:29 2008 +0200

    kobject: do not copy vargs, just pass them around
    
    This prevents a few unneeded copies.
    
    Signed-off-by: Kay Sievers <kay.sievers at vrfy.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 1cbfb7a5acd357de6c3f8e27e8d8f92b3867b1f3
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date:   Wed Apr 30 09:01:17 2008 -0700

    sysfs: sysfs_update_group stub for CONFIG_SYSFS=n
    
    scsi_transport_spi uses sysfs_update_group() when CONFIG_SYSFS=n,
    so provide a stub for it.
    
    next-20080423/drivers/scsi/scsi_transport_spi.c:1467: error: implicit declaration of function 'sysfs_update_group'
    make[3]: *** [drivers/scsi/scsi_transport_spi.o] Error 1
    
    Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
    Cc: James Bottomley <James.Bottomley at HansenPartnership.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 883ce42ec45c2dbef5be7c133ade9741ac978329
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date:   Fri Apr 25 08:52:51 2008 -0400

    DEBUGFS: Correct location of debugfs API documentation.
    
    Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 16dc42e018c2868211b4928f20a957c0c216126c
Author: Stas Sergeev <stsp at aknet.ru>
Date:   Sat Apr 26 19:52:35 2008 +0400

    driver core: warn about duplicate driver names on the same bus
    
    Currently an attempt to register multiple
    drivers with the same name causes the
    stack trace with some cryptic error message.
    The attached patch adds the necessary check
    and the clear error message.
    
    Signed-off-by: Stas Sergeev <stsp at aknet.ru>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 93dd40013f4f7f4b18d19d0d77855f025bcc57c3
Author: Tejun Heo <htejun at gmail.com>
Date:   Tue Apr 22 18:58:46 2008 +0900

    klist: implement klist_add_{after|before}()
    
    Add klist_add_after() and klist_add_before() which puts a new node
    after and before an existing node, respectively.  This is useful for
    callers which need to keep klist ordered.  Note that synchronizing
    between simultaneous additions for ordering is the caller's
    responsibility.
    
    Signed-off-by: Tejun Heo <htejun at gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 1da43e4a9ee942c9c967dbe8839476571df0c3ed
Author: Tejun Heo <htejun at gmail.com>
Date:   Sat Apr 26 03:16:04 2008 +0900

    klist: implement KLIST_INIT() and DEFINE_KLIST()
    
    klist is missing static initializers and definition helper.  Add them.
    
    Signed-off-by: Tejun Heo <htejun at gmail.com>
    Cc: Peter Zijlstra <peterz at infradead.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit 40a2159abf3d0107bba359246554bd7d56f2171b
Author: Ben Hutchings <bhutchings at solarflare.com>
Date:   Mon Apr 28 15:59:58 2008 +0100

    sysfs: Disallow truncation of files in sysfs
    
    sysfs allows attribute files to be truncated, e.g. using ftruncate(), with the
    expected effect on their inode.   For most attributes, this doesn't change the
    "real" size of the file i.e. how much can be read from it.  However, the
    parameter validation for reading and writing binary attribute files is based
    on the inode size and not the size specified in the file's bin_attribute, so it
    can be broken by this. For example, if we try using dd to write to such a file:
    
    # pwd
    /sys/bus/pci/devices/0000:08:00.0
    # ls -l config
    -rw-r--r--  1 root root 4096 Feb  1 17:35 config
    # dd if=/dev/zero of=config bs=4 count=1
    1+0 records in
    1+0 records out
    # ls -l config
    -rw-r--r--  1 root root 0 Feb  1 17:50 config
    # dd if=/dev/zero of=config bs=4 count=1 seek=128
    dd: writing `config': No space left on device
    1+0 records in
    0+0 records out
    
    Also, after truncation to 0, parameter validation for read and write is
    disabled.  Most bin_attribute read and write methods also validate the size and
    offset, but for some this will allow out-of-range access.  This may be a
    security issue, though access to such files is often limited to root.  In any
    case, the validation should remain for safety's sake!)
    
    This was previously reported in Bugzilla as bug 9867.
    
    sysfs should ignore size changes or else refuse them (by returning -EINVAL).
    This patch makes it ignore them.
    
    Signed-off-by: Ben Hutchings <bhutchings at solarflare.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

commit e0066c4ea9ffa420cb79814411ff74fdc7b7d98e
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date:   Thu May 1 04:10:02 2008 +0400

    Fix ACPI vs proc_create_data() mismerge
    
    acpi_device_dir() is NULL until all files are createst, so everyting is
    created in straight in /proc/ and creation code warns.
    
    Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 809917903127804c2b2ac76342ab0f29f4b394d3
Author: Pavel Emelyanov <xemul at openvz.org>
Date:   Wed Apr 30 14:49:54 2008 -0700

    ipv6: Compilation fix for compat MCAST_MSFILTER sockopts.
    
    The last hunk from the commit dae50295 (ipv4/ipv6 compat: Fix SSM
    applications on 64bit kernels.) escaped from the compat_ipv6_setsockopt
    to the ipv6_getsockopt (I guess due to patch smartness wrt searching
    for context) thus breaking 32-bit and 64-bit-without-compat compilation.
    
    Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
    Acked-by: David L Stevens <dlstevens at us.ibm.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 895d30935ebe05f192e844792668bf8d19deaae7
Author: Ingo Molnar <mingo at elte.hu>
Date:   Wed Apr 30 23:05:52 2008 +0200

    x86: numaq fix
    
    do not override the existing pci-y rule when adding visws or
    numaq rules.
    
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

commit 6b8e1c7ec4af6defa7045ff3c9b266486124d9c5
Author: Ingo Molnar <mingo at elte.hu>
Date:   Wed Apr 30 20:45:40 2008 +0200

    x86: 8K stacks by default
    
    Switch back to 8K stacks as the safer default. Out-of-memory
    situations are less problematic than silent and hard to debug
    stack corruption.
    
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit cb8ab687c32331fb548c613ae74df574bb0908c1
Author: Andres Salomon <dilinger at queued.net>
Date:   Wed Apr 30 11:30:24 2008 -0400

    x86: ioremap ram check fix
    
    bdd3cee2e4b7279457139058615ced6c2b41e7de (x86: ioremap(), extend check
    to all RAM pages) breaks OLPC's ioremap call.  The ioremap that OLPC uses is:
    
            romsig = ioremap(0xffffffc0, 16);
    
    The commit that breaks it is basically:
    
    -       for (pfn = phys_addr >> PAGE_SHIFT; pfn < max_pfn_mapped &&
    -            (pfn << PAGE_SHIFT) < last_addr; pfn++) {
    +       for (pfn = phys_addr >> PAGE_SHIFT;
    +                               (pfn << PAGE_SHIFT) < last_addr; pfn++) {
    +
    
    Previously, the 'pfn < max_pfn_mapped' check would've caused us to not
    enter the loop.  Removing that check means we loop infinitely.  The
    reason for that is because pfn is 0xfffff, and last_addr is 0xffffffcf.
    The remaining check that is used to exit the loop is not sufficient;
    when pfn<<PAGE_SHIFT is 0xfffff000, that is less than 0xffffffcf; when
    we increment pfn and it overflows (pfn == 0x100000), pfn<<PAGE_SHIFT
    ends up being 0.  That, of course, is less than last_addr.  In effect,
    pfn<<PAGE_SHIFT is never lower than last_addr.
    
    The simple fix for this is to limit the last_addr check to the PAGE_MASK;
    a patch is below.
    
    Signed-off-by: Andres Salomon <dilinger at debian.org>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit 5f464707c8c18fccd3c6278ad46ac94b5cf15a98
Author: Hugh Dickins <hugh at veritas.com>
Date:   Wed Apr 30 16:17:46 2008 +0100

    x86: fix HT cpu booting on 32-bit
    
    Since recent smpboot 32/64-bit merge, my dual Xeon with HT has been
    booting only 2 of its 4 cpus (when running an i386 kernel; but x86_64
    is okay).  J.A. Magallón reports the same.
    
     native_cpu_up: bad cpu 2
     native_cpu_up: bad cpu 3
    
    The mach-default cpu_present_to_apicid() was just returning cpu number
    (2, 3) instead of apicid (6, 7): looks like we now need the x86_64 code
    even for the i386 case.
    
    Comparing with other versions of cpu_present_to_apicid(), it seems a
    good idea to include an NR_CPUS test too, since cpu_present() doesn't
    include that; but that wasn't a problem here, and may no problem at all.
    
    Prior to that smpboot merge, my Xeon booted the two HT siblings on one
    physical first, then the two siblings on the other physical after - when
    i386, but alternated them when x86_64.  Since the merge, the x86_64
    sequence is unchanged, but the i386 sequence is now like x86_64.
    
    I prefer this consistency, and I prefer the new sequence: booting with
    maxcpus=2 then uses the independent physicals without HT sharing.
    
    Signed-off-by: Hugh Dickins <hugh at veritas.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit 5de8f68b43229cce3d457ca9ac6dab8372a35f18
Author: Ingo Molnar <mingo at elte.hu>
Date:   Wed Apr 30 10:29:13 2008 +0200

    x86: optimize inlining off
    
    default to inline optimizing off.
    
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit acbaa93e3d38db0e67b070d97598f87a7a6779da
Author: Ingo Molnar <mingo at elte.hu>
Date:   Wed Apr 30 08:58:27 2008 +0200

    x86: CONFIG_X86_ELAN fix
    
    move the X86_CPU section out of the !X86_ELAN branch.
    
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit c9af1e33231912cedae3e49e56621b6c765e57fe
Author: Ingo Molnar <mingo at elte.hu>
Date:   Wed Apr 30 08:48:45 2008 +0200

    x86: Kconfig fix
    
    Andrew noticed that OPTIMIZE_INLINING appeared in the toplevel
    menu - fix it.
    
    Reported-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 de33c442ed2a465d2d7804b26dafd2eec067aa34
Author: Suresh Siddha <suresh.b.siddha at intel.com>
Date:   Fri Apr 25 17:07:22 2008 -0700

    x86 PAT: fix performance drop for glx, use UC minus for ioremap(), ioremap_nocache() and pci_mmap_page_range()
    
    Use UC_MINUS for ioremap(), ioremap_nocache() instead of strong UC.
    Once all the X drivers move to ioremap_wc(), we can go back to strong
    UC semantics for ioremap() and ioremap_nocache().
    
    To avoid attribute aliasing issues, pci_mmap_page_range() will also
    use UC_MINUS for default non write-combining mapping request.
    
    Next steps:
    	a) change all the video drivers using ioremap() or ioremap_nocache()
    	   and adding WC MTTR using mttr_add() to ioremap_wc()
    
    	b) for strict usage, we can go back to strong uc semantics
    	   for ioremap() and ioremap_nocache() after some grace period for
    	   completing step-a.
    
    	c) user level X server needs to use the appropriate method for setting
    	   up WC mapping (like using resourceX_wc sysfs file instead of
    	   adding MTRR for WC and using /dev/mem or resourceX under /sys)
    
    Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit b9b39bfba5b0de3418305f01cfa7bc55a16004e1
Author: Sam Ravnborg <sam at ravnborg.org>
Date:   Tue Apr 29 12:48:15 2008 +0200

    x86: use defconfigs from x86/configs/*
    
    Daniel Drake <dsd at gentoo.org> reported:
    
    In 2.6.23, if you unpacked a kernel source tarball and then
    ran "make menuconfig" you'd be presented with this message:
        # using defaults found in arch/i386/defconfig
    
    and the default options would be set.
    
    The same thing in 2.6.24 does not give you any "using defaults" message, and
    the default config options within menuconfig are rather blank (e.g. no PCI
    support). You can work around this by explicitly running "make defconfig"
    before menuconfig, but it would be nice to have the behaviour the way it was
    for 2.6.23 (and the way it still is for other archs).
    
    Fixed by adding a x86 specific defconfig list to Kconfig.
    
    Fixes: http://bugzilla.kernel.org/show_bug.cgi?id=10470
    Tested-by: dsd at gentoo.org
    Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit 1dcf83fd0c42525dd36cfeb61fe0bfb12113c6b3
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Tue Apr 29 14:20:23 2008 +0100

    toshiba: use ioremap_cached
    
    The switch of ioremap to default to uncached doesn't break this driver
    but it does needlessly slow it down as BIOS space is cachable and this
    driver is quite happy scanning cached ROM space.
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit 2544a873ab2a1ee9196bb2f4b12c3afd44ec8a06
Author: Ingo Molnar <mingo at elte.hu>
Date:   Tue Apr 29 12:04:51 2008 +0200

    revert: "x86: ioremap(), extend check to all RAM pages"
    
    Vegard Nossum reported a large (150 seconds) boot delay during bootup,
    and bisected it to "x86: ioremap(), extend check to all RAM pages"
    (commit bdd3cee2e4b). Revert this commit for now.
    
    Bisected-by: Vegard Nossum <vegard.nossum at gmail.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit a4c863f497e640e049083e1b3a1f3723cb766da9
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date:   Mon Apr 28 11:05:07 2008 -0700

    x86: don't bother printing compat vdso address
    
    The kernel prints the compat vdso address regardless of whether compat
    vdso mode is enabled or not, which is confusing.  Given that this
    isn't very interesting information anyway, just remove the printk.
    
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
    Cc: Gerhard Mack <gmack at innerfire.net>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit f6c133f7d5ee3b82f5b34b988e897ea38cd8219c
Author: Andi Kleen <andi at firstfloor.org>
Date:   Fri Apr 25 11:45:26 2008 +0200

    fix: x86: support for new UV apic
    
    Don't warn in read_apic_id() when preemptible but only one CPU online.
    
    Signed-off-by: Andi Kleen <andi at firstfloor.org>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit 575ca7351bf0546919060071797cccb4a05960df
Author: Vegard Nossum <vegard.nossum at gmail.com>
Date:   Fri Apr 25 21:02:34 2008 +0200

    x86: fix early-BUG message
    
    The .asciz directive takes any number of strings, but each one is zero-
    terminated, and string pasting is not done as in C. That results in only the
    first line being output.
    
    Replace .asciz with multiple .ascii directives and terminate with .asciz.
    
    Signed-off-by: Vegard Nossum <vegard.nossum at gmail.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit b4cdc4300de6ff7b8b366f23bed17c7d59c8117c
Author: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Date:   Mon Apr 28 03:15:58 2008 +0400

    x86: iommu_sac_force can become static
    
    The iommu_sac_force variable is needlessly defined global,
    and this patch makes it static. Additionally, this variable
    needs not be explicitly initialized.
    
    Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit 4412620fc2772af0fc7a94b2cfa28792a46b4fc8
Author: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
Date:   Mon Apr 28 03:15:59 2008 +0400

    x86: add proper header for reboot_force
    
    This patch fixes one sparse warning by including the appropriate
    header for the reboot_force symbol.
    
    Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit 3e8f7e35f3fd17eadef44e4679abb39a3806cf01
Author: Ingo Molnar <mingo at elte.hu>
Date:   Mon Apr 28 10:46:58 2008 +0200

    x86 VISWS: build fix
    
    the 'reboot_force' flag is a notion that non-PC subarchitectures do
    not have.
    
    also, unify the X86_BIOS_REBOOT option between 32-bit and 64-bit
    and get rid of a few unnecessary Kconfig and Makefile complications
    that way.
    
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit ed5e233284bc4aff965df7351da8426aa188c8f9
Author: Ingo Molnar <mingo at elte.hu>
Date:   Sun Apr 27 23:21:03 2008 +0200

    x86, voyager: fix ioremap_nocache()
    
    James Bottomley reported that the following commit:
    
    | commit 6371b495991debfd1417b17c2bc4f7d7bae05739
    | Author: Ingo Molnar <mingo at elte.hu>
    | Date:   Wed Jan 30 13:33:40 2008 +0100
    |
    |     x86: change ioremap() to default to uncached
    
    broke Voyager.
    
    James says:
    
    " it broke a class of voyager machines: those which
      rely on the quad interrupt controller (QIC).  The precis of why they
      broke is because the QIC does IPIs (or CPIs in its terminology) via
      cache line interference: you interrupt a processor by moving a
      designated memory area to write exclusive in the cache (by simply
      writing to the line) and the CPU acks the interrupt by moving it back to
      read shared (by reading from it).  That area, is, of course, mapped by
      ioremap, so reversing the ioremap semantics and adding the uncached bit
      completely breaks the QIC. "
    
    Sorry about that!
    
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit fc3fbc45098e5aff59f06962dee79aba2e11430d
Author: Ingo Molnar <mingo at elte.hu>
Date:   Sun Apr 27 14:04:14 2008 +0200

    hpet: fix
    
    Al Viro pointed out that there's a missing readl() of timer->hpet_config,
    found by Sparse.
    
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit b9e017e04be672244502a0567fb752973556f388
Author: Adrian Bunk <bunk at kernel.org>
Date:   Mon Apr 21 11:51:44 2008 +0300

    x86: unexport kmap_atomic_to_page
    
    This patch removes the no longer used export of kmap_atomic_to_page.
    
    Signed-off-by: Adrian Bunk <bunk at kernel.org>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit 9cbfe20068878d597cfa064be9cab871875bea60
Author: Adrian Bunk <bunk at kernel.org>
Date:   Mon Apr 21 11:47:46 2008 +0300

    x86: remove Xgt_desc_struct
    
    The comment says it should have been removed in 2.6.25.
    
    Signed-off-by: Adrian Bunk <bunk at kernel.org>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>

commit 6d3c51110819918617d9e2d1da7ff53f4b2c1187
Author: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Date:   Wed Apr 30 16:50:55 2008 +0900

    [IA64] fix section mismatch in arch/ia64/kernel/topology.c
    
    This patch silences:
    
    	WARNING: vmlinux.o(.text+0x44672): Section mismatch in
    	reference from the function arch_register_cpu() to the
    	function .cpuinit.text:register_cpu()
    
    Changes are based on codes in arch/x86/kernel/topology.c
    
    Signed-off-by: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
    Signed-off-by: Tony Luck <tony.luck at intel.com>

commit 9d4efae68714e24d40b628461bc4182e330969b1
Author: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Date:   Wed Apr 30 16:50:22 2008 +0900

    [IA64] fix section mismatch in arch/ia64/kernel/palinfo.c
    
    This patch removes following warning:
    
    	WARNING: vmlinux.o(.exit.text+0xb1): Section mismatch in
    	reference from the function palinfo_exit() to the variable
    	.cpuinit.data:palinfo_cpu_notifier
    
    Signed-off-by: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
    Signed-off-by: Tony Luck <tony.luck at intel.com>

commit 751fc7849d623bcd5e77fd494b01662599a8dccf
Author: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Date:   Wed Apr 30 16:50:43 2008 +0900

    [IA64] fix section mismatch in arch/ia64/kernel/irq.c
    
    This patch shuts up the following:
    
    	WARNING: vmlinux.o(.text+0x7102): Section mismatch in
    	reference from the function fixup_irqs() to the function
    	.devinit.text:ia64_disable_timer()
    
    Removing ia64_disable_timer() is safe because there are no functions
    calling it other than the fixup_irqs(),
    
    Signed-off-by: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
    Signed-off-by: Tony Luck <tony.luck at intel.com>

commit c5b5a5993234d4db2079e57e456bda5278ef59cf
Author: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Date:   Wed Apr 30 16:51:06 2008 +0900

    [IA64] fix section mismatch in arch/ia64/kernel/acpi.c
    
    This patch kills:
    
    	WARNING: vmlinux.o(.text+0x1702): Section mismatch in
    	reference from the function acpi_register_ioapic() to the
    	function .devinit.text:iosapic_init()
    
    Signed-off-by: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
    Signed-off-by: Tony Luck <tony.luck at intel.com>

commit 08acd4f8af42affd8cbed81cc1b69fa12ddb213f
Merge: ccf2779544eecfcc5447e2028d1029b6d4ff7bb6 008238b54ac2350babf195084ecedbcf7851a202
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Apr 30 11:52:52 2008 -0700

    Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (179 commits)
      ACPI: Fix acpi_processor_idle and idle= boot parameters interaction
      acpi: fix section mismatch warning in pnpacpi
      intel_menlo: fix build warning
      ACPI: Cleanup: Remove unneeded, multiple local dummy variables
      ACPI: video - fix permissions on some proc entries
      ACPI: video - properly handle errors when registering proc elements
      ACPI: video - do not store invalid entries in attached_array list
      ACPI: re-name acpi_pm_ops to acpi_suspend_ops
      ACER_WMI/ASUS_LAPTOP: fix build bug
      thinkpad_acpi: fix possible NULL pointer dereference if kstrdup failed
      ACPI: check a return value correctly in acpi_power_get_context()
      #if 0 acpi/bay.c:eject_removable_drive()
      eeepc-laptop: add hwmon fan control
      eeepc-laptop: add backlight
      eeepc-laptop: add base driver
      ACPI: thinkpad-acpi: bump up version to 0.20
      ACPI: thinkpad-acpi: fix selects in Kconfig
      ACPI: thinkpad-acpi: use a private workqueue
      ACPI: thinkpad-acpi: fluff really minor fix
      ACPI: thinkpad-acpi: use uppercase for "LED" on user documentation
      ...
    
    Fixed conflicts in drivers/acpi/video.c and drivers/misc/intel_menlow.c
    manually.

commit 008238b54ac2350babf195084ecedbcf7851a202
Merge: 96916090f488986a4ebb8e9ffa6a3b50881d5ccd dfd2e1b4e6eb46ff59c7e1c1111c967b8b5981c1
Author: Len Brown <len.brown at intel.com>
Date:   Wed Apr 30 13:59:05 2008 -0400

    Merge branch 'pnp' into release

commit 96916090f488986a4ebb8e9ffa6a3b50881d5ccd
Merge: 75a44ce00b312f57264f42a0a985d17cd9994b98 729b2bdbfa19dd9be98dbd49caf2773b3271cc24 2f67a0695dc389247c05041b05d2a2b06fc102a3 51ae796f7fa1d8034252628572053f477bc29913 ce52ddf58cbc2c40f5f08d37d2217945e4d5adf3 e1faa9da284d14487ed4280b4e87cfde8e1539af 36a913586597cab1cd565e9bf348d037f0df955b 9448b0d43e5509c6b7baca02510a92ef2de6e328 99bda83e8b3140b7e81572a5aabc7dedb455b272 1071695f17daf050638e0bc550db647f8237c3bb 7aa0f1a8b1f7072990c9dc37f238c96dc6d78911 68f12ae5d778279e13e406d3913c74c592307770 66fb9d120e91050093b8ce4c1daa2e440660152b
Author: Len Brown <len.brown at intel.com>
Date:   Wed Apr 30 13:58:00 2008 -0400

    Merge branches 'release', 'acpica', 'bugzilla-10224', 'bugzilla-9772', 'bugzilla-9916', 'ec', 'eeepc', 'idle', 'misc', 'pm-legacy', 'sysfs-links-2.6.26', 'thermal', 'thinkpad' and 'video' into release

commit 36a913586597cab1cd565e9bf348d037f0df955b
Author: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
Date:   Wed Apr 30 13:57:15 2008 -0400

    ACPI: Fix acpi_processor_idle and idle= boot parameters interaction
    
    acpi_processor_idle and "idle=" boot parameter interaction is broken.
    The problem is that, at boot time acpi driver is checking for "idle=" boot
    option and not registering the acpi idle handler. But, when there is a CST
    changed callback (typically when switching AC <-> battery or suspend-resume)
    there are no checks for boot_option_idle_override and acpi idle handler tries
    to get installed with nasty side effects.
    
    With CPU_IDLE configured this issue causes results in a nasty oops on CST
    change callback and without CPU_IDLE there is no oops, but boot option
    of "idle=" gets ignored and acpi idle handler gets installed.
    
    Change the behavior to not do anything in acpi idle handler when there is a
    "idle=" boot option.
    
    Note that the problem is only there when "idle=" boot option is used.
    
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
    Signed-off-by: Len Brown <len.brown at intel.com>

commit 9448b0d43e5509c6b7baca02510a92ef2de6e328
Author: Sam Ravnborg <sam at ravnborg.org>
Date:   Tue Apr 29 22:52:01 2008 +0200

    acpi: fix section mismatch warning in pnpacpi
    
    Fix following section mismatch warning:
    WARNING: vmlinux.o(.text+0x153d69): Section mismatch in reference from the function is_exclusive_device() to the variable .init.data:excluded_id_list
    
    is_exclusive_device is only used from __init context so document
    this with the __init annotation and get rid of the warning.
    
    Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
    Signed-off-by: Len Brown <len.brown at intel.com>

commit ccf2779544eecfcc5447e2028d1029b6d4ff7bb6
Merge: 7cece14acd063dd1c4e8933461d44ec6a5a5517b fd403dc84f29aee613d13bde5656ba74cdee1e7b
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Apr 30 09:22: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] soc - neo1973_wm8753.c add suspend and shutdown hooks for lm4857 chip
      [ALSA] soc - neo1973_wm8753.c change maintainer contact info
      [ALSA] soc - neo1973_wm8753.c cleanup checkpatch issues
      [ALSA] soc - ln2440sbc_alc650 - Fix checkpatch warnings
      [ALSA] soc - s3c24xx-pcm - Fix checkpatch warnings
      [ALSA] soc - s3c2443-ac97 - Fix checkpatch warnings
      [ALSA] soc - wm8753 - Clean up checkpatch warnings

commit fd403dc84f29aee613d13bde5656ba74cdee1e7b
Author: Graeme Gregory <graeme at openmoko.org>
Date:   Wed Apr 30 20:26:45 2008 +0200

    [ALSA] soc - neo1973_wm8753.c add suspend and shutdown hooks for lm4857 chip
    
    Patch taken from the openmoko bugtracker
    http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=781
    
    This patch adds Suspend/Resume and Shutdown support for the lm4857 to
    the driver.
    
    Signed-off-by: Graeme Gregory <graeme at openmoko.org>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 443590e6f1823cd4bc1199cc658074bc3e30acbf
Author: Graeme Gregory <graeme at openmoko.org>
Date:   Wed Apr 30 20:25:23 2008 +0200

    [ALSA] soc - neo1973_wm8753.c change maintainer contact info
    
    I have moved workplaces since I originally wrote this driver so update
    the contact info for new employers.
    
    Signed-off-by: Graeme Gregory <graeme at openmoko.org>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 8ba02ace943ce956606d1f6f2a5aad9498798c31
Author: Graeme Gregory <graeme at openmoko.org>
Date:   Wed Apr 30 20:24:54 2008 +0200

    [ALSA] soc - neo1973_wm8753.c cleanup checkpatch issues
    
    Clean up a few issues with the file that checkpatch noted, no functionality
    changes.
    
    Signed-off-by: Graeme Gregory <graeme at openmoko.org>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 854e4af258e214345d675dc406d24769e32a04c8
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date:   Wed Apr 30 17:19:57 2008 +0200

    [ALSA] soc - ln2440sbc_alc650 - Fix checkpatch warnings
    
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 5111c0753486fffde14de2b207e46760b9c05fd0
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date:   Wed Apr 30 17:19:32 2008 +0200

    [ALSA] soc - s3c24xx-pcm - Fix checkpatch warnings
    
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit ccfdd6c2b2ad3f32c02175007a66c82e2233b75c
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date:   Wed Apr 30 17:19:07 2008 +0200

    [ALSA] soc - s3c2443-ac97 - Fix checkpatch warnings
    
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 60fc684adfed810fc36b41778aca8de467fc3206
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date:   Wed Apr 30 17:18:43 2008 +0200

    [ALSA] soc - wm8753 - Clean up checkpatch warnings
    
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 7cece14acd063dd1c4e8933461d44ec6a5a5517b
Merge: 95dfec6ae1cb8c03406aac612a5642cbddb676b3 8cd0ae3acc0154f3f9dfa1b4a2b7c02c271533f6
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Apr 30 08:46:16 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: remove duplicated include
      sparc: Add kgdb support.
      kgdbts: Sparc needs sstep emulation.
      sparc32: Kill smp_message_pass() and related code.
      sparc64: Kill PIL_RESERVED, unused.
      sparc64: Split entry.S up into seperate files.

commit 95dfec6ae1cb8c03406aac612a5642cbddb676b3
Merge: ae3a0064e6d69068b1c9fd075095da062430bda9 159131149c2f56c1da5ae5e23ab9d5acef4916d1
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Apr 30 08:45:48 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: (53 commits)
      tcp: Overflow bug in Vegas
      [IPv4] UFO: prevent generation of chained skb destined to UFO device
      iwlwifi: move the selects to the tristate drivers
      ipv4: annotate a few functions __init in ipconfig.c
      atm: ambassador: vcc_sf semaphore to mutex
      MAINTAINERS: The socketcan-core list is subscribers-only.
      netfilter: nf_conntrack: padding breaks conntrack hash on ARM
      ipv4: Update MTU to all related cache entries in ip_rt_frag_needed()
      sch_sfq: use del_timer_sync() in sfq_destroy()
      net: Add compat support for getsockopt (MCAST_MSFILTER)
      net: Several cleanups for the setsockopt compat support.
      ipvs: fix oops in backup for fwmark conn templates
      bridge: kernel panic when unloading bridge module
      bridge: fix error handling in br_add_if()
      netfilter: {nfnetlink,ip,ip6}_queue: fix skb_over_panic when enlarging packets
      netfilter: x_tables: fix net namespace leak when reading /proc/net/xxx_tables_names
      netfilter: xt_TCPOPTSTRIP: signed tcphoff for ipv6_skip_exthdr() retval
      tcp: Limit cwnd growth when deferring for GSO
      tcp: Allow send-limited cwnd to grow up to max_burst when gso disabled
      [netdrvr] gianfar: Determine TBIPA value dynamically
      ...

commit ae3a0064e6d69068b1c9fd075095da062430bda9
Author: Ingo Molnar <mingo at elte.hu>
Date:   Wed Apr 30 00:15:31 2008 +0200

    inlining: do not allow gcc below version 4 to optimize inlining
    
    fix the condition to match intention: always use the old inlining
    behavior on all gcc versions below 4.
    
    this should solve the UML build problem.
    
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 53809d7eaef9503eb2589babdaba5ef0b661bb14
Author: S.Çağlar Onur <caglar at pardus.org.tr>
Date:   Wed Apr 30 15:29:02 2008 +0300

    Update .mailmap
    
    I realize some of the maintainers email clients and/or scripts cannot
    handle UTF-8 encoded names properly, as a result your ChangeLogs
    displays me as two different person :).
    
    Following patch adds correctly encoded name of mine into .mailmap, to
    prevent appearing it not to be so or badly displayed.
    
    Signed-off-by: S.Çağlar Onur <caglar at pardus.org.tr>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit d67c6f869c0a7f275689855161c93d714197e052
Merge: ec31b2124158f60c515ed84bd5e40db1a883c7b6 1175cdc670f2d4197b033f823b32435031a6daa8
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Apr 30 08:38:30 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] use generic sys_ptrace
      [S390] Remove self ptrace IEEE_IP hack.
      [S390] Convert to SPARSEMEM & SPARSEMEM_VMEMMAP
      [S390] System z large page support.
      [S390] Convert machine feature detection code to C.
      [S390] vmemmap: use clear_table to initialise page tables.
      [S390] Move stfl to system.h and delete duplicated version.
      [S390] uaccess_mvcos: #ifdef config dependent code.
      [S390] cpu topology: Fix possible deadlock.
      [S390] Add topology_core_siblings to topology.h
      [S390] cio: Make isc handling more robust.
      [S390] remove -traditional
      [S390] Automatically detect added cpus.
      [S390] smp: Fix locking order.
      [S390] Add missing ifndef/define to include/asm-s390/sysinfo.h.
      [S390] Move show_regs to traps.c.
      [S390] cio: Use strict_strtoul() for attributes.

commit ec31b2124158f60c515ed84bd5e40db1a883c7b6
Merge: ca72cddfcb6afd75a808da4f027325fa63a1b856 eabd90944b3a00766e84da3d117ea0f3e0a3b1a3
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Wed Apr 30 08:37:40 2008 -0700

    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
    
    * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
      [POWERPC] Fix crashkernel= handling when no crashkernel= specified
      [POWERPC] Make emergency stack safe for current_thread_info() use
      [POWERPC] spufs: add .gitignore for spu_save_dump.h & spu_restore_dump.h
      [POWERPC] spufs: trace spu_acquire_saved events
      [POWERPC] spufs: fix marker name for find_victim
      [POWERPC] spufs: add marker for destroy_spu_context
      [POWERPC] spufs: add sputrace marker parameter names
      [POWERPC] spufs: add context switch notification log
      [POWERPC] mpc5200: defconfigs for CM5200, Lite5200B, Motion-PRO and TQM5200
      [POWERPC] mpc5200: Switch mpc5200 dts files to dts-v1 format
      [POWERPC] mpc5200: Fix FEC error handling on FIFO errors
      [POWERPC] mpc5200: add Phytec pcm030 board support
      [POWERPC] mpc5200: add gpiolib support for mpc5200
      [POWERPC] mpc5200: add interrupt type function
      [POWERPC] mpc5200: Fix unterminated of_device_id table

commit ca72cddfcb6afd75a808da4f027325fa63a1b856
Author: Ingo Molnar <mingo at elte.hu>
Date:   Wed Apr 30 11:50:11 2008 +0200

    fix drivers/media/common/tuners/ build bug
    
    x86.git randconfig testing found a build failure on latest -git:
    
     drivers/built-in.o: In function `set_type':
     tuner-core.c:(.text+0x2a9a26): undefined reference to `tea5761_attach'
     tuner-core.c:(.text+0x2a9d05): undefined reference to `tda9887_attach'
     tuner-core.c:(.text+0x2a9d51): undefined reference to `xc2028_attach'
     tuner-core.c:(.text+0x2a9e22): undefined reference to `tda829x_attach'
     tuner-core.c:(.text+0x2a9e3f): undefined reference to `microtune_attach'
     drivers/built-in.o: In function `tuner_probe':
     tuner-core.c:(.text+0x2aa18a): undefined reference to `tda829x_probe'
     tuner-core.c:(.text+0x2aa302): undefined reference to `tea5761_autodetection'
    
    with the following config:
    
     http://redhat.com/~mingo/misc/config-Wed_Apr_30_10_21_40_CEST_2008.bad
    
    the problem is caused by the drivers/media/common/tuners/ subdirectory
    not being part of the kbuild hierarchy anymore, due to commit
    7c91f0624 ("V4L/DVB(7767): Move tuners to common/tuners").
    
    this seems similar to the problem also reported by Mike Galbraith.
    
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Acked-by: Sam Ravnborg <sam at ravnborg.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 5167464446e527b5a3b5618ba0baff93048bcbbe
Author: Andrew Morton <akpm at linux-foundation.org>
Date:   Wed Apr 30 00:55:17 2008 -0700

    revert "memory hotplug: allocate usemap on the section with pgdat"
    
    This:
    
    commit 86f6dae1377523689bd8468fed2f2dd180fc0560
    Author: Yasunori Goto <y-goto at jp.fujitsu.com>
    Date:   Mon Apr 28 02:13:33 2008 -0700
    
        memory hotplug: allocate usemap on the section with pgdat
    
        Usemaps are allocated on the section which has pgdat by this.
    
        Because usemap size is very small, many other sections usemaps are allocated
        on only one page.  If a section has usemap, it can't be removed until removing
        other sections.  This dependency is not desirable for memory removing.
    
        Pgdat has similar feature.  When a section has pgdat area, it must be the last
        section for removing on the node.  So, if section A has pgdat and section B
        has usemap for section A, Both sections can't be removed due to dependency
        each other.
    
        To solve this issue, this patch collects usemap on same section with pgdat.
        If other sections doesn't have any dependency, this section will be able to be
        removed finally.
    
        Signed-off-by: Yasunori Goto <y-goto at jp.fujitsu.com>
        Cc: Badari Pulavarty <pbadari at us.ibm.com>
        Cc: Yinghai Lu <yhlu.kernel at gmail.com>
        Cc: Yasunori Goto <y-goto at jp.fujitsu.com>
        Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
        Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
    
    broke davem's sparc64 bootup.  Revert it while we work out what went wrong.
    
    Cc: Yasunori Goto <y-goto at jp.fujitsu.com>
    Cc: Badari Pulavarty <pbadari at us.ibm.com>
    Cc: Yinghai Lu <yhlu.kernel at gmail.com>
    Cc: "David S. Miller" <davem at davemloft.net>
    Cc: 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 3a902c5f6851cd0b64c33efaa3bd57aa27a82efb
Author: Nick Piggin <npiggin at suse.de>
Date:   Wed Apr 30 00:55:16 2008 -0700

    mm: fix warning on memory offline
    
    KAMEZAWA Hiroyuki found a warning message in the buffer dirtying code that
    is coming from page migration caller.
    
    WARNING: at fs/buffer.c:720 __set_page_dirty+0x330/0x360()
    Call Trace:
     [<a000000100015220>] show_stack+0x80/0xa0
     [<a000000100015270>] dump_stack+0x30/0x60
     [<a000000100089ed0>] warn_on_slowpath+0x90/0xe0
     [<a0000001001f8b10>] __set_page_dirty+0x330/0x360
     [<a0000001001ffb90>] __set_page_dirty_buffers+0xd0/0x280
     [<a00000010012fec0>] set_page_dirty+0xc0/0x260
     [<a000000100195670>] migrate_page_copy+0x5d0/0x5e0
     [<a000000100197840>] buffer_migrate_page+0x2e0/0x3c0
     [<a000000100195eb0>] migrate_pages+0x770/0xe00
    
    What was happening is that migrate_page_copy wants to transfer the PG_dirty
    bit from old page to new page, so what it would do is set_page_dirty(newpage).
    However set_page_dirty() is used to set the entire page dirty, wheras in
    this case, only part of the page was dirty, and it also was not uptodate.
    
    Marking the whole page dirty with set_page_dirty would lead to corruption or
    unresolvable conditions -- a dirty && !uptodate page and dirty && !uptodate
    buffers.
    
    Possibly we could just ClearPageDirty(oldpage); SetPageDirty(newpage);
    however in the interests of keeping the change minimal...
    
    Signed-off-by: Nick Piggin <npiggin at suse.de>
    Tested-by: 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 969a19f1c405a8e9d15ceb9e75e3f4a321aaf56f
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date:   Wed Apr 30 00:55:14 2008 -0700

    Drop the exporting of empty <linux/byteorder/generic.h>
    
    Fix up the contents of <linux/byteorder/> so that it doesn't export a
    content-free generic.h to user space.  This involves:
    
    * Removing the __KERNEL__ tests from generic.h and dropping it from
      Kbuild.
    * Wrapping the inclusions of generic.h in both big_endian.h and
      little_endian.h in __KERNEL__ tests.
    * Shifting big_endian.h and little_endian.h from header-y to
      unifdef-y in Kbuild.
    
    Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit ae50884f66fc93aa713feade8f87c03471241275
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date:   Wed Apr 30 00:55:13 2008 -0700

    remove __KERNEL__ tests of unexported headers under asm-generic/
    
    Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 735643ee6cc5249bfac07fcad0946a5e7aff4423
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date:   Wed Apr 30 00:55:12 2008 -0700

    Remove "#ifdef __KERNEL__" checks from unexported headers
    
    Remove the "#ifdef __KERNEL__" tests from unexported header files in
    linux/include whose entire contents are wrapped in that preprocessor
    test.
    
    Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
    Cc: David Woodhouse <dwmw2 at infradead.org>
    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 71cc2c2152170b8166f59abb0604dc62073aeb92
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Wed Apr 30 00:55:10 2008 -0700

    serial: replace remaining __FUNCTION__ occurrences
    
    __FUNCTION__ is gcc-specific, use __func__
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit bf9d89295233ae2ba7b312c78ee5657307b09f4c
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Wed Apr 30 00:55:10 2008 -0700

    drivers/char: replace remaining __FUNCTION__ occurrences
    
    __FUNCTION__ is gcc-specific, use __func__
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 8e24eea728068bbeb6a3c500b848f883a20bf225
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Wed Apr 30 00:55:09 2008 -0700

    fs: replace remaining __FUNCTION__ occurrences
    
    __FUNCTION__ is gcc-specific, use __func__
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 530b6412786d7f83592c1a8e2445541ed73fca76
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Wed Apr 30 00:55:09 2008 -0700

    afs: replace remaining __FUNCTION__ occurrences
    
    __FUNCTION__ is gcc-specific, use __func__
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 810304db75b0ca4e6ef071f86aa3e85fdaddee5e
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Wed Apr 30 00:55:08 2008 -0700

    lib: replace remaining __FUNCTION__ occurrences
    
    __FUNCTION__ is gcc specific, use __func__
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit af1f16d08f38ab6f17b5760e6ec9d2b7d3a5ff1a
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Wed Apr 30 00:55:08 2008 -0700

    kernel: replace remaining __FUNCTION__ occurrences
    
    __FUNCTION__ is gcc-specific, use __func__
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.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 d40cee245ff6ad05d3448401d7320be82c1c5af1
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Wed Apr 30 00:55:07 2008 -0700

    mm: remove remaining __FUNCTION__ occurrences
    
    __FUNCTION__ is gcc-specific, use __func__
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit d7853d1f8932c847a8d7b3b38e6baedf77148cfb
Author: Laurent Vivier <Laurent.Vivier at bull.net>
Date:   Wed Apr 30 00:55:06 2008 -0700

    brd: modify ramdisk device to be able to manage partitions
    
    This patch adds partition management for Block RAM Device (BRD).
    
    This patch is done to keep in sync BRD and loop device drivers.
    
    This patch adds a parameter to the module, max_part, to specify
    the maximum number of partitions per RAM device.
    
    Example:
    
    # modprobe brd max_part=63
    # ls -l /dev/ram*
    brw-rw---- 1 root disk 1,   0 2008-04-03 13:39 /dev/ram0
    brw-rw---- 1 root disk 1,  64 2008-04-03 13:39 /dev/ram1
    brw-rw---- 1 root disk 1, 640 2008-04-03 13:39 /dev/ram10
    brw-rw---- 1 root disk 1, 704 2008-04-03 13:39 /dev/ram11
    brw-rw---- 1 root disk 1, 768 2008-04-03 13:39 /dev/ram12
    brw-rw---- 1 root disk 1, 832 2008-04-03 13:39 /dev/ram13
    brw-rw---- 1 root disk 1, 896 2008-04-03 13:39 /dev/ram14
    brw-rw---- 1 root disk 1, 960 2008-04-03 13:39 /dev/ram15
    brw-rw---- 1 root disk 1, 128 2008-04-03 13:39 /dev/ram2
    brw-rw---- 1 root disk 1, 192 2008-04-03 13:39 /dev/ram3
    brw-rw---- 1 root disk 1, 256 2008-04-03 13:39 /dev/ram4
    brw-rw---- 1 root disk 1, 320 2008-04-03 13:39 /dev/ram5
    brw-rw---- 1 root disk 1, 384 2008-04-03 13:39 /dev/ram6
    brw-rw---- 1 root disk 1, 448 2008-04-03 13:39 /dev/ram7
    brw-rw---- 1 root disk 1, 512 2008-04-03 13:39 /dev/ram8
    brw-rw---- 1 root disk 1, 576 2008-04-03 13:39 /dev/ram9
    # fdisk /dev/ram0
    Device contains neither a valid DOS partition table, nor Sun, SGI or OSF disklabel
    Building a new DOS disklabel. Changes will remain in memory only,
    until you decide to write them. After that, of course, the previous
    content won't be recoverable.
    
    Warning: invalid flag 0x0000 of partition table 4 will be corrected by w(rite)
    
    Command (m for help): o
    Building a new DOS disklabel. Changes will remain in memory only,
    until you decide to write them. After that, of course, the previous
    content won't be recoverable.
    
    Warning: invalid flag 0x0000 of partition table 4 will be corrected by w(rite)
    
    Command (m for help): n
    Command action
       e   extended
       p   primary partition (1-4)
    p
    Partition number (1-4): 1
    First cylinder (1-2, default 1): 1
    Last cylinder or +size or +sizeM or +sizeK (1-2, default 2): 2
    
    Command (m for help): w
    The partition table has been altered!
    
    Calling ioctl() to re-read partition table.
    Syncing disks.
    # ls -l /dev/ram0*
    brw-rw---- 1 root disk 1, 0 2008-04-03 13:40 /dev/ram0
    brw-rw---- 1 root disk 1, 1 2008-04-03 13:40 /dev/ram0p1
    # mkfs /dev/ram0p1
    mke2fs 1.40-WIP (14-Nov-2006)
    Filesystem label=
    OS type: Linux
    Block size=1024 (log=0)
    Fragment size=1024 (log=0)
    4016 inodes, 16032 blocks
    801 blocks (5.00%) reserved for the super user
    First data block=1
    Maximum filesystem blocks=16515072
    2 block groups
    8192 blocks per group, 8192 fragments per group
    2008 inodes per group
    Superblock backups stored on blocks:
    	8193
    
    Writing inode tables: done
    Writing superblocks and filesystem accounting information: done
    
    This filesystem will be automatically checked every 26 mounts or
    180 days, whichever comes first.  Use tune2fs -c or -i to override.
    # mount /dev/ram0p1 /mnt
    df /mnt
    Filesystem           1K-blocks      Used Available Use% Mounted on
    /dev/ram0p1              15521       138     14582   1% /mnt
    # ls -l /mnt
    total 12
    drwx------ 2 root root 12288 2008-04-03 13:41 lost+found
    # umount /mnt
    # rmmod brd
    
    Signed-off-by: Laurent Vivier <Laurent.Vivier at bull.net>
    Acked-by: Nick Piggin <nickpiggin at yahoo.com.au>
    Cc: Al Viro <viro at zeniv.linux.org.uk>
    Cc: Jens Axboe <jens.axboe at oracle.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 237fc6e7a35076f584b9d0794a5204fe4bd9b9e5
Author: Thomas Gleixner <tglx at linutronix.de>
Date:   Wed Apr 30 00:55:04 2008 -0700

    add hrtimer specific debugobjects code
    
    hrtimers have now dynamic users in the network code.  Put them under
    debugobjects surveillance as well.
    
    Add calls to the generic object debugging infrastructure and provide fixup
    functions which allow to keep the system alive when recoverable problems have
    been detected by the object debugging core code.
    
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
    Cc: Greg KH <greg at kroah.com>
    Cc: Randy Dunlap <randy.dunlap at oracle.com>
    Cc: Kay Sievers <kay.sievers at vrfy.org>
    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 c6f3a97f86a5c97be0ca255976110bb9c3cfe669
Author: Thomas Gleixner <tglx at linutronix.de>
Date:   Wed Apr 30 00:55:03 2008 -0700

    debugobjects: add timer specific object debugging code
    
    Add calls to the generic object debugging infrastructure and provide fixup
    functions which allow to keep the system alive when recoverable problems have
    been detected by the object debugging core code.
    
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
    Acked-by: Ingo Molnar <mingo at elte.hu>
    Cc: Greg KH <greg at kroah.com>
    Cc: Randy Dunlap <randy.dunlap at oracle.com>
    Cc: Kay Sievers <kay.sievers at vrfy.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 691cc54c7d28542434d2b3ee4ddbad6a99312dec
Author: Thomas Gleixner <tglx at linutronix.de>
Date:   Wed Apr 30 00:55:02 2008 -0700

    debugobjects: add documentation
    
    Add a DocBook for debugobjects.
    
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
    Acked-by: Ingo Molnar <mingo at elte.hu>
    Cc: Greg KH <greg at kroah.com>
    Cc: Randy Dunlap <randy.dunlap at oracle.com>
    Cc: Kay Sievers <kay.sievers at vrfy.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 3ac7fe5a4aab409bd5674d0b070bce97f9d20872
Author: Thomas Gleixner <tglx at linutronix.de>
Date:   Wed Apr 30 00:55:01 2008 -0700

    infrastructure to debug (dynamic) objects
    
    We can see an ever repeating problem pattern with objects of any kind in the
    kernel:
    
    1) freeing of active objects
    2) reinitialization of active objects
    
    Both problems can be hard to debug because the crash happens at a point where
    we have no chance to decode the root cause anymore.  One problem spot are
    kernel timers, where the detection of the problem often happens in interrupt
    context and usually causes the machine to panic.
    
    While working on a timer related bug report I had to hack specialized code
    into the timer subsystem to get a reasonable hint for the root cause.  This
    debug hack was fine for temporary use, but far from a mergeable solution due
    to the intrusiveness into the timer code.
    
    The code further lacked the ability to detect and report the root cause
    instantly and keep the system operational.
    
    Keeping the system operational is important to get hold of the debug
    information without special debugging aids like serial consoles and special
    knowledge of the bug reporter.
    
    The problems described above are not restricted to timers, but timers tend to
    expose it usually in a full system crash.  Other objects are less explosive,
    but the symptoms caused by such mistakes can be even harder to debug.
    
    Instead of creating specialized debugging code for the timer subsystem a
    generic infrastructure is created which allows developers to verify their code
    and provides an easy to enable debug facility for users in case of trouble.
    
    The debugobjects core code keeps track of operations on static and dynamic
    objects by inserting them into a hashed list and sanity checking them on
    object operations and provides additional checks whenever kernel memory is
    freed.
    
    The tracked object operations are:
    - initializing an object
    - adding an object to a subsystem list
    - deleting an object from a subsystem list
    
    Each operation is sanity checked before the operation is executed and the
    subsystem specific code can provide a fixup function which allows to prevent
    the damage of the operation.  When the sanity check triggers a warning message
    and a stack trace is printed.
    
    The list of operations can be extended if the need arises.  For now it's
    limited to the requirements of the first user (timers).
    
    The core code enqueues the objects into hash buckets.  The hash index is
    generated from the address of the object to simplify the lookup for the check
    on kfree/vfree.  Each bucket has it's own spinlock to avoid contention on a
    global lock.
    
    The debug code can be compiled in without being active.  The runtime overhead
    is minimal and could be optimized by asm alternatives.  A kernel command line
    option enables the debugging code.
    
    Thanks to Ingo Molnar for review, suggestions and cleanup patches.
    
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Cc: Greg KH <greg at kroah.com>
    Cc: Randy Dunlap <randy.dunlap at oracle.com>
    Cc: Kay Sievers <kay.sievers at vrfy.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 30327acf7846c5eb97c8e31c78317a2918d3e515
Author: Thomas Gleixner <tglx at linutronix.de>
Date:   Wed Apr 30 00:54:59 2008 -0700

    slab: add a flag to prevent debug_free checks on a kmem_cache
    
    This is a preperatory patch for the debugobjects infrastructure.  The flag
    prevents debug_free checks on kmem_caches.  This is necessary to avoid
    resursive calls into a debug mechanism which uses a kmem_cache itself.
    
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
    Acked-by: Ingo Molnar <mingo at elte.hu>
    Cc: Pekka Enberg <penberg at cs.helsinki.fi>
    Cc: Christoph Lameter <clameter at sgi.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 145980a0b07520f0f82cc40999acc92b349ea40c
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Wed Apr 30 00:54:57 2008 -0700

    drivers: replace remaining __FUNCTION__ occurrences
    
    __FUNCTION__ is gcc-specific, use __func__
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Cc: Ben Dooks <ben-linux at fluff.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit bdf4bbaaee3d4b8f555658333cbce1affe9070fb
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Wed Apr 30 00:54:55 2008 -0700

    Add macros similar to min/max/min_t/max_t
    
    Also, change the variable names used in the min/max macros to avoid shadowed
    variable warnings when min/max min_t/max_t are nested.
    
    Small formatting changes to make all the macros have a similar form.
    
    [akpm at linux-foundation.org: coding-style fixes]
    [akpm at linux-foundation.org: fix v4l build]
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Cc: Mauro Carvalho Chehab <mchehab at infradead.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Cc: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
    Cc: Jeff Garzik <jeff at garzik.org>
    Cc: Tejun Heo <htejun at gmail.com>
    Cc: Michael Buesch <mb at bu3sch.de>
    Cc: "John W. Linville" <linville at tuxdriver.com>
    Cc: Miklos Szeredi <miklos at szeredi.hu>
    Cc: Dmitry Torokhov <dtor at mail.ru>
    Cc: Jiri Kosina <jkosina at suse.cz>
    Cc: Arnaldo Carvalho de Melo <acme at ghostprotocols.net>
    Cc: Randy Dunlap <randy.dunlap at oracle.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 354a1f4d99240f53980275416ca3e1ac2ee73d5d
Author: Andrew Morton <akpm at linux-foundation.org>
Date:   Wed Apr 30 00:54:54 2008 -0700

    alloc_uid: cleanup
    
    Use kmem_cache_zalloc(), remove large amounts of initialisation code and
    ifdeffery.
    
    Note: this assumes that memset(*atomic_t, 0) correctly initialises the
    atomic_t.  This is true for all present archtiectures and if it becomes false
    for a future architecture then we'll need to make large changes all over the
    place anyway.
    
    Acked-by: 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 487798df6d25e76ed6558b3e17c44cf0458cc6f3
Author: Andrew Morton <akpm at linux-foundation.org>
Date:   Wed Apr 30 00:54:54 2008 -0700

    hfsplus: fix warning with 64k PAGE_SIZE
    
    fs/hfsplus/btree.c: In function 'hfsplus_bmap_alloc':
    fs/hfsplus/btree.c:239: warning: comparison is always false due to limited range of data type
    
    But this might hide a real bug?
    
    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 3e5a5097303eedb4ffae2719843eb064221b1db4
Author: Andrew Morton <akpm at linux-foundation.org>
Date:   Wed Apr 30 00:54:53 2008 -0700

    hfs: fix warning with 64k PAGE_SIZE
    
    fs/hfs/btree.c: In function 'hfs_bmap_alloc':
    fs/hfs/btree.c:263: warning: comparison is always false due to limited range of data type
    
    The patch makes the warning go away, but the code might actually be buggy?
    
    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 f735295b14ae073a8302d7b1da894bc597724557
Author: Markus Armbruster <armbru at redhat.com>
Date:   Wed Apr 30 00:54:52 2008 -0700

    printk: don't read beyond string arguments' terminating zero
    
    Fix update_console_cmdline() not to to read beyond the terminating zero of its
    name argument.
    
    Signed-off-by: Markus Armbruster <armbru at redhat.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit f7511d5f66f01fc451747b24e79f3ada7a3af9af
Author: Samuel Thibault <samuel.thibault at ens-lyon.org>
Date:   Wed Apr 30 00:54:51 2008 -0700

    Basic braille screen reader support
    
    This adds a minimalistic braille screen reader support.  This is meant to
    be used by blind people e.g.  on boot failures or when / cannot be mounted
    etc and thus the userland screen readers can not work.
    
    [akpm at linux-foundation.org: fix exports]
    Signed-off-by: Samuel Thibault <samuel.thibault at ens-lyon.org>
    Cc: Jiri Kosina <jikos at jikos.cz>
    Cc: Dmitry Torokhov <dtor at mail.ru>
    Acked-by: Alan Cox <alan at redhat.com>
    Cc: Randy Dunlap <randy.dunlap at oracle.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 730f412c08c13858f7681bac0a2770fbc9159fed
Author: Jeff Dike <jdike at addtoit.com>
Date:   Wed Apr 30 00:54:49 2008 -0700

    asm-*/futex.h should include linux/uaccess.h
    
    Lots of asm-*/futex.h call pagefault_enable and pagefault_disable, which
    are declared in linux/uaccess.h, without including linux/uaccess.h.
    
    They all include asm/uaccess.h, so this patch replaces asm/uaccess.h
    with linux/uaccess.h.
    
    Signed-off-by: Jeff Dike <jdike at linux.intel.com>
    Cc: "Luck, Tony" <tony.luck at intel.com>
    Cc: Ralf Baechle <ralf at linux-mips.org>
    Cc: Kyle McMartin <kyle at mcmartin.ca>
    Cc: Paul Mackerras <paulus at samba.org>
    Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
    Cc: Paul Mundt <lethal at linux-sh.org>
    Cc: "David S. Miller" <davem at davemloft.net>
    Cc: Ingo Molnar <mingo at elte.hu>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 07132922aac0caf807c56b9c2a388954b357a8c4
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date:   Wed Apr 30 00:54:49 2008 -0700

    sysv: [bl]e*_add_cpu conversion
    
    replace all:
    big/little_endian_variable = cpu_to_[bl]eX([bl]eX_to_cpu(big/little_endian_variable) +
    					expression_in_cpu_byteorder);
    with:
    	[bl]eX_add_cpu(&big/little_endian_variable, expression_in_cpu_byteorder);
    generated with semantic patch
    
    Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
    Cc: Christoph Hellwig <hch at infradead.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit e3592b12f507d2c12c883d9c18084b72a5710db3
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date:   Wed Apr 30 00:54:48 2008 -0700

    quota: 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: Jan Kara <jack at suse.cz>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 20c79e785ae3f813310261dde81b29ab0c3e28b4
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date:   Wed Apr 30 00:54:47 2008 -0700

    hfs/hfsplus: be*_add_cpu conversion
    
    replace all:
    big_endian_variable = cpu_to_beX(beX_to_cpu(big_endian_variable) +
    					expression_in_cpu_byteorder);
    with:
    	beX_add_cpu(&big_endian_variable, expression_in_cpu_byteorder);
    generated with semantic patch
    
    Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
    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 6369a4abb486692cd0f5fe592b48ec7419b7976c
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date:   Wed Apr 30 00:54:47 2008 -0700

    affs: be*_add_cpu conversion
    
    replace all:
    big_endian_variable = cpu_to_beX(beX_to_cpu(big_endian_variable) +
    					expression_in_cpu_byteorder);
    with:
    	beX_add_cpu(&big_endian_variable, expression_in_cpu_byteorder);
    generated with semantic patch
    
    Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
    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 86098fa0115358abf5159093d11ddb306ce4b0da
Author: Christoph Hellwig <hch at lst.de>
Date:   Wed Apr 30 00:54:46 2008 -0700

    reiserfs: use open_bdev_excl
    
    Use the proper helper to open a blockdevice by name for filesystem use,
    this makes sure it's properly claimed (also added for open-by-number) and
    gets rid of the struct file abuse.
    
    Tested by mounting a reiserfs filesystem with external journal.
    
    Signed-off-by: Christoph Hellwig <hch at lst.de>
    Cc: Chris Mason <chris.mason at oracle.com>
    Cc: Jeff Mahoney <jeffm at suse.com>
    Acked-by: Edward Shishkin <edward.shishkin at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 4dbf930ed6c1f8aa992937d0461f8f70d4004aad
Author: Miklos Szeredi <mszeredi at suse.cz>
Date:   Wed Apr 30 00:54:45 2008 -0700

    fuse: fix sparse warnings
    
    fs/fuse/dev.c:306:2: warning: context imbalance in 'wait_answer_interruptible' - unexpected unlock
    fs/fuse/dev.c:361:2: warning: context imbalance in 'request_wait_answer' - unexpected unlock
    fs/fuse/dev.c:1002:4: warning: context imbalance in 'end_io_requests' - unexpected unlock
    
    Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 5559b8f4d1f630b8614b6c8e13b8bf6c9c45d7d7
Author: Miklos Szeredi <mszeredi at suse.cz>
Date:   Wed Apr 30 00:54:45 2008 -0700

    fuse: fix race in llseek
    
    Fuse doesn't use i_mutex to protect setting i_size, and so
    generic_file_llseek() can be racy: it doesn't use i_size_read().
    
    So do a fuse specific llseek method, which does use i_size_read().
    
    [akpm at linux-foundation.org: make `retval' loff_t]
    Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit b48badf013018ef2aa4a46416454bdb18f77fb01
Author: Miklos Szeredi <mszeredi at suse.cz>
Date:   Wed Apr 30 00:54:44 2008 -0700

    fuse: fix node ID type
    
    Node ID is 64bit but it is passed as unsigned long to some functions.  This
    breakage wasn't noticed, because libfuse uses unsigned long too.
    
    Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit e5d9a0df07484d6d191756878c974e4307fb24ce
Author: Miklos Szeredi <mszeredi at suse.cz>
Date:   Wed Apr 30 00:54:44 2008 -0700

    fuse: fix max i/o size calculation
    
    Fix a bug that Werner Baumann reported: fuse can send a bigger write request
    than the maximum specified.  This only affected direct_io operation.
    
    In addition set a sane minimum for the max_read and max_write tunables, so I/O
    always makes some progress.
    
    Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 5c5c5e51b26413d50a9efae2ca7d6c5c6cd453ac
Author: Miklos Szeredi <mszeredi at suse.cz>
Date:   Wed Apr 30 00:54:43 2008 -0700

    fuse: update file size on short read
    
    If the READ request returned a short count, then either
    
      - cached size is incorrect
      - filesystem is buggy, as short reads are only allowed on EOF
    
    So assume that the size is wrong and refresh it, so that cached read() doesn't
    zero fill the missing chunk.
    
    Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit ea9b9907b82a09bd1a708004454f7065de77c5b0
Author: Nick Piggin <npiggin at suse.de>
Date:   Wed Apr 30 00:54:42 2008 -0700

    fuse: implement perform_write
    
    Introduce fuse_perform_write.  With fusexmp (a passthrough filesystem), large
    (1MB) writes into a backing tmpfs filesystem are sped up by almost 4 times
    (256MB/s vs 71MB/s).
    
    [mszeredi at suse.cz]:
    
     - split into smaller functions
     - testing
     - duplicate generic_file_aio_write(), so that there's no need to add a
       new ->perform_write() a_op.  Comment from hch.
    
    Signed-off-by: Nick Piggin <npiggin at suse.de>
    Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
    Cc: Christoph Hellwig <hch at infradead.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 854512ec358f291bcadd7daea10d6bf3704933de
Author: Miklos Szeredi <mszeredi at suse.cz>
Date:   Wed Apr 30 00:54:41 2008 -0700

    fuse: clean up setting i_size in write
    
    Extract common code for setting i_size in write functions into a common
    helper.
    
    Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 3be5a52b30aa5cf9d795b7634f728f612197b1c4
Author: Miklos Szeredi <mszeredi at suse.cz>
Date:   Wed Apr 30 00:54:41 2008 -0700

    fuse: support writable mmap
    
    Quoting Linus (3 years ago, FUSE inclusion discussions):
    
      "User-space filesystems are hard to get right. I'd claim that they
       are almost impossible, unless you limit them somehow (shared
       writable mappings are the nastiest part - if you don't have those,
       you can reasonably limit your problems by limiting the number of
       dirty pages you accept through normal "write()" calls)."
    
    Instead of attempting the impossible, I've just waited for the dirty page
    accounting infrastructure to materialize (thanks to Peter Zijlstra and
    others).  This nicely solved the biggest problem: limiting the number of pages
    used for write caching.
    
    Some small details remained, however, which this largish patch attempts to
    address.  It provides a page writeback implementation for fuse, which is
    completely safe against VM related deadlocks.  Performance may not be very
    good for certain usage patterns, but generally it should be acceptable.
    
    It has been tested extensively with fsx-linux and bash-shared-mapping.
    
    Fuse page writeback design
    --------------------------
    
    fuse_writepage() allocates a new temporary page with GFP_NOFS|__GFP_HIGHMEM.
    It copies the contents of the original page, and queues a WRITE request to the
    userspace filesystem using this temp page.
    
    The writeback is finished instantly from the MM's point of view: the page is
    removed from the radix trees, and the PageDirty and PageWriteback flags are
    cleared.
    
    For the duration of the actual write, the NR_WRITEBACK_TEMP counter is
    incremented.  The per-bdi writeback count is not decremented until the actual
    write completes.
    
    On dirtying the page, fuse waits for a previous write to finish before
    proceeding.  This makes sure, there can only be one temporary page used at a
    time for one cached page.
    
    This approach is wasteful in both memory and CPU bandwidth, so why is this
    complication needed?
    
    The basic problem is that there can be no guarantee about the time in which
    the userspace filesystem will complete a write.  It may be buggy or even
    malicious, and fail to complete WRITE requests.  We don't want unrelated parts
    of the system to grind to a halt in such cases.
    
    Also a filesystem may need additional resources (particularly memory) to
    complete a WRITE request.  There's a great danger of a deadlock if that
    allocation may wait for the writepage to finish.
    
    Currently there are several cases where the kernel can block on page
    writeback:
    
      - allocation order is larger than PAGE_ALLOC_COSTLY_ORDER
      - page migration
      - throttle_vm_writeout (through NR_WRITEBACK)
      - sync(2)
    
    Of course in some cases (fsync, msync) we explicitly want to allow blocking.
    So for these cases new code has to be added to fuse, since the VM is not
    tracking writeback pages for us any more.
    
    As an extra safetly measure, the maximum dirty ratio allocated to a single
    fuse filesystem is set to 1% by default.  This way one (or several) buggy or
    malicious fuse filesystems cannot slow down the rest of the system by hogging
    dirty memory.
    
    With appropriate privileges, this limit can be raised through
    '/sys/class/bdi/<bdi>/max_ratio'.
    
    Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
    Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit b88473f73e6d7b6af9cfc4ecc349d82c75d9a6af
Author: Miklos Szeredi <mszeredi at suse.cz>
Date:   Wed Apr 30 00:54:39 2008 -0700

    mm: document missing fields for /proc/meminfo
    
    A few fields in /proc/meminfo were not documented.  Fix.
    
    Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
    Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit fc3ba692a4d19019387c5acaea63131f9eab05dd
Author: Miklos Szeredi <mszeredi at suse.cz>
Date:   Wed Apr 30 00:54:38 2008 -0700

    mm: Add NR_WRITEBACK_TEMP counter
    
    Fuse will use temporary buffers to write back dirty data from memory mappings
    (normal writes are done synchronously).  This is needed, because there cannot
    be any guarantee about the time in which a write will complete.
    
    By using temporary buffers, from the MM's point if view the page is written
    back immediately.  If the writeout was due to memory pressure, this
    effectively migrates data from a full zone to a less full zone.
    
    This patch adds a new counter (NR_WRITEBACK_TEMP) for the number of pages used
    as temporary buffers.
    
    [Lee.Schermerhorn at hp.com: add vmstat_text for NR_WRITEBACK_TEMP]
    Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
    Cc: Christoph Lameter <clameter at sgi.com>
    Signed-off-by: Lee Schermerhorn <lee.schermerhorn at hp.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit dd5656e59ca7b25fb60a22f9079905ed0da5ed0c
Author: Miklos Szeredi <mszeredi at suse.cz>
Date:   Wed Apr 30 00:54:37 2008 -0700

    mm: bdi: export bdi_writeout_inc()
    
    Fuse needs this for writable mmap support.
    
    Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
    Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit e4ad08fe64afca4ef79ecc4c624e6e871688da0d
Author: Miklos Szeredi <mszeredi at suse.cz>
Date:   Wed Apr 30 00:54:37 2008 -0700

    mm: bdi: add separate writeback accounting capability
    
    Add a new BDI capability flag: BDI_CAP_NO_ACCT_WB.  If this flag is
    set, then don't update the per-bdi writeback stats from
    test_set_page_writeback() and test_clear_page_writeback().
    
    Misc cleanups:
    
     - convert bdi_cap_writeback_dirty() and friends to static inline functions
     - create a flag that includes all three dirty/writeback related flags,
       since almst all users will want to have them toghether
    
    Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
    Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 76f1418b485da2707531178e517bbb5cf06b3c76
Author: Miklos Szeredi <mszeredi at suse.cz>
Date:   Wed Apr 30 00:54:36 2008 -0700

    mm: bdi: move statistics to debugfs
    
    Move BDI statistics to debugfs:
    
       /sys/kernel/debug/bdi/<bdi>/stats
    
    Use postcore_initcall() to initialize the sysfs class and debugfs,
    because debugfs is initialized in core_initcall().
    
    Update descriptions in ABI documentation.
    
    Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit a42dde04152750426cc620fd277e80fffae2f65a
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date:   Wed Apr 30 00:54:36 2008 -0700

    mm: bdi: allow setting a maximum for the bdi dirty limit
    
    Add "max_ratio" to /sys/class/bdi.  This indicates the maximum percentage of
    the global dirty threshold allocated to this bdi.
    
    [mszeredi at suse.cz]
    
     - fix parsing in max_ratio_store().
     - export bdi_set_max_ratio() to modules
     - limit bdi_dirty with bdi->max_ratio
     - document new sysfs attribute
    
    Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
    Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 189d3c4a94ef19fca2a71a6a336e9fda900e25e7
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date:   Wed Apr 30 00:54:35 2008 -0700

    mm: bdi: allow setting a minimum for the bdi dirty limit
    
    Under normal circumstances each device is given a part of the total write-back
    cache that relates to its current avg writeout speed in relation to the other
    devices.
    
    min_ratio - allows one to assign a minimum portion of the write-back cache to
    a particular device.  This is useful in situations where you might want to
    provide a minimum QoS.  (One request for this feature came from flash based
    storage people who wanted to avoid writing out at all costs - they of course
    needed some pdflush hacks as well)
    
    max_ratio - allows one to assign a maximum portion of the dirty limit to a
    particular device.  This is useful in situations where you want to avoid one
    device taking all or most of the write-back cache.  Eg.  an NFS mount that is
    prone to get stuck, or a FUSE mount which you don't trust to play fair.
    
    Add "min_ratio" to /sys/class/bdi.  This indicates the minimum percentage of
    the global dirty threshold allocated to this bdi.
    
    [mszeredi at suse.cz]
    
     - fix parsing in min_ratio_store()
     - document new sysfs attribute
    
    Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
    Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit b6f2fcbcfca9db2bd7aa24940224fcd3bbdbb8aa
Author: Miklos Szeredi <mszeredi at suse.cz>
Date:   Wed Apr 30 00:54:34 2008 -0700

    mm: bdi: expose the BDI object in sysfs for FUSE
    
    Register FUSE's backing_dev_info under sysfs with the name "fuse-MAJOR:MINOR"
    
    Make the fuse control filesystem use s_dev instead of a fuse specific ID.
    This makes it easier to match directories under /sys/fs/fuse/connections/ with
    directories under /sys/class/bdi, and with actual mounts.
    
    Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
    Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit fa799759f9801137f665dbedda2c0815f1bf6f1b
Author: Miklos Szeredi <mszeredi at suse.cz>
Date:   Wed Apr 30 00:54:33 2008 -0700

    mm: bdi: expose the BDI object in sysfs for NFS
    
    Register NFS' backing_dev_info under sysfs with the name "nfs-MAJOR:MINOR"
    
    Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
    Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
    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: Linus Torvalds <torvalds at linux-foundation.org>

commit cf0ca9fe5dd9e3693d935757a7b2fc50fc576554
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date:   Wed Apr 30 00:54:32 2008 -0700

    mm: bdi: export BDI attributes in sysfs
    
    Provide a place in sysfs (/sys/class/bdi) for the backing_dev_info object.
    This allows us to see and set the various BDI specific variables.
    
    In particular this properly exposes the read-ahead window for all relevant
    users and /sys/block/<block>/queue/read_ahead_kb should be deprecated.
    
    With patient help from Kay Sievers and Greg KH
    
    [mszeredi at suse.cz]
    
     - split off NFS and FUSE changes into separate patches
     - document new sysfs attributes under Documentation/ABI
     - do bdi_class_init as a core_initcall, otherwise the "default" BDI
       won't be initialized
     - remove bdi_init_fmt macro, it's not used very much
    
    [akpm at linux-foundation.org: fix ia64 warning]
    Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
    Cc: Kay Sievers <kay.sievers at vrfy.org>
    Acked-by: Greg KH <greg at kroah.com>
    Cc: Trond Myklebust <trond.myklebust at fys.uio.no>
    Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit caafa4324335aeb11bc233d5f87aca8cce30beba
Author: Pavel Emelyanov <xemul at openvz.org>
Date:   Wed Apr 30 00:54:31 2008 -0700

    pidns: make pid->level and pid_ns->level unsigned
    
    These values represent the nesting level of a namespace and pids living in it,
    and it's always non-negative.
    
    Turning this from int to unsigned int saves some space in pid.c (11 bytes on
    x86 and 64 on ia64) by letting the compiler optimize the pid_nr_ns a bit.
    E.g.  on ia64 this removes the sign extension calls, which compiler adds to
    optimize access to pid->nubers[ns->level].
    
    Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
    Cc: "Eric W. Biederman" <ebiederm at xmission.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit ab883af53ec1b87add43b32a28d8347f17d5155b
Author: Adrian Bunk <bunk at kernel.org>
Date:   Wed Apr 30 00:54:30 2008 -0700

    make marker_debug static
    
    With the needlessly global marker_debug being static gcc can optimize the
    unused code away.
    
    Signed-off-by: Adrian Bunk <bunk at kernel.org>
    Acked-by: Mathieu Desnoyers <mathieu.desnoyers at polymtl.ca>
    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 148ff86b11ec51d7d2f7ff863bd85d0dd5aa908c
Author: Christoph Hellwig <hch at lst.de>
Date:   Wed Apr 30 00:54:29 2008 -0700

    mxser: convert large macros to functions
    
    Signed-off-by: Christoph Hellwig <hch at lst.de>
    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 12a3de0a965826096d8adc593bcf4392a7d5b459
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:54:29 2008 -0700

    pids: sys_getpgid: fix unsafe *pid usage, s/tasklist/rcu/
    
    1. sys_getpgid() needs rcu_read_lock() to derive the pgrp _nr, even if
       the task is current, otherwise we can race with another thread which
       does sys_setpgid().
    
    2. Use rcu_read_lock() instead of tasklist_lock when pid != 0, make sure
       that we don't use the NULL pid if the task exits right after successful
       find_task_by_vpid().
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: 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 1dd768c0815334d2319d6377f0750ace075b6142
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:54:28 2008 -0700

    pids: sys_getsid: fix unsafe *pid usage, fix possible 0 instead of -ESRCH
    
    1. sys_getsid() needs rcu_read_lock() to derive the session _nr, even if
       the task is current, otherwise we can race with another thread which
       does sys_setsid().
    
    2. The task can exit between find_task_by_vpid() and task_session_vnr(),
       in that unlikely case sys_getsid() returns 0 instead of -ESRCH.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: 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 7d8da0962eaee30b4a380ded177349bfbdd6ac46
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:54:27 2008 -0700

    pids: __set_special_pids: use change_pid() helper
    
    Use change_pid() instead of detach_pid() + attach_pid() in
    __set_special_pids().
    
    This way task_session() is not NULL in between.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc:  "Eric W. Biederman" <ebiederm at xmission.com>
    Cc: Pavel Emelyanov <xemul at openvz.org>
    Cc: 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 83beaf3c6c75b36b7c9be7f555c8cf7797842cc5
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:54:27 2008 -0700

    pids: sys_setpgid: use change_pid() helper
    
    Use change_pid() instead of detach_pid() + attach_pid() in sys_setpgid().
    
    This way task_pgrp() is not NULL in between.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc:  "Eric W. Biederman" <ebiederm at xmission.com>
    Cc: Pavel Emelyanov <xemul at openvz.org>
    Cc: 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 24336eaeecea860b2a82530e07c80bc7e0558b73
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:54:26 2008 -0700

    pids: introduce change_pid() helper
    
    Based on Eric W. Biederman's idea.
    
    Without tasklist_lock held task_session()/task_pgrp() can return NULL if the
    caller races with setprgp()/setsid() which does detach_pid() + attach_pid().
    This can happen even if task == current.
    
    Intoduce the new helper, change_pid(), which should be used instead.  This way
    the caller always sees the special pid != NULL, either old or new.
    
    Also change the prototype of attach_pid(), it always returns 0 and nobody
    check the returned value.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc:  "Eric W. Biederman" <ebiederm at xmission.com>
    Cc: Pavel Emelyanov <xemul at openvz.org>
    Cc: 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 65450cebc6a2efde80ed45514f727e6e4dc1eafd
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:54:25 2008 -0700

    pids: de_thread: don't clear session/pgrp pids for the old leader
    
    Based on Eric W. Biederman's idea.
    
    Unless task == current, without tasklist_lock held task_session()/task_pgrp()
    can return NULL if the caller races with de_thread() which switches the group
    leader.
    
    Change transfer_pid() to not clear old->pids[type].pid for the old leader.
    This means that its .pid can point to "nowhere", but this is already true for
    sub-threads, and the old leader is not group_leader() any longer.  IOW, with
    or without this change we can't trust task's special pids unless it is the
    group leader.
    
    With this change the following code
    
    	rcu_read_lock();
    	task = find_task_by_xxx();
    	do_something(task_pgrp(task), task_session(task));
    	rcu_read_unlock();
    
    can't race with exec and hit the NULL pid.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc:  "Eric W. Biederman" <ebiederm at xmission.com>
    Cc: Pavel Emelyanov <xemul at openvz.org>
    Cc: 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 5cd204550b1a006f2b0c986b0e0f53220ebfd391
Author: Pavel Emelyanov <xemul at openvz.org>
Date:   Wed Apr 30 00:54:24 2008 -0700

    Deprecate find_task_by_pid()
    
    There are some places that are known to operate on tasks'
    global pids only:
    
    * the rest_init() call (called on boot)
    * the kgdb's getthread
    * the create_kthread() (since the kthread is run in init ns)
    
    So use the find_task_by_pid_ns(..., &init_pid_ns) there
    and schedule the find_task_by_pid for removal.
    
    [sukadev at us.ibm.com: Fix warning in kernel/pid.c]
    Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
    Cc: "Eric W. Biederman" <ebiederm at xmission.com>
    Signed-off-by: Sukadev Bhattiprolu <sukadev 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 cb41d6d068716b2b3666925da34d3d7e658bf4f3
Author: Pavel Emelyanov <xemul at openvz.org>
Date:   Wed Apr 30 00:54:23 2008 -0700

    Use find_task_by_vpid in taskstats
    
    The pid to lookup a task by is passed inside taskstats code via genetlink
    message.
    
    Since netlink packets are now processed in the context of the sending task,
    this is correct to lookup the task with find_task_by_vpid() here.
    
    Besides, I fix the call to fill_pid() from taskstats_exit(), since the
    tsk->pid is not required in fill_pid() in this case, and the pid field on
    task_struct is going to be deprecated as well.
    
    Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
    Cc: "Eric W. Biederman" <ebiederm at xmission.com>
    Cc: Balbir Singh <balbir at in.ibm.com>
    Cc: Jay Lan <jlan at engr.sgi.com>
    Cc: Jonathan Lim <jlim at sgi.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit b7127aa4547d8cc8a5b569631e2b6ef613af1bb7
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:54:22 2008 -0700

    free_pidmap: turn it into free_pidmap(struct upid *)
    
    The callers of free_pidmap() pass 2 members of "struct upid", we can just
    pass "struct upid *" instead.  Shaves off 10 bytes from pid.o.
    
    Also, simplify the alloc_pid's "out_free:" error path a little bit.  This
    way it looks more clear which subset of pid->numbers[] we are freeing.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: Pavel Emelyanov <xemul at openvz.org>
    Cc: "Eric W. Biederman" <ebiederm at xmission.com>
    Cc :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 718a916338e821a10961e6a7a17430c18e5e58d9
Author: Sukadev Bhattiprolu <sukadev at us.ibm.com>
Date:   Wed Apr 30 00:54:21 2008 -0700

    devpts: factor out PTY index allocation
    
    Factor out the code used to allocate/free a pts index into new interfaces,
    devpts_new_index() and devpts_kill_index().  This localizes the external data
    structures used in managing the pts indices.
    
    [akpm at linux-foundation.org: undo accidental mutex2sem conversion]
    Signed-off-by: Sukadev Bhattiprolu <sukadev at us.ibm.com>
    Signed-off-by: Serge Hallyn <serue at us.ibm.com>
    Signed-off-by: Matt Helsley <matthltc at us.ibm.com>
    Acked-by: H. Peter Anvin <hpa at zytor.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 4f8f9d66cdac4845409f7520e4f287a1907a6bf9
Author: Sukadev Bhattiprolu <sukadev at us.ibm.com>
Date:   Wed Apr 30 00:54:20 2008 -0700

    devpts: propagate error code from devpts_pty_new
    
    Have ptmx_open() propagate any error code returned by devpts_pty_new()
    (which returns either 0 or -ENOMEM anyway).
    
    Signed-off-by: Sukadev Bhattiprolu <sukadev at us.ibm.com>
    Acked-by: Serge Hallyn <serue at us.ibm.com>
    Acked-by: H. Peter Anvin <hpa at zytor.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 86a96538178f923aa1aa43c1e7cfec5951df7f8a
Author: Hiroshi Shimamoto <h-shimamoto at ct.jp.nec.com>
Date:   Wed Apr 30 00:54:20 2008 -0700

    tty: fix routine name in ptmx_open()
    
    At ptmx_open(), the 2nd parameter for check_tty_count() should
    be "ptmx_open".
    
    Signed-off-by: Hiroshi Shimamoto <h-shimamoto at ct.jp.nec.com>
    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 24cb233520f01971d6d873cb52c64bbbb0665ac0
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:54:19 2008 -0700

    char serial: switch drivers to ioremap_nocache
    
    Simple search/replace except for synclink.c where I noticed a real bug and
    fixed it too.  It was doing NULL + offset, then checking for NULL if the remap
    failed.
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Cc: Paul Fulghum <paulkf at microgate.com>
    Acked-by: Jiri Slaby <jirislaby at gmail.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 a6fc819ebe2d70c92e43e14adbb93a5bd8ea5aa3
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:54:18 2008 -0700

    ip2: switch remaining direct call of ops->flush_buffer
    
    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 39c2e60f8c584c1b29b5c4375dd49df7995386bb
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:54:18 2008 -0700

    tty: add throttle/unthrottle helpers
    
    Something Arjan suggested which allows us to clean up the code nicely
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Cc: Arjan van de Ven <arjan at infradead.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 8cd64518a3d166a21f5c69ac7860b3add0369dd0
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:54:17 2008 -0700

    isicom: fix buffer allocation
    
    Fix the rather strange buffer management on open that turned up while auditing
    for BKL dependencies.
    
    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 fb100b6ea7bf8a95e52b90cc0dc0ea5744a0a40a
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:54:16 2008 -0700

    esp: clean up to modern coding style
    
    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 191260a01257793ad76cc35b7f9e1508d27bdd4b
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:54:16 2008 -0700

    epca: coding style
    
    Clean up the epca driver
    
    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 9492e13516f00340d7d01d81551eea8deb0b8d0e
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:54:15 2008 -0700

    riscom8: coding style
    
    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 8e8bcf16c2b2f949dfafa3e8e94a51fd37bfc3ef
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:54:14 2008 -0700

    strip: Fix up strip for the new order
    
    - Use the tty baud functions
    - Call driver termios methods directly holding the right locking
    - Check for a write method
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Cc: David S. Miller <davem at davemloft.net>
    Cc: Jeff Garzik <jeff at garzik.org>
    Cc: "John W. Linville" <linville at tuxdriver.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit f34d7a5b7010b82fe97da95496b9971435530062
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:54:13 2008 -0700

    tty: The big operations rework
    
    - Operations are now a shared const function block as with most other Linux
      objects
    
    - Introduce wrappers for some optional functions to get consistent behaviour
    
    - Wrap put_char which used to be patched by the tty layer
    
    - Document which functions are needed/optional
    
    - Make put_char report success/fail
    
    - Cache the driver->ops pointer in the tty as tty->ops
    
    - Remove various surplus lock calls we no longer need
    
    - Remove proc_write method as noted by Alexey Dobriyan
    
    - Introduce some missing sanity checks where certain driver/ldisc
      combinations would oops as they didn't check needed methods were present
    
    [akpm at linux-foundation.org: fix fs/compat_ioctl.c build]
    [akpm at linux-foundation.org: fix isicom]
    [akpm at linux-foundation.org: fix arch/ia64/hp/sim/simserial.c build]
    [akpm at linux-foundation.org: fix kgdb]
    Signed-off-by: Alan Cox <alan at redhat.com>
    Acked-by: Greg Kroah-Hartman <gregkh at suse.de>
    Cc: Jason Wessel <jason.wessel at windriver.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 251b8dd7eee30fda089a1dc088abf4fc9a0dee9c
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:54:12 2008 -0700

    isicom: bring into coding style
    
    [akpm at linux-foundation.org: fix arm, cleanups]
    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 23d22cea85ba9114a59a32ca8dfb1e2aef52a278
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:54:11 2008 -0700

    serial: switch the serial core to int put_char methods
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Cc: Russell King <rmk+kernel at arm.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 56dbbb9a5704f665068778d4d2c1bdf757756e60
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:54:10 2008 -0700

    pc300: Update to tty_set_operations
    
    This driver somehow escaped the tty operations changes way back when.  Update
    it so that we can switch to tty->ops shortly.
    
    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 3e8e88ca053150efdbecb45d8f481cf560ec808d
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:54:10 2008 -0700

    pty: prepare for tty->ops changes
    
    We are about to change the tty layer to avoid keeping private copies of all
    the methods in each tty.  We have to update the pty layer first as it
    currently patches the ioctl method according to the tty type.  Use multiple
    tty operations sets instead.
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Acked-by: "H. Peter Anvin" <hpa at zytor.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit f2545a75632d18d62aa287b9e5d207255cc8bffc
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:54:09 2008 -0700

    isdn: switch to int put_char method
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Acked-by: Karsten Keil <kkeil at suse.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 5d19f546e7b6f0976f957780f2687c55668f4495
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:54:08 2008 -0700

    consoles: switch to int put_char method
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Cc: Antonino Daplas <adaplas at pol.net>
    Cc: Stephen Rothwell <sfr at canb.auug.org.au>
    Cc: Kelly Daly <kelly at au.ibm.com>
    Cc: Paul Mackerras <paulus at samba.org>
    Cc: Jiri Slaby <jirislaby at gmail.com>
    Cc: Samuel Thibault <samuel.thibault at ens-lyon.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 55da77899c1472d83452c914fa179d00ea96df65
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:54:07 2008 -0700

    synclink series: switch to int put_char method
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Cc: Paul Fulghum <paulkf at microgate.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 6ae045767b2adae4e8fc054b980326a971ac4c8e
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:54:07 2008 -0700

    specialix: Switch to int put_char method
    
    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 a5b08c66194fba02a865b397579b7204688bcb1e
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:54:05 2008 -0700

    serial167: switch to int put_char method
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Cc: Jiri Slaby <jirislaby at gmail.com>
    Cc: Jeff Dike <jdike at addtoit.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 bbbbb96f5ea84971545ecae5a9ec50387cd9c6a3
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:54:05 2008 -0700

    riscom/rocket: switch to int put_char method
    
    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 d7e752e2757fba49178f4b1af4778ca64d305cbb
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:54:04 2008 -0700

    pcmcia: serial to int put_char method
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Cc: Dominik Brodowski <linux at dominikbrodowski.net>
    Cc: Paul Fulghum <paulkf at microgate.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 0be2eadee7baff96d2c7339be4bc2a0f5c96e4f5
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:54:03 2008 -0700

    mxser: switch to put_char being int
    
    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 76b25a5509bbafdbfc7d7d6b41a3c64947d59360
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:54:03 2008 -0700

    char: switch gs, cyclades and esp to return int for put_char
    
    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 257afa3cb6beaad60849655cb272d4b9de74cf63
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:54:02 2008 -0700

    amiserial: Switch put char to return success/fail
    
    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 4cd55ab1f991e4d4f3551a711f0f87441a57cd1b
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:54:01 2008 -0700

    usb gadget: switch to put_char returning int
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Acked-by: Greg Kroah-Hartman <gregkh at suse.de>
    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 09a6ffa84c8e893d9656296b322dc8145e09e186
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:54:01 2008 -0700

    serial m68k: put_char returns
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Acked-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 9e7c9a19c1df8a7450c56c41b9c7405eca7eda07
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:54:00 2008 -0700

    s390 tty: Prepare for put_char to return success/fail
    
    Put the changes into the drivers first.  This will still compile/work but
    produce a warning if bisected so can still be debugged
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
    Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
    Cc: Christian Borntraeger <borntraeger at de.ibm.com>
    Cc: Peter Oberparleiter <peter.oberparleiter 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 978e595f88a1fba5869aa42a4af4fba36f33ecac
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:53:59 2008 -0700

    tty/serial: lay the foundations for the next set of reworks
    
    - Stop drivers calling their own flush method indirectly, it obfuscates code
      and it will change soon anyway
    
    - A few more lock_kernel paths temporarily needed in some driver internal
      waiting code
    
    - Remove private put_char method that does a write call for one char - we
      have that anyway
    
    - Most but not yet all of the termios copy under lock fixing (some has other
      dependencies to follow)
    
    - Note a few locking bugs in drivers found in the process
    
    - Kill remaining [ab]users of TIOCG/SSOFTCAR in the driver, these must go to
      fix the termios locking
    
    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 ac0e4b7d319bf284bb64bc7e1c051417386b34a4
Author: Julia Lawall <julia at diku.dk>
Date:   Wed Apr 30 00:53:58 2008 -0700

    drivers/char/ds1286.c: use time_before, time_before_eq, etc
    
    The functions time_before, time_before_eq, time_after, and time_after_eq
    are more robust for comparing jiffies against other values.
    
    A simplified version of the semantic patch making this change is as follows:
    (http://www.emn.fr/x-info/coccinelle/)
    
    // <smpl>
    @ change_compare_np @
    expression E;
    @@
    
    (
    - jiffies <= E
    + time_before_eq(jiffies,E)
    |
    - jiffies >= E
    + time_after_eq(jiffies,E)
    |
    - jiffies < E
    + time_before(jiffies,E)
    |
    - jiffies > E
    + time_after(jiffies,E)
    )
    
    @ include depends on change_compare_np @
    @@
    
    #include <linux/jiffies.h>
    
    @ no_include depends on !include && change_compare_np @
    @@
    
      #include <linux/...>
    + #include <linux/jiffies.h>
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia at diku.dk>
    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 d6f6341a6475eb7f9c2b948a7d0fd56fd16ad675
Author: Jiri Slaby <jirislaby at gmail.com>
Date:   Wed Apr 30 00:53:57 2008 -0700

    Char: rio, fix cirrus defines
    
    Rename defines to be in RIO* namespace to not to collide with other defines in
    tree.  This broke (as akpm correctly pointed out) some allmodconfig builds,
    e.g.  on ppc:
    
    In file included from drivers/char/rio/rio_linux.c:81:
    drivers/char/rio/cirrus.h:202:1: warning: "COMPLETE" redefined
    In file included from include/net/netns/ipv4.h:8,
                     from include/net/net_namespace.h:13,
                     from include/linux/seq_file.h:7,
                     from include/asm/machdep.h:12,
                     from include/asm/pci.h:17,
                     from include/linux/pci.h:951,
                     from drivers/char/rio/rio_linux.c:50:
    include/net/inet_frag.h:28:1: warning: this is the location of the previous definition
    
    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 cd989b3a8c30148c872c7677c7a0415584f1658c
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:53:56 2008 -0700

    cyclades: use ioremap_nocache for clarity as proposed
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Acked-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 15ed6cc0ba6b7beaf31c6756b0c838188800051b
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:53:55 2008 -0700

    cyclades: coding style & review
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Cc: Arnaldo Carvalho de Melo <acme at ghostprotocols.net>
    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 e5b393e4f1178faaf3d7c22ef63e70c79633bd66
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:53:54 2008 -0700

    istallion: TIOCG/SSOFTCAR handling removal
    
    This is handled (and correctly) by the core code so does not belong
    incorrectly in the driver.
    
    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 cf1c63c3e68679dcac1cc6a37e619d9106ebc0ca
Author: Jiri Slaby <jirislaby at gmail.com>
Date:   Wed Apr 30 00:53:54 2008 -0700

    Char: ip2, macros cleanup
    
    - remove i2os.h -- there was only macro to macro renaming or useless
      stuff
    - remove another uselless stuf (NULLFUNC, NULLPTR, YES, NO)
    - use outb/inb directly
    - use locking functions directly
    - don't define another ROUNDUP, use roundup(x, 2) instead
    - some comments and whitespace cleanup
    - remove some commented crap
    - prepend the rest by I2 prefix to not collide with rest of the world
      like in following output (pointed out by akpm)
    
    In file included from drivers/char/ip2/ip2main.c:128:
    drivers/char/ip2/i2ellis.h:608:1: warning: "COMPLETE" redefined
    In file included from include/net/netns/ipv4.h:8,
                     from include/net/net_namespace.h:13,
                     from include/linux/seq_file.h:7,
                     from include/asm/machdep.h:12,
                     from include/asm/pci.h:17,
                     from include/linux/pci.h:951,
                     from drivers/char/ip2/ip2main.c:95:
    include/net/inet_frag.h:28:1: warning: this is the location of the previous definition
    
    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 83e422b7649267067975cbb17a878b5f9dfd2de3
Author: Jon Schindler <jkschind at gmail.com>
Date:   Wed Apr 30 00:53:53 2008 -0700

    drivers/char/ip2/ip2main.c: replace init_module&cleanup_module with module_init&module_exit
    
    Replace init_module and cleanup_module with static functions and
    module_init/module_exit.
    
    Signed-off-by: Jon Schindler <jkschind at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 11fb09bfabd699a94555b69d6e6c4fa6c3febde8
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Wed Apr 30 00:53:52 2008 -0700

    epca.c: static functions and integer as NULL pointer fixes
    
    drivers/char/epca.c:926:28: warning: Using plain integer as NULL pointer
    drivers/char/epca.c:1841:2: warning: Using plain integer as NULL pointer
    
    Forward declarations were already marked static, mark the definitions too.
    drivers/char/epca.c:2493:6: warning: symbol 'digi_send_break' was not declared. Should it be static?
    drivers/char/epca.c:2881:12: warning: symbol 'init_PCI' was not declared. Should it be static?
    
    [akpm at linux-foundation.org: coding-style fixes]
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 1a4e2351e7fcf2d10bb5524b0ace7797ffad4d98
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Wed Apr 30 00:53:52 2008 -0700

    cyclades.c: fix sparse shadowed variable warnings
    
    Nested min() macros.
    drivers/char/cyclades.c:2750:7: warning: symbol '_x' shadows an earlier one
    drivers/char/cyclades.c:2750:7: originally declared here
    drivers/char/cyclades.c:2750:7: warning: symbol '_x' shadows an earlier one
    drivers/char/cyclades.c:2750:7: originally declared here
    drivers/char/cyclades.c:2750:7: warning: symbol '_y' shadows an earlier one
    drivers/char/cyclades.c:2750:7: originally declared here
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 709107fcd3c4ad82ff7c8137c27aa951d671706f
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Wed Apr 30 00:53:51 2008 -0700

    char: rocket.c: fix sparse variable shadowing and int as NULL pointer
    
    Nested min() macros shadow _x, separate into two lines.
    drivers/char/rocket.c:451:7: warning: symbol '_x' shadows an earlier one
    drivers/char/rocket.c:451:7: originally declared here
    drivers/char/rocket.c:451:7: warning: symbol '_x' shadows an earlier one
    drivers/char/rocket.c:451:7: originally declared here
    drivers/char/rocket.c:451:7: warning: symbol '_y' shadows an earlier one
    drivers/char/rocket.c:451:7: originally declared here
    drivers/char/rocket.c:1754:7: warning: symbol '_x' shadows an earlier one
    drivers/char/rocket.c:1754:7: originally declared here
    drivers/char/rocket.c:1754:7: warning: symbol '_x' shadows an earlier one
    drivers/char/rocket.c:1754:7: originally declared here
    drivers/char/rocket.c:1754:7: warning: symbol '_y' shadows an earlier one
    drivers/char/rocket.c:1754:7: originally declared here
    drivers/char/rocket.c:1751:20: warning: Using plain integer as NULL pointer
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit d3ceb6562bfbe8f27fa32d1e24eea0e2d4de0347
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Wed Apr 30 00:53:50 2008 -0700

    char: esp.c: fix possible double-unlock
    
    Hitting either of the break statements in the while loop would cause a
    double-unlock of info->lock.
    
    [Jiri Slaby suggested simply returning is safe here, rather than a goto]
    
    Noticed by sparse:
    drivers/char/esp.c:2042:2: warning: context imbalance in 'rs_wait_until_sent' - unexpected unlock
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.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 f5592268a5aa5e02f36f396de47c94a1506e3678
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Wed Apr 30 00:53:50 2008 -0700

    char: fix sparse shadowed variable warnings in esp.c
    
    flags only use was in spin_lock_irqsave/spin_lock_irgrestore pairs, no
    need to redeclare for each one.
    
    drivers/char/esp.c:1599:17: warning: symbol 'flags' shadows an earlier one
    drivers/char/esp.c:1517:16: originally declared here
    drivers/char/esp.c:1615:17: warning: symbol 'flags' shadows an earlier one
    drivers/char/esp.c:1517:16: originally declared here
    drivers/char/esp.c:1631:17: warning: symbol 'flags' shadows an earlier one
    drivers/char/esp.c:1517:16: originally declared here
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit ec09cd562135158dcb8a6c08e5a9efa36febedb1
Author: Jiri Slaby <jirislaby at gmail.com>
Date:   Wed Apr 30 00:53:49 2008 -0700

    Char: moxa, add firmware loading fix
    
    Be more verbose on fw load fail as noted by Oyvind.
    
    Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
    Cc: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit b9705b603d1d29471aa2977e6310f4f9a4e85925
Author: Jiri Slaby <jirislaby at gmail.com>
Date:   Wed Apr 30 00:53:48 2008 -0700

    Char: moxa, update credits
    
    - update version
    - update maintainers
    - copyright the stuff
    
    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 bb9f910a1153101a2f92620f1e7d0fda786c9812
Author: Jiri Slaby <jirislaby at gmail.com>
Date:   Wed Apr 30 00:53:48 2008 -0700

    Char: moxa, notify about board readiness
    
    Drop a message to dmesg about card being ready.
    
    Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
    Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 08d01c792568ba07d2bcf5202dbc8484dbff6747
Author: Jiri Slaby <jirislaby at gmail.com>
Date:   Wed Apr 30 00:53:47 2008 -0700

    Char: moxa, introduce MOXA_IS_320 macro
    
    It allows to simplify the code, especially MoxaPortSetBaud.
    
    Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
    Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 92d30a9372040a6411e6ed1234fea6153e750874
Author: Jiri Slaby <jirislaby at gmail.com>
Date:   Wed Apr 30 00:53:47 2008 -0700

    Char: moxa, remove useless tty functions
    
    - moxa_flush_chars -- no code; ldics handle this well
    - moxa_put_char -- only wrapper to moxa_write (same code), tty does this
      the same way if tty->driver->put_char is NULL
    
    Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
    Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit eaa95a8da6366c34d3a61e93109e5f8f8a4e72a0
Author: Jiri Slaby <jirislaby at gmail.com>
Date:   Wed Apr 30 00:53:46 2008 -0700

    Char: moxa, little cleanup
    
    Cleanup of
    - whitespace
    - macros
    - useless casts
    - return (sth); -> return sth;
    - types
    - superfluous parenthesis and braces
    - init tmp directly in moxa_get_serial_info
    - commented defunct code
    - commented prototypes
    - MOXA/moxa printk case
    
    Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
    Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit a8f5cda067e2eeefe49fe386caf0f61fc5c825e0
Author: Jiri Slaby <jirislaby at gmail.com>
Date:   Wed Apr 30 00:53:45 2008 -0700

    Char: moxa, rework open/close
    
    - add locking to open/close/hangup and ioctl (tiocm)
    - add pci hot-un-plug support (hangup on board remove, wait for openers)
    - cleanup block_till_ready
    - move close code common to close/hangup into separate function to be
      able to call it from open when hangup occurs while block_till_ready
    - let ldisc flush on tty layer, it will do it after we return
    
    Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
    Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 2a5413416b6b2fd8a5a38601a4fe3b56a52cfb86
Author: Jiri Slaby <jirislaby at gmail.com>
Date:   Wed Apr 30 00:53:45 2008 -0700

    Char: moxa, serialise timer
    
    - del timer after we are sure it won't be fired again
    - make timer scheduling atomic
    - don't reschedule timer when all cards have gone
    
    Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
    Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 2108eba5c531c12f5ae2ed2ef4cee7bf4246897b
Author: Jiri Slaby <jirislaby at gmail.com>
Date:   Wed Apr 30 00:53:44 2008 -0700

    Char: moxa, cleanup rx/tx
    
    - cleanup types
    - use tty_prepare_flip_string and io memcpys
    
    Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
    Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 7bcf97d1dd88135b58c7adb7c3bfebab55b21a20
Author: Jiri Slaby <jirislaby at gmail.com>
Date:   Wed Apr 30 00:53:43 2008 -0700

    Char: moxa, merge 2 poll functions
    
    - merge 2 timers into one -- one can handle the emptywait as good as the other
    - merge 2 separated poll functions into one, this allows handle the actions
      directly and simplifies the code
    
    Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
    Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 74d7d97b9e2a090a4b1812b5074ac6c539234ebb
Author: Jiri Slaby <jirislaby at gmail.com>
Date:   Wed Apr 30 00:53:43 2008 -0700

    Char: moxa, ioctl cleanup
    
    - allow stats only for sys_admin
    - move TCSBRK* processing to .break_ctl tty op
    - let TIOCGSOFTCAR and TIOCSSOFTCAR be processed by ldisc
    - remove MOXA_GET_MAJOR, MOXA_GET_CUMAJOR
    - fix jiffies subtraction by time_after
    - move moxa ioctl numbers into the header; still not exported to userspace,
      needs _IOC and 32/64 compat cleanup anyways
    
    Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
    Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 0bcc4caadc8f5396b52950ee03c67b76875602df
Author: Jiri Slaby <jirislaby at gmail.com>
Date:   Wed Apr 30 00:53:42 2008 -0700

    Char: moxa, timer cleanup
    
    - schedule timer even after some card is installed, not after insmod
    - cleanup timer functions
    
    Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
    Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 810ab09b2f3a4e9a6f553e3d1e84a27f4074de9c
Author: Jiri Slaby <jirislaby at gmail.com>
Date:   Wed Apr 30 00:53:41 2008 -0700

    Char: moxa, centralize board readiness
    
    The only relevant sign of port being ready is its board->ready since now.
    Remove all other flags for this purpose which are set almost on the same
    place.  Move ports inside the board to be sure that nobody will grab reference
    to the port without being sure that it exists.
    
    [jirislaby at gmail.com: fix unused var warning]
    Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
    Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
    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 97506056bdf0f230854142ffa986c616a0a5536e
Author: Jiri Slaby <jirislaby at gmail.com>
Date:   Wed Apr 30 00:53:41 2008 -0700

    Char: moxa, remove unused port entries
    
    Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
    Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit b4173f45758a5b5185acb302c507289e661d9419
Author: Jiri Slaby <jirislaby at gmail.com>
Date:   Wed Apr 30 00:53:40 2008 -0700

    Char: moxa, remove port->port
    
    We don't need to hold a reference to port index.  In most cases we need port
    structure anyway and index is available in port->tty->index.
    
    Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
    Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 5292bcd38e4bcd147905941b5e37b5b0da1a5577
Author: Jiri Slaby <jirislaby at gmail.com>
Date:   Wed Apr 30 00:53:39 2008 -0700

    Char: moxa, merge c2xx and c320 firmware loading
    
    Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
    Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 037182346f0991683cc7320a257c3f6089432cee
Author: Jiri Slaby <jirislaby at gmail.com>
Date:   Wed Apr 30 00:53:39 2008 -0700

    Char: moxa, add firmware loading
    
    Substitute ioctl load firmware interface by kernel firmware api.
    
    Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
    Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 9e9fc313ffa3cb92f7f81a8e076566bc9d582351
Author: Jiri Slaby <jirislaby at gmail.com>
Date:   Wed Apr 30 00:53:38 2008 -0700

    Char: moxa, fix TIOC(G/S)SOFTCAR param
    
    according to ioctl_list, both have int * as a param, not ulong *.
    
    Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
    Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit e46a5e3ff06b70690d567bdc81faf6c1c32e742f
Author: Jiri Slaby <jirislaby at gmail.com>
Date:   Wed Apr 30 00:53:37 2008 -0700

    Char: moxa, pci io space fixup
    
    - request region before remapping pci io space
    - use ioremap, iounmap istead of iomap interface, because we use
      readX/writeX for accessing this space because of isa support
    
    Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
    Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit d353eca4e0480fddcb088c4692e1edba0a82eac9
Author: Jiri Slaby <jirislaby at gmail.com>
Date:   Wed Apr 30 00:53:37 2008 -0700

    Char: moxa, cleanup module-param passed isa init
    
    Make the code more readable, remap the base address directly.  Describe module
    parameters.
    
    Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
    Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 37794952a685538f20ac9792e98f1c9b161dbdfe
Author: Jiri Slaby <jirislaby at gmail.com>
Date:   Wed Apr 30 00:53:36 2008 -0700

    Char: moxa, remove static isa support
    
    Static ISA field is empty and probably will never be filled in, remove it.
    The driver still supports ISA cards passed through module parameter.  This
    actually fixes one bug inside the initialization of module-param passed cards
    initialization.
    
    Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
    Tested-by: Oyvind Aabling <Oyvind.Aabling at uni-c.dk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit cbacdd9572285c86848dd323dc764abb3681ddbc
Author: Dimitri Sivanich <sivanich at sgi.com>
Date:   Wed Apr 30 00:53:35 2008 -0700

    SGI Altix mmtimer: allow larger number of timers per node
    
    The purpose of this patch to the SGI Altix specific mmtimer (posix timer)
    driver is to allow a virtually infinite number of timers to be set per
    node.
    
    Timers will now be kept on a sorted per-node list and a single node-based
    hardware comparator is used to trigger the next timer.
    
    [akpm at linux-foundation.org: mark things static]
    [akpm at linux-foundation.org: fix warning]
    Signed-off-by: Dimitri Sivanich <sivanich at sgi.com>
    Cc: "Luck, Tony" <tony.luck at intel.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit d17468c73e138e1108b279acf892dd35937d43ed
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:53:34 2008 -0700

    tty: drop the BKL for driver/ldisc ioctl methods
    
    Now we have pushed the lock down we can stop wrapping the call with a lock in
    the tty layer.
    
    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 1c2630ccf922b7ea2c54c184243d4fb2bd2cf3c6
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:53:34 2008 -0700

    tty_ioctl: soft carrier handling
    
    First cut at moving the soft carrier handling knowledge entirely into the core
    code.  One or two drivers still needed to snoop these functions to track
    CLOCAL internally.  Instead make TIOCSSOFTCAR generate the same driver calls
    as other termios ioctls changing the clocal flag.  This allows us to remove
    any driver knowledge and special casing.  Also while we are at it we can fix
    the error handling.
    
    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 0ee9cbb3c705903db9c258047d9ce87096e6a1a1
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:53:32 2008 -0700

    tty_ioctl: locking for tty_wait_until_sent
    
    This function still depends on the big kernel lock in some cases.  Push
    locking into the function ready for removal of the BKL from ioctl call paths.
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Cc: Andi Kleen <andi at firstfloor.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 5d0fdf1e01899805b6c2c0b789a707dcb731b1ea
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:53:31 2008 -0700

    tty_io: fix remaining pid struct locking
    
    This fixes the last couple of pid struct locking failures I know about.
    
    [oleg at tv-sign.ru: clean up do_task_stat()]
    Signed-off-by: Alan Cox <alan at redhat.com>
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 575537b3248ee9b7578a3bb3df33fcdda2bfc4d5
Author: Joe Peterson <joe at skyrush.com>
Date:   Wed Apr 30 00:53:30 2008 -0700

    Resume TTY on SUSP and fix CRNL order in N_TTY line discipline
    
    Refine these behaviors in the N_TTY line discipline:
    
    1) Handle the signal characters consistently when received in a stopped TTY
       so that SUSP (typically ctrl-Z) behaves like INTR and QUIT in resuming a
       stopped TTY.
    
    2) Adjust the order in which the IGNCR/ICRNL/INLCR processing is applied to
       be more logical and consistent with the behavior of other Unix systems.
    
    Signed-off-by: Joe Peterson <joe at skyrush.com>
    Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
    Cc: Oleg Nesterov <oleg at tv-sign.ru>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 47f86834bbd4193139d61d659bebf9ab9d691e37
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:53:30 2008 -0700

    redo locking of tty->pgrp
    
    Historically tty->pgrp and friends were pid_t and the code "knew" they were
    safe.  The change to pid structs opened up a few races and the removal of the
    BKL in places made them quite hittable.  We put tty->pgrp under the ctrl_lock
    for the tty.
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Cc: Oleg Nesterov <oleg at tv-sign.ru>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 04f378b198da233ca0aca341b113dc6579d46123
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:53:29 2008 -0700

    tty: BKL pushdown
    
    - Push the BKL down into the line disciplines
    - Switch the tty layer to unlocked_ioctl
    - Introduce a new ctrl_lock spin lock for the control bits
    - Eliminate much of the lock_kernel use in n_tty
    - Prepare to (but don't yet) call the drivers with the lock dropped
      on the paths that historically held the lock
    
    BKL now primarily protects open/close/ldisc change in the tty layer
    
    [jirislaby at gmail.com: a couple of fixes]
    Signed-off-by: Alan Cox <alan at redhat.com>
    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 e52384426064bca0669a954736206adca7595d48
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:53:28 2008 -0700

    serial_core: Prepare for BKL push down
    
    Instead of checking for the BKL in these methods, take it ourselves.  That
    avoids propogating it into the serial drivers and we can then fix them later
    on.
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Cc: Russell King <rmk at arm.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit c0754c99a6bcfcba7e1d68b75e3f25cb367af0fa
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:53:27 2008 -0700

    68360serial: Note that there isn't any info->mcr locking
    
    Noticed while auditing the code for the BKL elimination project
    
    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 6e4d376c664ded7cb9cc1c7d0cae67c9672e46b1
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:53:27 2008 -0700

    isdn_tty: Prepare for BKL push down
    
    Three things here
    - Remove softcar handler
    - Correct termios change detection logic
    - Wrap break/ioctl in lock_kernel ready to drop it in the caller
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Cc: Karsten Keil <kkeil at suse.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 9cc3c22bf017f33612748aeb466fdc3695fb1e1d
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:53:26 2008 -0700

    vt_ioctl: Prepare for BKL push down
    
    This one could do with some eyeballs on it.  In theory it simply wraps the
    ioctl handler in lock/unlock_kernel ready for the lock/unlocks to be pushed
    into specific switch values.  To do that means changing the code to return via
    a common exit path not all over the place as it does now, hence the big diff
    
    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 dd9a451aad4fd7d5f46d2300c0e4fb70d8914453
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:53:25 2008 -0700

    viocons: BKL locking
    
    For some weird reason I can't ascertain (translation "I think its
    broken") the viocons driver calls directly into the n_tty ldisc code even
    if another ldisc is in use. It'll probably break if you do that but I'm
    just fixing the locking and adding a comment that its horked.
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Cc: Paul Mackerras <paulus at samba.org>
    Cc: Stephen Rothwell <sfr at canb.auug.org.au>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 1f8cabb7055b98300aa0798ee0f6513dfc130cc2
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:53:24 2008 -0700

    synclink series: Prepare for BKL pushdown
    
    As these are quite complex I've simply pushed the BKL down into the ioctl
    handler not tried to do anything neater.
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Cc: Paul Fulghum <paulkf at microgate.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 341339e7aff33e3aa73d6c49dbd5a79be0bbec04
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:53:24 2008 -0700

    sx: prepare for BKL pushdown
    
    Wrap the ioctl handler, and in this case the break handler also in the
    BKL. Remove bogus softcar handlers.
    
    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 f433c65b8acb5346e6fefff4e4b97711c987ccf9
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:53:23 2008 -0700

    stallion: Prepare for BKL push down
    
    Remove broken softcar functions, wrap ioctl handler in BKL
    
    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 b190e178f63e8dad7755054e02dc18a24ea6f0ac
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:53:22 2008 -0700

    specialix: Prepare for BKL pushdown
    
    Lock the ioctl handlers and remove bogus softcar handling.
    
    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 638157bc1461f6718eeca06bedd9a09cf1f35c36
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:53:22 2008 -0700

    serial167: prepare to push BKL down into drivers
    
    Kill the softcar handlers again, wrap the ioctl handler in the BKL
    
    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 bdf183aa47dcb46782e22ebd4d1061e47ad74b14
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:53:21 2008 -0700

    rocket: Prepare for BKL pushdown
    
    Wrap the ioctl code in lock_kernel calls
    
    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 eb1745529622f204733139bde2201eb4ee994c03
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:53:21 2008 -0700

    riscom8: Prepare for BKL pushdown
    
    Push the locking down into a couple of functions that need it and remove
    bogus TIOCG/SSOFTCAR handling
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Cc: Jeff Garzik <jeff at garzik.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 9d6d162d495d7abf2bfcdffc73c0892f1179579a
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:53:20 2008 -0700

    mxser: prepare for BKL pushdown
    
    Push the BKL down into various internal routines in the driver ready to
    remove it from the break, ioctl and other call points.
    
    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 3736113654165b5f4b8658b6a34d74631e0b7d81
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:53:19 2008 -0700

    isicom: istallion prepare for lock_kernel pushdown
    
    This is an ancient driver so just wrap it in lock_kernel internally and
    be done.
    
    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 1eac494738a0447ef0c423ee2066f85a44ab59f5
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:53:19 2008 -0700

    isicom: prepare for lock_kernel push down
    
    Again lock the bits we can't trivially prove are safe without the BKL and
    remove the broken TIOCS/GSOFTCAR handler.
    
    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 5a4bc8c1bde7bcb7f02950764e37e9d6bbdb3e32
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:53:18 2008 -0700

    esp: lock_kernel push down
    
    Push the BKL down into a few internal bits of code in this driver.
    
    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 37925e050379ef4db9f4ed251786b6d43da6ec71
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:53:17 2008 -0700

    epca: lock_kernel push down
    
    Prepare epca for removing the lock from above. Most of epca is internally
    locked so we can trivially push it down to a few bits of code. Drop the TIOCG/SSOFTCAR handling as that is done *properly* with locks by the mid layer.
    
    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 7b130c0efd7acbdc3cf9b2e7cc9a26e923feec93
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:53:16 2008 -0700

    cyclades: Prepare for relaxed locking in callers
    
    Basically wrap it in lock_kernel where it is hard to prove the locking is
    ok.
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Cc: "John Stoffel" <john at stoffel.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit e18ce49b5b8f957fb99d66990ff49d527f823210
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:53:16 2008 -0700

    amiserial: prepare for locking relaxation in caller
    
    Just wrap this one in a lock_kernel. As I understand it there is no M68K
    SMP anyway.
    
    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 00cd5c37afd5f431ac186dd131705048c0a11fdb
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:53:15 2008 -0700

    ptrace: permit ptracing of /sbin/init
    
    Afaics, currently there are no kernel problems with ptracing init, it can't
    lose SIGNAL_UNKILLABLE flag and be killed/stopped by accident.
    
    The ability to strace/debug init can be very useful if you try to figure out
    why it does not work as expected.
    
    However, admin should know what he does, "gdb /sbin/init 1" stops init, it
    can't reap orphaned zombies or take care of /etc/inittab until continued.  It
    is even possible to crash init (and thus the whole system) if you wish,
    ptracer has full control.
    
    See also the long discussion: http://marc.info/?t=120628018600001
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Acked-by: Roland McGrath <roland at redhat.com>
    Acked-by: Pavel Emelyanov <xemul at openvz.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 33e9fc7d01269737cd5a3b6de1db9d0e796ab708
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:53:14 2008 -0700

    ptrace: ptrace_attach: use send_sig_info() instead force_sig_specific()
    
    Nobody can block/ignore SIGSTOP, no need to use force_sig_specific() in
    ptrace_attach.  Use the "regular" send_sig_info().
    
    With this patch stracing of /sbin/init doesn't clear its SIGNAL_UNKILLABLE,
    but not that this makes ptracing of init safe.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: 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 68cb94786630b34196713794a2880ade17fca887
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:53:14 2008 -0700

    ptrace: __ptrace_unlink: use the ptrace_reparented() helper
    
    Currently __ptrace_unlink() checks list_empty(->ptrace_list) to figure out
    whether the child was reparented.  Change the code to use ptrace_reparented()
    to make this check more explicit and consistent.
    
    No functional changes.
    
    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 53b6f9fbd3b63af14b4f6268e8b5b80d178d05bc
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:53:13 2008 -0700

    ptrace: introduce ptrace_reparented() helper
    
    Add another trivial helper for the sake of grep.  It also auto-documents the
    fact that ->parent != real_parent implies ->ptrace.
    
    No functional changes.
    
    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 2800d8d19e51414403df8144eaa214bb03400b87
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:53:12 2008 -0700

    document de_thread() with exit_notify() connection
    
    Add a couple of small comments, it is not easy to see what this code does.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: 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 376e1d2531860358c8a79fecf5f4f42994d03c4d
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:53:12 2008 -0700

    reparent_thread: use same_thread_group()
    
    Trivial, use same_thread_group() in reparent_thread().
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: 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 d839fd4d2e95a5fbc4d50aa9d17eed6a5f2094e6
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:53:11 2008 -0700

    ptrace: introduce task_detached() helper
    
    exit.c has numerous "->exit_signal == -1" comparisons, this check is subtle
    and deserves a helper.  Imho makes the code more parseable for humans.  At
    least it's surely more greppable.
    
    Also, a couple of whitespace cleanups. No functional changes.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: 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 5a8da0ea82db6fa9737041381079fd16f25dcce2
Author: Roland McGrath <roland at redhat.com>
Date:   Wed Apr 30 00:53:10 2008 -0700

    signals: x86 TS_RESTORE_SIGMASK
    
    Replace TIF_RESTORE_SIGMASK with TS_RESTORE_SIGMASK and define our own
    set_restore_sigmask() function.  This saves the costly SMP-safe set_bit
    operation, which we do not need for the sigmask flag since TIF_SIGPENDING
    always has to be set too.
    
    Signed-off-by: Roland McGrath <roland at redhat.com>
    Cc: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: Ingo Molnar <mingo at elte.hu>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
    Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
    Cc: "Luck, Tony" <tony.luck at intel.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit f3de272b821accbc8387211977c2de4f38468d05
Author: Roland McGrath <roland at redhat.com>
Date:   Wed Apr 30 00:53:09 2008 -0700

    signals: use HAVE_SET_RESTORE_SIGMASK
    
    Change all the #ifdef TIF_RESTORE_SIGMASK conditionals in non-arch code to
    #ifdef HAVE_SET_RESTORE_SIGMASK.  If arch code defines it first, the generic
    set_restore_sigmask() using TIF_RESTORE_SIGMASK is not defined.
    
    Signed-off-by: Roland McGrath <roland at redhat.com>
    Cc: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: Ingo Molnar <mingo at elte.hu>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
    Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
    Cc: "Luck, Tony" <tony.luck at intel.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 49eaeb4bc4c901c327ee259c7768be20fd020a30
Author: akpm at linux-foundation.org <akpm at linux-foundation.org>
Date:   Wed Apr 30 00:53:09 2008 -0700

    signals: ia64 renumber TIF_RESTORE_SIGMASK
    
    TIF_RESTORE_SIGMASK no longer needs to be in the _TIF_WORK_* masks.
    Those low bits are scarce.  Renumber TIF_RESTORE_SIGMASK to free one up.
    
    Signed-off-by: Roland McGrath <roland at redhat.com>
    Cc: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: Ingo Molnar <mingo at elte.hu>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
    Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
    Cc: "Luck, Tony" <tony.luck at intel.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 02a029b325854a98e76f0a79ab38bec13e66bd38
Author: Roland McGrath <roland at redhat.com>
Date:   Wed Apr 30 00:53:08 2008 -0700

    signals: s390: renumber TIF_RESTORE_SIGMASK
    
    TIF_RESTORE_SIGMASK no longer needs to be in the _TIF_WORK_* masks.  Those low
    bits are scarce, and are all used up now.  Renumber TIF_RESTORE_SIGMASK to
    free one up.
    
    Signed-off-by: Roland McGrath <roland at redhat.com>
    Cc: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: Ingo Molnar <mingo at elte.hu>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
    Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
    Cc: "Luck, Tony" <tony.luck at intel.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 7648d961fcb454d38e864d2d850bc30e078bf7e6
Author: Roland McGrath <roland at redhat.com>
Date:   Wed Apr 30 00:53:07 2008 -0700

    signals: set_restore_sigmask TIF_SIGPENDING
    
    Set TIF_SIGPENDING in set_restore_sigmask.  This lets arch code take
    TIF_RESTORE_SIGMASK out of the set of bits that will be noticed on return to
    user mode.  On some machines those bits are scarce, and we can free this
    unneeded one up for other uses.
    
    It is probably the case that TIF_SIGPENDING is always set anyway everywhere
    set_restore_sigmask() is used.  But this is some cheap paranoia in case there
    is an arcane case where it might not be.
    
    Signed-off-by: Roland McGrath <roland at redhat.com>
    Cc: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: Ingo Molnar <mingo at elte.hu>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
    Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
    Cc: "Luck, Tony" <tony.luck at intel.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 4e4c22c71144c1b2e22c257ec6cf08ccb5be1165
Author: Roland McGrath <roland at redhat.com>
Date:   Wed Apr 30 00:53:06 2008 -0700

    signals: add set_restore_sigmask
    
    This adds the set_restore_sigmask() inline in <linux/thread_info.h> and
    replaces every set_thread_flag(TIF_RESTORE_SIGMASK) with a call to it.  No
    change, but abstracts the details of the flag protocol from all the calls.
    
    Signed-off-by: Roland McGrath <roland at redhat.com>
    Cc: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: Ingo Molnar <mingo at elte.hu>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
    Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
    Cc: "Luck, Tony" <tony.luck at intel.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 80fe728d593e3a048a56610de932919f7d6d968a
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:53:05 2008 -0700

    signals: allow the kernel to actually kill /sbin/init
    
    Currently the buggy /sbin/init hangs if SIGSEGV/etc happens.  The kernel sends
    the signal, init dequeues it and ignores, returns from the exception, repeats
    the faulting instruction, and so on forever.
    
    Imho, such a behaviour is not good.  I think that the explicit loud death of
    the buggy /sbin/init is better than the silent hang.
    
    Change force_sig_info() to clear SIGNAL_UNKILLABLE when the task should be
    really killed.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: 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 7a5e873f096e04e6d8719e4ecb7b70d2decca503
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:53:04 2008 -0700

    signals: de_thread: simplify the ->child_reaper switching
    
    Now that we rely on SIGNAL_UNKILLABLE flag, de_thread() doesn't need the nasty
    hack to kill the old ->child_reaper during the mt-exec.
    
    This also means we can avoid taking tasklist_lock around zap_other_threads().
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: 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 fae5fa44f1fd079ffbed8e0add929dd7bbd1347f
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:53:03 2008 -0700

    signals: fix /sbin/init protection from unwanted signals
    
    The global init has a lot of long standing problems with the unhandled fatal
    signals.
    
    	- The "is_global_init(current)" check in get_signal_to_deliver()
    	  protects only the main thread. Sub-thread can dequee the fatal
    	  signal and shutdown the whole thread group except the main thread.
    	  If it dequeues SIGSTOP /sbin/init will be stopped, this is not
    	  right too. Note that we can't use is_global_init(->group_leader),
    	  this breaks exec and this can't solve other problems we have.
    
    	- Even if afterwards ignored, the fatal signals sets SIGNAL_GROUP_EXIT
    	  on delivery. This breaks exec, has other bad implications, and this
    	  is just wrong.
    
    Introduce the new SIGNAL_UNKILLABLE flag to fix these problems.  It also helps
    to solve some other problems addressed by the subsequent patches.
    
    Currently we use this flag for the global init only, but it could also be used
    by kthreads and (perhaps) by the sub-namespace inits.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Acked-by: "Eric W. Biederman" <ebiederm at xmission.com>
    Cc: 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 193191035ad6268db9f561e81e3474b8be89a5ba
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:53:02 2008 -0700

    signals: check_kill_permission: remove tasklist_lock
    
    Now that task_session() can't return a false NULL, check_kill_permission()
    doesn't need tasklist_lock.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: 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 2e2ba22ea4fd4bb85f0fa37c521066db6775cbef
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:53:01 2008 -0700

    signals: check_kill_permission: check session under tasklist_lock
    
    This wasn't documented, but as Atsushi Tsuji pointed out
    check_kill_permission() needs tasklist_lock for task_session_nr().  I missed
    this fact when removed tasklist from the callers.
    
    Change check_kill_permission() to take tasklist_lock for the SIGCONT case.
    Re-order security checks so that we take tasklist_lock only if/when it is
    actually needed.  This is a minimal fix for now, tasklist will be removed
    later.
    
    Also change the code to use task_session() instead of task_session_nr().
    
    Also, remove the SIGCONT check from cap_task_kill(), it is bogus (and the
    whole function is bogus.  Serge, Eric, why it is still alive?).
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Acked-by: Atsushi Tsuji <a-tsuji at bk.jp.nec.com>
    Cc: Roland McGrath <roland at redhat.com>
    Cc: Serge 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 53c30337f2c61aff6eecf2a446e839641172f9bd
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:53:00 2008 -0700

    signals: send_signal: be paranoid about signalfd_notify()
    
    send_signal() shouldn't call signalfd_notify() if it then fails with -EAGAIN.
    Harmless, just a paranoid cleanup.
    
    Also remove the comment.  It is obsolete, signalfd_notify() was simplified and
    does a simple wakeup.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Acked-by: Davide Libenzi <davidel at xmailserver.org>
    Cc: 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 021e1ae3d85a76ce962a300c96813f04ae50c87c
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:53:00 2008 -0700

    signals: document CLD_CONTINUED notification mechanics
    
    A couple of small comments about how CLD_CONTINUED notification works.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: 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 7e695a5ef5c1c768d7feb75cc61e42f13d763623
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:52:59 2008 -0700

    signals: fold sig_ignored() into handle_stop_signal()
    
    Rename handle_stop_signal() to prepare_signal(), make it return a boolean, and
    move the callsites of sig_ignored() into it.
    
    No functional changes for now.  But it would be nice to factor out the "should
    we drop this signal" checks as much as possible, before we try to fix the bugs
    with the sub-namespace init's signals (actually the global /sbin/init has some
    problems with signals too).
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: 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 2dce81bff28dceb2153c901883a56f278d91db65
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:52:58 2008 -0700

    signals: cleanup the usage of print_fatal_signal()
    
    Move the callsite of print_fatal_signal() down, under "if
    (sig_kernel_coredump(signr))", so we don't need to check signr != SIGKILL.
    
    We are only interested in the sig_kernel_coredump() signals anyway, and due to
    the previous changes we almost never can see other fatal signals here except
    SIGKILL.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: 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 34c8f07b9ac499a807918eda377193a55f64f8df
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:52:58 2008 -0700

    signals: handle_stop_signal: don't worry about SIGKILL
    
    handle_stop_signal() clears SIGNAL_STOP_DEQUEUED when sig == SIGKILL.  Remove
    this nasty special case.  It was needed to prevent the race with group stop
    and exit caused by thread-specific SIGKILL.  Now that we use complete_signal()
    for private signals too this is not needed, complete_signal() will notice
    SIGKILL and abort the soon-to-begin group stop.
    
    Except: the target thread is dead (has PF_EXITING).  But in that case we
    should not just clear SIGNAL_STOP_DEQUEUED and nothing more.  We should either
    kill the whole thread group, or silently ignore the signal.
    
    I suspect we are not right wrt zombie leaders, but this is another issue which
    and should be fixed separately.  Note that this check can't abort the group
    stop if it was already started/finished, this check only adds a subtle side
    effect if we race with the thread which has already dequeued sig_kernel_stop()
    signal and temporary released ->siglock.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: 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 ac5c215383f43a106ba4ef298126bf78c126f5e9
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:52:57 2008 -0700

    signals: join send_sigqueue() with send_group_sigqueue()
    
    We export send_sigqueue() and send_group_sigqueue() for the only user,
    posix_timer_event().  This is a bit silly, because both are just trivial
    helpers on top of do_send_sigqueue() and because the we pass the unused
    .si_signo parameter.
    
    Kill them both, rename do_send_sigqueue() to send_sigqueue(), and export it.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: 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 e62e6650e99a3dffcd0bf0d063cd818fbc13fa95
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:52:56 2008 -0700

    signals: unify send_sigqueue/send_group_sigqueue completely
    
    Suggested by Pavel Emelyanov.
    
    send_sigqueue/send_group_sigqueue are only differ in how they lock ->siglock.
    Unify them.  send_group_sigqueue() uses spin_lock() because it knows the task
    can't exit, but in that case lock_task_sighand() can't fail and doesn't hurt.
    
    Note that the "sig" argument is ignored, it is always equal to ->si_signo.
    
    Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: 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 4cd4b6d4e0372075f846feb85aea016cbdbfec4c
Author: Pavel Emelyanov <xemul at openvz.org>
Date:   Wed Apr 30 00:52:55 2008 -0700

    signals: fold complete_signal() into send_signal/do_send_sigqueue
    
    Factor out complete_signal() callsites.  This change completely unifies the
    helpers sending the specific/group signals.
    
    Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: 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 5fcd835bf8c2cde06404559b1904e2f1dfcb4567
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:52:55 2008 -0700

    signals: use __group_complete_signal() for the specific signals too
    
    Based on Pavel Emelyanov's suggestion.
    
    Rename __group_complete_signal() to complete_signal() and use it to process
    the specific signals too.  To do this we simply add the "int group" argument.
    
    This allows us to greatly simply the signal-sending code and adds a useful
    behaviour change.  We can avoid the unneeded wakeups for the private signals
    because wants_signal() is more clever than sigismember(blocked), but more
    importantly we now take into account the fatal specific signals too.
    
    The latter allows us to kill some subtle checks in handle_stop_signal() and
    makes the specific/group signal's behaviour more consistent.  For example,
    currently sigtimedwait(FATAL_SIGNAL) behaves differently depending on was the
    signal sent by kill() or tkill() if the signal was not blocked.
    
    And.  This allows us to tweak/fix the behaviour when the specific signal is
    sent to the dying/dead ->group_leader.
    
    Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: 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 2ca3515aa57224edf0151e05a8c9f21a76bf5957
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:52:54 2008 -0700

    signals: change send_signal/do_send_sigqueue to take "boolean group" parameter
    
    send_signal() is used either with ->pending or with ->signal->shared_pending.
    Change it to take "int group" instead, this argument will be re-used later.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: 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 71f11dc025055cb2ef9226424f26b3287efadd26
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:52:53 2008 -0700

    signals: move the definition of __group_complete_signal() up
    
    Move the unchanged definition of __group_complete_signal() so that send_signal
    can see it.  To simplify the reading of the next patches.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: 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 db51aeccd7097ce19a522a4c5ff91c320f870e2b
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:52:52 2008 -0700

    signals: microoptimize the usage of ->curr_target
    
    Suggested by Roland McGrath.
    
    Initialize signal->curr_target in copy_signal().  This way ->curr_target is
    never == NULL, we can kill the check in __group_complete_signal's hot path.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: 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 08d2c30ce98d274137f12b0a9b9c74137455922c
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:52:51 2008 -0700

    signals: send_sig_info: don't take tasklist_lock
    
    The comment in send_sig_info() is wrong, tasklist_lock can't help.
    
    The caller must ensure the task can't go away, otherwise ->sighand can be NULL
    even before we take the lock.
    
    p->sighand could be changed by exec(), but I can't imagine how it is possible
    to prevent exit(), but not exec().
    
    Since the things seem to work, I assume all callers are correct.  However,
    drm_vbl_send_signals() looks broken.  block_all_signals() which is solely used
    by drm is definitely broken.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: 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 3547ff3aefbe092ca35506c60c02e2d17a4f2199
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:52:51 2008 -0700

    signals: do_tkill: don't use tasklist_lock
    
    Convert do_tkill() to use rcu_read_lock() + lock_task_sighand() to avoid
    taking tasklist lock.
    
    Note that we don't return an error if lock_task_sighand() fails, we pretend
    the task dies after receiving the signal.  Otherwise, we should fight with the
    nasty races with mt-exec without having any advantage.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: 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 6e65acba7ca8169e38ab55d62d52f29a75fb141f
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:52:50 2008 -0700

    signals: move handle_stop_signal() into send_signal()
    
    Move handle_stop_signal() into send_signal().  This factors out a couple of
    callsites and allows us to do further unifications.
    
    Also, with this change specific_send_sig_info() does handle_stop_signal().
    Not that this is really important, we never send STOP/CONT via send_sig() and
    friends, but still this looks more consistent.
    
    The only (afaics) special case is get_signal_to_deliver().  If the traced task
    dequeues SIGCONT, it can re-send it to itself after ptrace_stop() if the
    signal was blocked by debugger.  In that case handle_stop_signal() is
    unnecessary, but hopefully not a problem.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: 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 c99fcf28b87d8cab592db7571e3164f5cb54c5b3
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:52:49 2008 -0700

    signals: send_group_sigqueue: don't take tasklist_lock
    
    handle_stop_signal() was changed, now send_group_sigqueue() doesn't need
    tasklist_lock.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: 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 f8c5b5c06f63fe9aaebefbf9f0b79909066b1b6c
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:52:49 2008 -0700

    signals: __group_complete_signal: cache the value of p->signal
    
    Cosmetic, cache p->signal to make the code a bit more readable.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: 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 5fc894bb4fb1de8373d1d5fb6db19204a16859e8
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:52:48 2008 -0700

    signals: send_sigqueue: don't forget about handle_stop_signal()
    
    send_group_sigqueue() calls handle_stop_signal(), send_sigqueue() doesn't.
    This is not consistent and in fact I'd say this is (minor) bug.
    
    Move handle_stop_signal() from send_group_sigqueue() to do_send_sigqueue(),
    the latter is called by send_sigqueue() too.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: 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 5c193e8871b76f3bf8ed1e31f7af7c70890ebc4f
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:52:48 2008 -0700

    signals: send_sigqueue: don't take rcu lock
    
    lock_task_sighand() was changed, send_sigqueue() doesn't need rcu_read_lock()
    any longer.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: 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 f6b76d4fb0039e077824be85ed4ac94e96beef86
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:52:47 2008 -0700

    get_signal_to_deliver: use the cached ->signal/sighand values
    
    Cache the values of current->signal/sighand.  Shrinks .text a bit and makes
    the code more readable.  Also, remove "sigset_t *mask", it is pointless
    because in fact we save the constant offset.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: Roland McGrath <roland at redhat.com>
    Cc: Jiri Kosina <jkosina at suse.cz>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit ad16a4606939ce1bedb79c87e412467be803e990
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:52:46 2008 -0700

    handle_stop_signal: use the cached p->signal value
    
    Cache the value of p->signal, and change the code to use while_each_thread()
    helper.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: Roland McGrath <roland at redhat.com>
    Cc: Jiri Kosina <jkosina at suse.cz>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit fc321d2e60d6f4eee17206612d0b50519f526daf
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:52:46 2008 -0700

    handle_stop_signal: unify partial/full stop handling
    
    Now that handle_stop_signal() doesn't drop ->siglock, we can't see both
    ->group_stop_count && SIGNAL_STOP_STOPPED.  Merge two "if" branches.
    
    As Roland pointed out, we never actually needed 2 do_notify_parent_cldstop()
    calls.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: Roland McGrath <roland at redhat.com>
    Cc: Jiri Kosina <jkosina at suse.cz>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 6ca25b551309eb1b1b41f83414a92f7472e0b23d
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:52:45 2008 -0700

    kill_pid_info: don't take now unneeded tasklist_lock
    
    Previously handle_stop_signal(SIGCONT) could drop ->siglock.  That is why
    kill_pid_info(SIGCONT) takes tasklist_lock to make sure the target task can't
    go away after unlock.  Not needed now.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: Roland McGrath <roland at redhat.com>
    Cc: Jiri Kosina <jkosina at suse.cz>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit e442055193e4584218006e616c9bdce0c5e9ae5c
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:52:44 2008 -0700

    signals: re-assign CLD_CONTINUED notification from the sender to reciever
    
    Based on discussion with Jiri and Roland.
    
    In short: currently handle_stop_signal(SIGCONT, p) sends the notification to
    p->parent, with this patch p itself notifies its parent when it becomes
    running.
    
    handle_stop_signal(SIGCONT) has to drop ->siglock temporary in order to notify
    the parent with do_notify_parent_cldstop().  This leads to multiple problems:
    
    	- as Jiri Kosina pointed out, the stopped task can resume without
    	  actually seeing SIGCONT which may have a handler.
    
    	- we race with another sig_kernel_stop() signal which may come in
    	  that window.
    
    	- we race with sig_fatal() signals which may set SIGNAL_GROUP_EXIT
    	  in that window.
    
    	- we can't avoid taking tasklist_lock() while sending SIGCONT.
    
    With this patch handle_stop_signal() just sets the new SIGNAL_CLD_CONTINUED
    flag in p->signal->flags and returns.  The notification is sent by the first
    task which returns from finish_stop() (there should be at least one) or any
    other signalled thread from get_signal_to_deliver().
    
    This is a user-visible change.  Say, currently kill(SIGCONT, stopped_child)
    can't return without seeing SIGCHLD, with this patch SIGCHLD can be delayed
    unpredictably.  Another difference is that if the child is ptraced by another
    process, CLD_CONTINUED may be delivered to ->real_parent after ptrace_detach()
    while currently it always goes to the tracer which doesn't actually need this
    notification.  Hopefully not a problem.
    
    The patch asks for the futher obvious cleanups, I'll send them separately.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: Roland McGrath <roland at redhat.com>
    Cc: Jiri Kosina <jkosina at suse.cz>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 3b5e9e53c6f31b5a5a0f5c43707503c62bdefa46
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:52:42 2008 -0700

    signals: cleanup security_task_kill() usage/implementation
    
    Every implementation of ->task_kill() does nothing when the signal comes from
    the kernel.  This is correct, but means that check_kill_permission() should
    call security_task_kill() only for SI_FROMUSER() case, and we can remove the
    same check from ->task_kill() implementations.
    
    (sadly, check_kill_permission() is the last user of signal->session/__session
     but we can't s/task_session_nr/task_session/ here).
    
    NOTE: Eric W.  Biederman pointed out cap_task_kill() should die, and I think
    he is very right.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: "Eric W. Biederman" <ebiederm at xmission.com>
    Cc: Serge Hallyn <serue at us.ibm.com>
    Cc: Roland McGrath <roland at redhat.com>
    Cc: Casey Schaufler <casey at schaufler-ca.com>
    Cc: David Quigley <dpquigl at tycho.nsa.gov>
    Cc: Eric Paris <eparis at redhat.com>
    Cc: Harald Welte <laforge at gnumonks.org>
    Cc: Pavel Emelyanov <xemul at openvz.org>
    Cc: Stephen Smalley <sds at tycho.nsa.gov>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 9e3bd6c3fb2334be171e69b432039cd18bce4458
Author: Pavel Emelyanov <xemul at openvz.org>
Date:   Wed Apr 30 00:52:41 2008 -0700

    signals: consolidate send_sigqueue and send_group_sigqueue
    
    Both functions do the same thing after proper locking, but with
    different sigpending structs, so move the common code into a helper.
    
    After this we have 4 places that look very similar: send_sigqueue: calls
    do_send_sigqueue and signal_wakeup send_group_sigqueue: calls
    do_send_sigqueue and __group_complete_signal __group_send_sig_info:
    calls send_signal and __group_complete_signal specific_send_sig_info:
    calls send_signal and signal_wakeup
    
    Besides, send_signal performs actions similar to do_send_sigqueue's
    and __group_complete_signal - to signal_wakeup.
    
    It looks like they can be consolidated gracefully.
    
    Oleg said:
    
      Personally, I think this change is very good.  But send_sigqueue() and
      send_group_sigqueue() have a very subtle difference which I was never able
      to understand.
    
      Let's suppose that sigqueue is already queued, and the signal is ignored
      (the latter means we should re-schedule cpu timer or handle overrruns).  In
      that case send_sigqueue() returns 0, but send_group_sigqueue() returns 1.
    
      I think this is not the problem (in fact, I think this patch makes the
      behaviour more correct), but I hope Thomas can take a look and confirm.
    
    Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
    Cc: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: Roland McGrath <roland at redhat.com>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit c5363d03637885310f1101b95cbbd26d067b4c8d
Author: Pavel Emelyanov <xemul at openvz.org>
Date:   Wed Apr 30 00:52:40 2008 -0700

    signals: clean dequeue_signal from excess checks and assignments
    
    The signr variable may be declared without initialization - it is set ro the
    return value from __dequeue_signal() right at the function beginning.
    
    Besides, after recalc_sigpending() two checks for signr to be not 0 may be
    merged into one.  Both if-s become easier to read.
    
    Thanks to Oleg for pointing out mistakes in the first version of this patch.
    
    Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
    Cc: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: Roland McGrath <roland at redhat.com>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 93585eeaf3d42d608cd7232e7420c93fb676bba1
Author: Pavel Emelyanov <xemul at openvz.org>
Date:   Wed Apr 30 00:52:39 2008 -0700

    signals: consolidate checks for whether or not to ignore a signal
    
    Both sig_ignored() and do_sigaction() check for signr to be explicitly or
    implicitly ignored.  Introduce a helper for them.
    
    This patch is aimed to help handling signals by pid namespace's init, and was
    derived from one of Oleg's patches
    https://lists.linux-foundation.org/pipermail/containers/2007-December/009308.html
    so, if he doesn't mind, he should be considered as an author.
    
    Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
    Cc: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: Roland McGrath <roland at redhat.com>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 06fffb1267c9d986687b69d74a46ee332a50575e
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:52:38 2008 -0700

    do_task_stat: don't take rcu_read_lock()
    
    lock_task_sighand() was changed, and do_task_stat() doesn't need
    rcu_read_lock any longer.  sighand->siglock protects all "interesting"
    fields.
    
    Except: it doesn't protect ->tty->pgrp, but neither does rcu_read_lock(), this
    should be fixed.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: "Eric W. Biederman" <ebiederm at xmission.com>
    Cc: "Paul E. McKenney" <paulmck at linux.vnet.ibm.com>
    Cc: Roland McGrath <roland at redhat.com>
    Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
    Cc: Pavel Emelyanov <xemul at sw.ru>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit d6cf723a142f63ccb92272bc0e9bfffd3c3a5cac
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:52:38 2008 -0700

    k_getrusage: don't take rcu_read_lock()
    
    Just a trivial example, more to come.
    
    k_getrusage() holds rcu_read_lock() because it was previously required by
    lock_task_sighand().  Unneeded now.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: "Eric W. Biederman" <ebiederm at xmission.com>
    Cc: "Paul E. McKenney" <paulmck at linux.vnet.ibm.com>
    Cc: 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 1406f2d321bae5ac5ff729dcb773336d9c05ec74
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:52:37 2008 -0700

    lock_task_sighand: add rcu lock/unlock
    
    Most of the callers of lock_task_sighand() doesn't actually need rcu_lock().
    lock_task_sighand() needs it only to safely play with tsk->sighand, it can
    take the lock itself.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: "Eric W. Biederman" <ebiederm at xmission.com>
    Cc: "Paul E. McKenney" <paulmck at linux.vnet.ibm.com>
    Cc: 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 bfc4b0890af566940de6e7aeb4b5faf46d3c3513
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:52:36 2008 -0700

    signals: do_group_exit(): use signal_group_exit() more consistently
    
    do_group_exit() checks SIGNAL_GROUP_EXIT to avoid taking sighand->siglock.
    Since ed5d2cac114202fe2978a9cbcab8f5032796d538 exec() doesn't set this
    flag, we should use signal_group_exit().
    
    This is not needed for correctness, but can speedup the multithreaded exec
    and makes the code more consistent.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: 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 573cf9ad72c13750e86c91de43477e9dfb440523
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date:   Wed Apr 30 00:52:36 2008 -0700

    signals: do_signal_stop(): use signal_group_exit()
    
    do_signal_stop() needs signal_group_exit() but checks sig->group_exit_task.
     This (optimization) is correct, SIGNAL_STOP_DEQUEUED and SIGNAL_GROUP_EXIT
    are mutually exclusive, but looks confusing.  Use signal_group_exit(), this
    is not fastpath, the code clarity is more important.
    
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: 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 2acb024d5524eda305523c1d6061fe5ef1949165
Author: Pavel Emelyanov <xemul at openvz.org>
Date:   Wed Apr 30 00:52:35 2008 -0700

    signals: consolidate checking for ignored/legacy signals
    
    Two callers for send_signal() - the specific_send_sig_info and the
    __group_send_sig_info - both check for sig to be ignored or already queued.
    
    Move these checks into send_signal() and make it return 1 to indicate that the
    signal is dropped, but there's no error in this.
    
    Besides, merge comments and spell-check them.
    
    [oleg at tv-sign.ru: simplifications]
    Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
    Cc: Roland McGrath <roland at redhat.com>
    Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit af7fff9c13d56657dc328c75590f401c99bcecd9
Author: Pavel Emelyanov <xemul at openvz.org>
Date:   Wed Apr 30 00:52:34 2008 -0700

    signals: turn LEGACY_QUEUE macro into static inline function
    
    This makes the code more readable, due to less brackets and small letters in
    name.
    
    I also move it above the send_signal() as a preparation for the 3rd patch.
    
    Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
    Cc: Roland McGrath <roland at redhat.com>
    Cc: Oleg Nesterov <oleg at tv-sign.ru>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit e1401c6bbb289d154eb0d0c292cc9f8259e4af73
Author: Pavel Emelyanov <xemul at openvz.org>
Date:   Wed Apr 30 00:52:34 2008 -0700

    signals: remove unused variable from send_signal()
    
    This function doesn't change the ret's value and thus always returns 0, with a
    single exception of returning -EAGAIN explicitly.
    
    Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
    Cc: Roland McGrath <roland at redhat.com>
    Cc: Oleg Nesterov <oleg at tv-sign.ru>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 2deb1acc653cbd5384b107d050d2deba089db2bd
Author: Jan Kara <jack at suse.cz>
Date:   Wed Apr 30 00:52:33 2008 -0700

    isofs: fix access to unallocated memory when reading corrupted filesystem
    
    When a directory on isofs is corrupted, we did not check whether length of the
    name in a directory entry and the length of the directory entry itself are
    consistent.  This could lead to possible access beyond the end of buffer when
    the length of the name was too big.  Add this sanity check to directory
    reading code.
    
    Signed-off-by: Jan Kara <jack at suse.cz>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 6bfe0b499082fd3950429017cd8ebf2a6c458aa5
Author: Dan Williams <dan.j.williams at intel.com>
Date:   Wed Apr 30 00:52:32 2008 -0700

    md: support blocking writes to an array on device failure
    
    Allows a userspace metadata handler to take action upon detecting a device
    failure.
    
    Based on an original patch by Neil Brown.
    
    Changes:
    -added blocked_wait waitqueue to rdev
    -don't qualify Blocked with Faulty always let userspace block writes
    -added md_wait_for_blocked_rdev to wait for the block device to be clear, if
     userspace misses the notification another one is sent every 5 seconds
    -set MD_RECOVERY_NEEDED after clearing "blocked"
    -kill DoBlock flag, just test mddev->external
    
    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 11e2ede0228ee0f81ccacd15894908c3bf241f73
Author: Dan Williams <dan.j.williams at intel.com>
Date:   Wed Apr 30 00:52:32 2008 -0700

    md: prevent duplicates in bind_rdev_to_array
    
    Found when trying to reassemble an active externally managed array.  Without
    this check we hit the more noisy "sysfs duplicate" warning in the later call
    to kobject_add.
    
    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 242b363e2207d14125f52a6701cfda7376a2a2fc
Author: Dan Williams <dan.j.williams at intel.com>
Date:   Wed Apr 30 00:52:31 2008 -0700

    md: remove a stray command from a copy and paste error in resync_start_store
    
    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 648b629ed406233b0a607a3cf29d8a169876131f
Author: NeilBrown <neilb at suse.de>
Date:   Wed Apr 30 00:52:30 2008 -0700

    md: fix up switching md arrays between read-only and read-write
    
    When setting an array to 'readonly' or to 'active' via sysfs, we must make the
    appropriate set_disk_ro call too.
    
    Also when switching to "read_auto" (which is like readonly, but blocks on the
    first write so that metadata can be marked 'dirty') we need to be more careful
    about what state we are changing from.
    
    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 31a59e3425d32743738e043c1df1668e0f22bbab
Author: NeilBrown <neilb at suse.de>
Date:   Wed Apr 30 00:52:30 2008 -0700

    md: fix 'safemode' handling for external metadata.
    
    'safemode' relates to marking an array as 'clean' if there has been no write
    traffic for a while (a couple of seconds), to reduce the chance of the array
    being found dirty on reboot.
    
    ->safemode is set to '1' when there have been no write for a while, and it
    gets set to '0' when the superblock is updates with the 'clean' flag set.
    
    This requires a few fixes for 'external' metadata:
     - When an array is set to 'clean' via sysfs, 'safemode' must be cleared.
     - when we write to an array that has 'safemode' set (there must have been
            some delay in updating the metadata), we need to clear safemode.
     - Don't try to update external metadata in md_check_recovery for safemode
            transitions - it won't work.
    
    Also, don't try to support "immediate safe mode" (safemode==2) for external
    metadata, it cannot really work (the safemode timeout can be set very low if
    this is really needed).
    
    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 d897dbf91490f26dccef3d7056ffd09eb83a15a5
Author: NeilBrown <neilb at suse.de>
Date:   Wed Apr 30 00:52:29 2008 -0700

    md: reinitialise more mddev fields in do_md_stop.
    
    I keep finding problems where an mddev gets reused and some fields has a value
    from a previous usage that confuses the new usage.  So clear all fields that
    could possible need clearing when calling do_md_stop.
    
    Also initialise the 'level' of a new array to LEVEL_NONE (which isn't 0).
    
    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 8377bc808029251c2c0f52116cf87d80291b25bf
Author: NeilBrown <neilb at suse.de>
Date:   Wed Apr 30 00:52:28 2008 -0700

    md: skip all metadata update processing when using external metadata.
    
    All the metadata update processing for external metadata is on in user-space
    or through the sysfs interfaces, so make "md_update_sb" a no-op in that case.
    
    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 6a51830e14529063cb2685921e1177d9af50e49a
Author: Dan Williams <dan.j.williams at intel.com>
Date:   Wed Apr 30 00:52:28 2008 -0700

    md: fix use after free when removing rdev via sysfs
    
    rdev->mddev is no longer valid upon return from entry->store() when the
    'remove' command is given.
    
    Cc: <stable at kernel.org>
    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 7f1133cbf20bc308d73ba49f971180924e12119b
Author: Eric Miao <eric.miao at marvell.com>
Date:   Wed Apr 30 00:52:27 2008 -0700

    pxafb: preliminary smart panel interface support (update)
    
    FB_PXA_SMARTPANEL defaults to "n" and removed the cast to void *.
    
    Signed-off-by: Daniel Mack <daniel at caiaq.de>
    Acked-by: Eric Miao <eric.miao at marvell.com>
    Cc: "Antonino A. Daplas" <adaplas at pol.net>
    Cc: Russell King <rmk at arm.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 3c42a449107bf76c59b8e0b6a30d070e9696e49c
Author: Eric Miao <eric.miao at marvell.com>
Date:   Wed Apr 30 00:52:26 2008 -0700

    pxafb: preliminary smart panel interface support
    
    Signed-off-by: Daniel Mack <daniel at caiaq.de>
    Signed-off-by: Eric Miao <eric.miao at marvell.com>
    Cc: "Antonino A. Daplas" <adaplas at pol.net>
    Cc: Russell King <rmk at arm.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 90eabbf0ec0c626cf5d186214cf8fc79150a7a29
Author: Eric Miao <eric.miao at marvell.com>
Date:   Wed Apr 30 00:52:25 2008 -0700

    pxafb: move parallel LCD timing setup into dedicate function
    
    the new_regs stuff has been removed, and all the setup (modification to those
    fbi->reg_*) is protected with IRQ disabled
    
       * disable IRQ is too heavy here, provided that no IRQ context will
         touch the fbi->reg_* and the only possible contending place is
         in the CPUFREQ_POSTCHANGE (task context), a mutex will be better,
         leave this for future improvement
    
    Signed-off-by: eric miao <eric.miao at marvell.com>
    Cc: "Antonino A. Daplas" <adaplas at pol.net>
    Cc: Russell King <rmk at arm.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 2ba162b9335c6e3ba90c77637372fc9f078aae67
Author: Eric Miao <eric.miao at marvell.com>
Date:   Wed Apr 30 00:52:24 2008 -0700

    pxafb: use completion for LCD disable wait code
    
    Signed-off-by: eric miao <eric.miao at marvell.com>
    Cc: "Antonino A. Daplas" <adaplas at pol.net>
    Cc: Russell King <rmk at arm.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit a7535ba730e13db037bd22c79c3805690d0945a2
Author: Eric Miao <eric.miao at marvell.com>
Date:   Wed Apr 30 00:52:24 2008 -0700

    pxafb: introduce lcd_{read,write}l() to wrap the __raw_{read,write}l()
    
    using __raw_{read,write}l() everywhere looks messy, introduce
    lcd_{read,write}l() to get this cleaned up a bit
    
    Signed-off-by: eric miao <eric.miao at marvell.com>
    Cc: "Antonino A. Daplas" <adaplas at pol.net>
    Cc: Russell King <rmk at arm.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 0454bd09de7380aac464c09018e6a533f7247b0d
Author: eric miao <eric.miao at marvell.com>
Date:   Wed Apr 30 00:52:23 2008 -0700

    pxafb: make lubbock/mainstone/zylonite/littleton to use new LCD connection type
    
    Signed-off-by: eric miao <eric.miao at marvell.com>
    Cc: "Antonino A. Daplas" <adaplas at pol.net>
    Cc: Russell King <rmk at arm.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 84f43c308b73a6a12128288721a1007ba4f1a8da
Author: eric miao <eric.miao at marvell.com>
Date:   Wed Apr 30 00:52:22 2008 -0700

    pxafb: introduce register independent LCD connection type for pxafb
    
    Reasons:
    
      1. straight forward: the name "LCD_COLOR_DSTN_16BPP" is much better
         than "LCCR0_Pas | LCCR0_Color | LCCR0_Dual"
    
      2. by defining LCD connection types as constants, it allows only
         valid possibilities
    
      3. by removing the dependency of register bits definitions, those
         can be later moved into the body of pxafb.c, instead of having
         a regs-lcd.h around
    
    Currently, only lubbock, mainstone, zylonite and littleton have been
    modified to support these types (see coming patches after this).
    Other platforms are encouraged to change their way describing the
    LCD controller connections.
    
    Signed-off-by: eric miao <eric.miao at marvell.com>
    Cc: "Antonino A. Daplas" <adaplas at pol.net>
    Cc: Russell King <rmk at arm.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 2c42dd8ebdd92ad59d9a68f88f0e20ad9f45270a
Author: eric miao <eric.miao at marvell.com>
Date:   Wed Apr 30 00:52:21 2008 -0700

    pxafb: introduce "struct pxafb_dma_buff" for palette and dma descriptors
    
    Use structure and array for palette buffer and dma descriptors to:
    
    1. better organize code for future expansion like overlays
    2. separate palette and dma descriptors from frame buffer
    
    Signed-off-by: eric miao <eric.miao at marvell.com>
    Cc: "Antonino A. Daplas" <adaplas at pol.net>
    Cc: Russell King <rmk at arm.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit ce4fb7b892a6d6c6a0f87366b26fd834d2923dd7
Author: eric miao <eric.miao at marvell.com>
Date:   Wed Apr 30 00:52:21 2008 -0700

    pxafb: convert fb driver to use ioremap() and __raw_{readl, writel}
    
    This is part of the effort moving peripheral registers outside of pxa-regs.h,
    and using ioremap() make it possible the same IP can be re-used on different
    processors with different registers space
    
    As a result, the fixed mapping in pxa_map_io() is removed.
    
    The regs-lcd.h can actually moved to where closer to pxafb.c but some of its
    bit definitions are directly used by various platform code, though this is not
    a good style.
    
    Signed-off-by: eric miao <eric.miao at marvell.com>
    Cc: "Antonino A. Daplas" <adaplas at pol.net>
    Cc: Russell King <rmk at arm.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 92ac73c1e4b4e039162f5d3980c2da8192b28060
Author: eric miao <eric.miao at marvell.com>
Date:   Wed Apr 30 00:52:20 2008 -0700

    pxafb: sanitize the usage of #ifdef .. processing pxafb parameters
    
    So to get a better coding style and centralize the pxafb parameters
    handling code.
    
    Signed-off-by: eric miao <eric.miao at marvell.com>
    Cc: "Antonino A. Daplas" <adaplas at pol.net>
    Cc: Russell King <rmk at arm.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit ded245b67f0a412b75052a285a0b0d1798650a63
Author: eric miao <eric.miao at marvell.com>
Date:   Wed Apr 30 00:52:19 2008 -0700

    pxafb: purge unnecessary pr_debug and comments from pxafb
    
    Signed-off-by: eric miao <eric.miao at marvell.com>
    Cc: "Antonino A. Daplas" <adaplas at pol.net>
    Cc: Russell King <rmk at arm.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit b0086efba5ad4905090b1e2e62a7e84d9473287f
Author: eric miao <eric.miao at marvell.com>
Date:   Wed Apr 30 00:52:19 2008 -0700

    pxafb: fix various coding style issues for pxafb
    
    Signed-off-by: eric miao <eric.miao at marvell.com>
    Cc: "Antonino A. Daplas" <adaplas at pol.net>
    Cc: Russell King <rmk at arm.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 817daf14a5fa77d4e2c3b63c9be12fbf6eada37d
Author: eric miao <eric.miao at marvell.com>
Date:   Wed Apr 30 00:52:18 2008 -0700

    pxafb: un-nest pxafb_parse_options() to cleanup the coding style issue
    
    pxafb_parse_options() has very long lines exceeding far beyond 80 characters,
    which makes the function looks bad.  Un-nest it into smaller functions and use
    a temporary string for only what has been overridden instead of the whole
    dev_info() message to reduce the line a bit more.
    
    Signed-off-by: eric miao <eric.miao at marvell.com>
    Cc: "Antonino A. Daplas" <adaplas at pol.net>
    Cc: Russell King <rmk at arm.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 592e7bf80566bf5ac3ed073d4e198dd5b0824c04
Author: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
Date:   Wed Apr 30 00:52:17 2008 -0700

    atmel_spi: clean up baud rate divisor calculation
    
    Make the baud rate divisor calculation code a bit more readable and add a
    few comments.
    
    Also fix wrong debug information being displayed when !new_1 and
    max_speed_hz == 0.
    
    [david-b at pacbell.net: fix it]
    Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
    Cc: "Janesh Ramakrishnan" <jramakrishnan at neuropace.com>
    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 c6495aaabfaa8256c292c54b48ab081f4d86ad79
Author: Bryan Wu <cooloney at kernel.org>
Date:   Wed Apr 30 00:52:16 2008 -0700

    kallsyms: nuke all ChangeLog, this should be logged by git
    
    Pointed out by Paulo:
      "When I wrote this initially, it was a mistake to add a Changelog in
       the first place, but I didn't know better at the time.
    
       If you're going to make changes to this file, please remove all the
       Changelog, instead of adding more entries to it.  The 'Changelog'
       should be kept by the version control system, and not the source code
       itself."
    
    Cc: Paulo Marques <pmarques at grupopie.com>
    Signed-off-by: Bryan Wu <cooloney at kernel.org>
    Acked-by: Paulo Marques <pmarques at grupopie.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 41b25a3784c137ad52c71619c73b925860b1b3a2
Author: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
Date:   Wed Apr 30 00:52:13 2008 -0700

    /proc/pagetypeinfo: fix output for memoryless nodes
    
    on memoryless node, /proc/pagetypeinfo is displayed slightly funny output.
    this patch fix it.
    
    output example (header is outputed, but no data is outputed)
    --------------------------------------------------------------
    Page block order: 14
    Pages per block:  16384
    
    Free pages count per migrate type at order       0      1      2      3      4      5    \
      6      7      8      9     10     11     12     13     14     15     16
    
    Number of blocks type     Unmovable  Reclaimable      Movable      Reserve      Isolate
    Page block order: 14
    Pages per block:  16384
    
    Free pages count per migrate type at order       0      1      2      3      4      5    \
      6      7      8      9     10     11     12     13     14     15     16
    
    Signed-off-by: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
    Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
    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 2f3517418dc0684a32318f2c5b53257416448b1e
Author: Bryan Wu <bryan.wu at analog.com>
Date:   Wed Apr 30 00:52:12 2008 -0700

    Blackfin serial driver: this driver enable SPORTs on Blackfin emulate UART
    
    Signed-off-by: Bryan Wu <bryan.wu at analog.com>
    Cc: 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 4e68852dca7a16271d09269f643a8e0eb8bb500d
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Wed Apr 30 00:52:11 2008 -0700

    MAINTAINERS: sort ordering
    
    Seems we have various confused entries around S and T.  Sort them all out and
    also add myself as tty maintainer (which is how I noticed it).
    
    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 64275ea4f33636de198da5c78d0dbe31522555b0
Author: David Chinner <dgc at sgi.com>
Date:   Wed Apr 30 17:11:16 2008 +1000

    [XFS] Include linux/random.h in all builds, not just debug.
    
    Noted-by: Stephen Rothwell <sfr at canb.auug.org.au>
    Signed-off-by: Dave Chinner <dgc at sgi.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 1175cdc670f2d4197b033f823b32435031a6daa8
Author: Martin Schwidefsky <schwidefsky at de.ibm.com>
Date:   Wed Apr 30 13:38:50 2008 +0200

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

commit 941af343e2e25ff7afce43a3c7e2922643b8cd48
Author: Martin Schwidefsky <schwidefsky at de.ibm.com>
Date:   Wed Apr 30 13:38:49 2008 +0200

    [S390] use generic sys_ptrace
    
    After the PT_IEEE_IP hack has been removed s390 can now use
    the common code sys_ptrace function.
    
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit 613e1def6b52c399a8b72a5e11bc2e57d2546fb8
Author: Martin Schwidefsky <schwidefsky at de.ibm.com>
Date:   Wed Apr 30 13:38:48 2008 +0200

    [S390] Remove self ptrace IEEE_IP hack.
    
    The self referential PT_IEEE_IP ptrace peek & poke calls have been
    broken for that last 6 years. For peek the code always returns 0
    instead of the last ieee fault and for poke the code does nothing.
    Since nobody noticed the code seems to be superfluous. So lets
    remove it.
    
    Cc: Christoph Hellwig <hch at infradead.org>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit 17f345808563d2f425b2b15d60c4a5b00112e9eb
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date:   Wed Apr 30 13:38:47 2008 +0200

    [S390] Convert to SPARSEMEM & SPARSEMEM_VMEMMAP
    
    Convert s390 to SPARSEMEM and SPARSEMEM_VMEMMAP. We do a select
    of SPARSEMEM_VMEMMAP since it is configurable. This is because
    SPARSEMEM without SPARSEMEM_VMEMMAP gives us a hell of broken
    include dependencies that I don't want to fix.
    
    Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit 53492b1de46a7576170e865062ffcfc93bb5650b
Author: Gerald Schaefer <geraldsc at de.ibm.com>
Date:   Wed Apr 30 13:38:46 2008 +0200

    [S390] System z large page support.
    
    This adds hugetlbfs support on System z, using both hardware large page
    support if available and software large page emulation on older hardware.
    Shared (large) page tables are implemented in software emulation mode,
    by using page->index of the first tail page from a compound large page
    to store page table information.
    
    Signed-off-by: Gerald Schaefer <geraldsc at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit 2e5061e40af88070984e3769eafb5a06022375fd
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date:   Wed Apr 30 13:38:45 2008 +0200

    [S390] Convert machine feature detection code to C.
    
    From: Heiko Carstens <heiko.carstens at de.ibm.com>
    From: Carsten Otte <cotte at de.ibm.com>
    
    This lets us use defines for the magic bits in machine flags instead
    of using plain numbers all over the place.
    In addition on newer machines features/facilities are indicated by the
    result of the stfl instruction. So we use these bits instead of trying
    to execute new instructions and check wether we get an exception or
    not.
    Also the mvpg instruction is always available when in zArch mode,
    whereas the idte instruction is only available in zArch mode. This
    results in some minor optimizations.
    
    Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
    Signed-off-by: Carsten Otte <cotte at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit 8fc63658681f32e6e29f6d1138de933d7272e0ec
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date:   Wed Apr 30 13:38:44 2008 +0200

    [S390] vmemmap: use clear_table to initialise page tables.
    
    Always use clear_table to initialise page tables. The overlapping
    memcpy is just a leftover of a previous version that wasn't fully
    converted to clear_table.
    
    Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit 484875b11f355b1b54d508a3f4671888f07e643c
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date:   Wed Apr 30 13:38:43 2008 +0200

    [S390] Move stfl to system.h and delete duplicated version.
    
    Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit ccf183e469be89e065ed389da9d3f50bd2faa215
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date:   Wed Apr 30 13:38:42 2008 +0200

    [S390] uaccess_mvcos: #ifdef config dependent code.
    
    arch/s390/lib/uaccess_mvcos.c:166:
     warning: 'strnlen_user_mvcos' defined but not used
    arch/s390/lib/uaccess_mvcos.c:186:
     warning: 'strncpy_from_user_mvcos' defined but not used
    
    Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit fd781fa25c9e9c6fd1599df060b05e7c4ad724e5
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date:   Wed Apr 30 13:38:41 2008 +0200

    [S390] cpu topology: Fix possible deadlock.
    
    When we get a notification that cpu topology changed, we schedule a
    work struct which just calls arch_reinit_sched_domains. This function
    in turn calls get_online_cpus() which results int the lockdep warning
    below.
    
    After all it turnded out that it's not legal to call get_online_cpus()
    from the context of a multi-threaded work queue.
    It could deadlock this way:
    
    process 0 (events/cpu-x):
    -> run_workqueue
    -> removes my work_struct from the work queue
    -> calls work_struct->fn
    -> get_online_cpus()
    -> locks on cpu_hotplug.lock since process 1 below is doing cpu hotplug
    
    process 1:
    -> cpu_down (for cpu-x)
    -> cpu_hotplug_begin (holds cpu_hotplug.lock now)
    -> cpu-x dead
    -> notifier_call_chain with CPU_DEAD
    -> cleanup_workqueue_thread
    -> flush_cpu_workqueue (succeeds)
    -> kthread_stop for events/cpu-x
      -> now kthread_stop waits for my work_struct to complete from within
         process 0. -> dead.
    
    A single threaded workqueue wouldn't have such problems, however there is
    no such common queue available and it's not worth to create one for the
    very rare calls to arch_reinit_sched_domains.
    
    So we just create a kernel thread from our work struct which calls
    arch_reinit_sched_domains and are done with it.
    
    Thanks to Oleg Nesterov and Peter Zijlstra for helping me figuring out
    that this isn't a false positive lockdep warning:
    
    =======================================================
    [ INFO: possible circular locking dependency detected ]
    2.6.25-03562-g3dc5063-dirty #12
    -------------------------------------------------------
    events/3/14 is trying to acquire lock:
     (&cpu_hotplug.lock){--..}, at: [<0000000000076094>] get_online_cpus+0x50/0x78
    
    but task is already holding lock:
     (topology_work){--..}, at: [<0000000000059cde>] run_workqueue+0x106/0x278
    
    which lock already depends on the new lock.
    
    the existing dependency chain (in reverse order) is:
    
    -> #2 (topology_work){--..}:
           [<000000000006fc74>] __lock_acquire+0x1010/0x111c
           [<000000000006fe40>] lock_acquire+0xc0/0xf8
           [<0000000000059d48>] run_workqueue+0x170/0x278
           [<0000000000059edc>] worker_thread+0x8c/0xf0
           [<000000000005f5bc>] kthread+0x68/0xa0
           [<000000000001a33e>] kernel_thread_starter+0x6/0xc
           [<000000000001a338>] kernel_thread_starter+0x0/0xc
    
    -> #1 (events){--..}:
           [<000000000006fc74>] __lock_acquire+0x1010/0x111c
           [<000000000006fe40>] lock_acquire+0xc0/0xf8
           [<000000000005a23c>] cleanup_workqueue_thread+0x60/0xa8
           [<00000000003b2ab8>] workqueue_cpu_callback+0xbc/0x170
           [<00000000003bba80>] notifier_call_chain+0x5c/0xa4
           [<00000000000655a2>] __raw_notifier_call_chain+0x26/0x38
           [<00000000000655e2>] raw_notifier_call_chain+0x2e/0x40
           [<0000000000075e00>] cpu_down+0x228/0x31c
           [<00000000003b1dd8>] store_online+0x64/0xb8
           [<00000000001e7128>] sysdev_store+0x48/0x58
           [<0000000000121cd2>] sysfs_write_file+0x126/0x1c0
           [<00000000000c1944>] vfs_write+0xb0/0x15c
           [<00000000000c20e6>] sys_write+0x56/0x88
           [<0000000000027a68>] sys32_write+0x34/0x4c
           [<0000000000023f70>] sysc_noemu+0x10/0x16
           [<0000000077f3f186>] 0x77f3f186
    
    -> #0 (&cpu_hotplug.lock){--..}:
           [<000000000006fa84>] __lock_acquire+0xe20/0x111c
           [<000000000006fe40>] lock_acquire+0xc0/0xf8
           [<00000000003b701c>] mutex_lock_nested+0xd0/0x364
           [<0000000000076094>] get_online_cpus+0x50/0x78
           [<000000000003a03e>] arch_reinit_sched_domains+0x26/0x58
           [<000000000002700e>] topology_work_fn+0x26/0x34
           [<0000000000059d4e>] run_workqueue+0x176/0x278
           [<0000000000059edc>] worker_thread+0x8c/0xf0
           [<000000000005f5bc>] kthread+0x68/0xa0
           [<000000000001a33e>] kernel_thread_starter+0x6/0xc
           [<000000000001a338>] kernel_thread_starter+0x0/0xc
    
    other info that might help us debug this:
    
    2 locks held by events/3/14:
     #0:  (events){--..}, at: [<0000000000059cde>] run_workqueue+0x106/0x278
     #1:  (topology_work){--..}, at: [<0000000000059cde>] run_workqueue+0x106/0x278
    
    stack backtrace:
    CPU: 3 Not tainted 2.6.25-03562-g3dc5063-dirty #12
    Process events/3 (pid: 14, task: 000000002fb04038, ksp: 000000002fb0bd70)
    0400000000000000 000000002fb0ba40 0000000000000002 0000000000000000
           000000002fb0bae0 000000002fb0ba58 000000002fb0ba58 0000000000016488
           0000000000000000 000000002fb0bd70 0000000000000000 0000000000000000
           000000002fb0ba40 000000000000000c 000000002fb0ba40 000000002fb0bab0
           00000000003c99e0 0000000000016488 000000002fb0ba40 000000002fb0ba90
    Call Trace:
    ([<00000000000163fc>] show_trace+0x138/0x158)
     [<00000000000164e2>] show_stack+0xc6/0xf8
     [<0000000000016624>] dump_stack+0xb0/0xc0
     [<000000000006cd36>] print_circular_bug_tail+0xa2/0xb4
     [<000000000006fa84>] __lock_acquire+0xe20/0x111c
     [<000000000006fe40>] lock_acquire+0xc0/0xf8
     [<00000000003b701c>] mutex_lock_nested+0xd0/0x364
     [<0000000000076094>] get_online_cpus+0x50/0x78
     [<000000000003a03e>] arch_reinit_sched_domains+0x26/0x58
     [<000000000002700e>] topology_work_fn+0x26/0x34
     [<0000000000059d4e>] run_workqueue+0x176/0x278
     [<0000000000059edc>] worker_thread+0x8c/0xf0
     [<000000000005f5bc>] kthread+0x68/0xa0
     [<000000000001a33e>] kernel_thread_starter+0x6/0xc
     [<000000000001a338>] kernel_thread_starter+0x0/0xc
    INFO: lockdep is turned off.
    
    Cc: Oleg Nesterov <oleg at tv-sign.ru>
    Cc: Peter Zijlstra <peterz at infradead.org>
    Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit d00aa4e7d0129983fc4389c85e15a066eb4e69a9
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date:   Wed Apr 30 13:38:40 2008 +0200

    [S390] Add topology_core_siblings to topology.h
    
    This exposes the core siblings to user space via sysfs.
    
    Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>

commit edf2209692769d3e461c0351553098bc017c2caf
Author: Cornelia Huck <cornelia.huck at de.ibm.com>
Date:   Wed Apr 30 13:38:39 2008 +0200

    [S390] cio: Make isc handling more robust.
    
    Introduce an ->isc field in the subchannel to store the desired
    interruption subclass, since sch->schib.pmcw.isc may be overwritten
    by the hardware on stsch() after machine checks.
    
    Signed-off-by: Cornelia Huck <cornelia.huck at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit 47494f6a84cdae2740b62e1d86a1860df85d9bbb
Author: Mathieu Desnoyers <mathieu.desnoyers at polymtl.ca>
Date:   Wed Apr 30 13:38:38 2008 +0200

    [S390] remove -traditional
    
    Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at polymtl.ca>
    CC: Sam Ravnborg <sam at ravnborg.org>
    Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit 1e489518da2a49604df2c3281034097274324be9
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date:   Wed Apr 30 13:38:37 2008 +0200

    [S390] Automatically detect added cpus.
    
    Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit 0b18d318b80a7f350648ca8f7cc00a2f688104cb
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date:   Wed Apr 30 13:38:36 2008 +0200

    [S390] smp: Fix locking order.
    
    On some smp sysfs store attributes get_online_cpus() may block on
    cpu_hotplug.lock, but we hold already smp_cpu_state_mutex. Since the
    locking order on cpu hotplug via arch_update_cpu_topology is inverse
    this might lead to deadlocks.
    So make sure locking order is always the same.
    
    Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit f291e17227cf30432ca7c402220f62e6924dd97d
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date:   Wed Apr 30 13:38:35 2008 +0200

    [S390] Add missing ifndef/define to include/asm-s390/sysinfo.h.
    
    In order to protect against compile breakage in case the header file
    gets included twice.
    
    Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit 4e83be7b24ba4fe40acf0b967bd6ae8c9ac79bde
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date:   Wed Apr 30 13:38:34 2008 +0200

    [S390] Move show_regs to traps.c.
    
    This is where it should be and we can get rid of some externs
    and a static inline function.
    
    Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit 2f972202315cf71fd60e890ebbed7d5bcf620ba4
Author: Cornelia Huck <cornelia.huck at de.ibm.com>
Date:   Wed Apr 30 13:38:33 2008 +0200

    [S390] cio: Use strict_strtoul() for attributes.
    
    Make parsing of attribute writes handle incorrect input better.
    
    Signed-off-by: Cornelia Huck <cornelia.huck at de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>

commit aecb2b6eac6ee596f34a54fb164138756895c78a
Author: Jason Jin <Jason.jin at freescale.com>
Date:   Sat Apr 19 15:07:56 2008 +0800

    [POWERPC] 86xx: Fix the wrong serial1 interrupt for 8610 board
    
    Signed-off-by: Jason Jin <Jason.jin at freescale.com>
    Signed-off-by: Kumar Gala <galak at kernel.crashing.org>

commit eabd90944b3a00766e84da3d117ea0f3e0a3b1a3
Author: Michael Ellerman <michael at ellerman.id.au>
Date:   Wed Apr 30 14:47:12 2008 +1000

    [POWERPC] Fix crashkernel= handling when no crashkernel= specified
    
    Commit edd8ce67436851a62f99f1d9707b40ea6a8e5323 (Use extended crashkernel
    command line on ppc64), changed the logic in reserve_crashkernel()
    which deals with the crashkernel= command line option.
    
    This introduced a bug in the case when there is no crashkernel= option,
    or it is incorrect.  We would fall through and calculate the crash_size
    based on the existing values in crashk_res.  If both start and end are 0,
    the default, we calculate the crash_size as 1 byte - which is wrong.
    
    Rework the logic so that we use crashk_res, regardless of whether it's
    set by the command line or via the device tree (see prom.c).  Then check
    if we have an empty range (end == start), and if so make sure to set
    both end and start to zero (this is checked in machine_kexec_64.c).  Then
    we calculate the crash_size once we know we have a non-zero range.
    
    Finally we always want to warn the user if they specify a base != 32MB,
    so remove the special case for that in the command line parsing case.
    
    Signed-off-by: Michael Ellerman <michael at ellerman.id.au>
    Signed-off-by: Paul Mackerras <paulus at samba.org>

commit 3243d87441bf7f97c5c9f7dd46b35f5783ec6740
Author: Michael Ellerman <michael at ellerman.id.au>
Date:   Wed Apr 30 13:21:45 2008 +1000

    [POWERPC] Make emergency stack safe for current_thread_info() use
    
    The current_thread_info() macro, used by preempt_count(), assumes the
    base address and size of the stack are THREAD_SIZE aligned.
    
    The emergency stack currently isn't either of these things, which
    could potentially cause problems anytime we're running on the
    emergency stack.  That includes when we detect a bad kernel stack
    pointer, and also during early_setup_secondary().
    
    Signed-off-by: Michael Ellerman <michael at ellerman.id.au>
    Signed-off-by: Paul Mackerras <paulus at samba.org>

commit 159131149c2f56c1da5ae5e23ab9d5acef4916d1
Author: Lachlan Andrew <lachlan.andrew at gmail.com>
Date:   Wed Apr 30 01:04:03 2008 -0700

    tcp: Overflow bug in Vegas
    
    From: Lachlan Andrew <lachlan.andrew at gmail.com>
    
    There is an overflow bug in net/ipv4/tcp_vegas.c for large BDPs
    (e.g. 400Mbit/s, 400ms).  The multiplication (old_wnd *
    vegas->baseRTT) << V_PARAM_SHIFT overflows a u32.
    
    [ Fix tcp_veno.c too, it has similar calculations. -DaveM ]
    
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 595f403c1af37b1339e64b89040528b8cd48c5a3
Merge: 822252521651ad74a6d41e712d790e2f10838a67 d0eb801c60c20c2fbfc70e677415122798c472d2
Author: Paul Mackerras <paulus at samba.org>
Date:   Wed Apr 30 16:53:17 2008 +1000

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/jk/spufs

commit d0eb801c60c20c2fbfc70e677415122798c472d2
Author: Kumar Gala <galak at kernel.crashing.org>
Date:   Fri Apr 25 11:03:03 2008 +1000

    [POWERPC] spufs: add .gitignore for spu_save_dump.h & spu_restore_dump.h
    
    Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
    Signed-off-by: Jeremy Kerr <jk at ozlabs.org>

commit be9164e769d57aa10b2bbe15d103edc041b9e7de
Author: Kostya B <bkostya at hotmail.com>
Date:   Tue Apr 29 22:36:30 2008 -0700

    [IPv4] UFO: prevent generation of chained skb destined to UFO device
    
    Problem: ip_append_data() could wrongly generate a chained skb for
    devices which support UFO.  When sk_write_queue is not empty
    (e.g. MSG_MORE), __instead__ of appending data into the next nr_frag
    of the queued skb, a new chained skb is created.
    
    I would normally assume UFO device should get data in nr_frags and not
    in frag_list.  Later the udp4_hwcsum_outgoing() resets csum to NONE
    and skb_gso_segment() has oops.
    
    Proposal:
    1. Even length is less than mtu, employ ip_ufo_append_data()
    and append data to the __existed__ skb in the sk_write_queue.
    
    2. ip_ufo_append_data() is fixed due to a wrong manipulation of
    peek-ing and later enqueue-ing of the same skb.  Now, enqueuing is
    always performed, because on error the further
    ip_flush_pending_frames() would release the queued skb.
    
    Signed-off-by: Kostya B <bkostya at hotmail.com>
    Acked-by: Herbert Xu <herbert at gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 3a8209d19dd791aaac3668be2fa51a9b42113efd
Author: Adrian Bunk <bunk at kernel.org>
Date:   Tue Apr 29 22:29:59 2008 -0700

    iwlwifi: move the selects to the tristate drivers
    
    This patch moves the following select's:
    - RFKILL        : IWLWIFI_RFKILL -> IWLCORE
    - RFKILL_INPUT  : IWLWIFI_RFKILL -> IWLCORE
    - MAC80211_LEDS : IWL4965_LEDS   -> IWLCORE
    - LEDS_CLASS    : IWL4965_LEDS   -> IWLCORE
    - MAC80211_LEDS : IWL3945_LEDS   -> IWL3945
    - LEDS_CLASS    : IWL3945_LEDS   -> IWL3945
    
    The effects are:
    - with IWLCORE=m and/or IWL3945=m RFKILL/RFKILL_INPUT/MAC80211_LEDS/LEDS_CLASS
      are no longer wrongly forced to y
    - fixes a build error with IWLCORE=y, IWL4965=m
      might be a bug in kconfig causing it, but doing this change that is
      anyway the right thing fixes it
    
    Reported-by: Carlos R. Mafra <crmafra2 at gmail.com>
    Signed-off-by: Adrian Bunk <bunk at kernel.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 3734dfc68b64d8ca202c799280daf28c2424659d
Author: Julio M. Merino Vidal <jmerino at ac.upc.edu>
Date:   Wed Apr 30 15:21:17 2008 +1000

    [POWERPC] spufs: trace spu_acquire_saved events
    
    The sputrace module contained a trace entry for spu_acquire_saved, but
    this marker was not placed anywhere. Fix this by adding a marker to the
    routine.
    
    Signed-off-by: Julio M. Merino Vidal <jmerino at ac.upc.edu>
    Signed-off-by: Jeremy Kerr <jk at ozlabs.org>

commit 8a476d49555cb7e8d4222782f695048b46692731
Author: Julio M. Merino Vidal <jmerino at ac.upc.edu>
Date:   Wed Apr 30 15:16:14 2008 +1000

    [POWERPC] spufs: fix marker name for find_victim
    
    Fix a typo in the marker for the find_victim function, which prevented
    it from being traced. It previously read find_vitim.
    
    Signed-off-by: Julio M. Merino Vidal <jmerino at ac.upc.edu>
    Signed-off-by: Jeremy Kerr <jk at ozlabs.org>

commit 534578816f028b0dc675fdcc3314016d98588327
Author: Julio M. Merino Vidal <jmerino at ac.upc.edu>
Date:   Wed Apr 30 15:12:30 2008 +1000

    [POWERPC] spufs: add marker for destroy_spu_context
    
    The sputrace module contained a reference to a marker for
    destroy_spu_context, but this marker did not appear in the code. Fix
    this by adding a marker in the function.
    
    Signed-off-by: Julio M. Merino Vidal <jmerino at ac.upc.edu>
    Signed-off-by: Jeremy Kerr <jk at ozlabs.org>

commit d6508aaf27ccef0d7e986aaa220ad4d098bca260
Author: Julio M. Merino Vidal <jmerino at ac.upc.edu>
Date:   Wed Apr 30 15:06:39 2008 +1000

    [POWERPC] spufs: add sputrace marker parameter names
    
    The markers facility defines the marker parameters to be of the form
    'name %format'. Add parameter names to sputrace, to specify the context
    and %spu paramerters,  instead of just specifying the '%format' part.
    
    Signed-off-by: Julio M. Merino Vidal <jmerino at ac.upc.edu>
    Signed-off-by: Jeremy Kerr <jk at ozlabs.org>

commit 5158e9b5218bd3799c9fa8c401ad24d7f0c0a0a1
Author: Christoph Hellwig <hch at lst.de>
Date:   Tue Apr 29 17:08:38 2008 +1000

    [POWERPC] spufs: add context switch notification log
    
    There are userspace instrumentation tools that need to monitor spu
    context switches. This patch adds a new file called 'switch_log' to
    each spufs context directory that can be used to monitor the context
    switches.
    
    Context switch in/out and exit from spu_run are monitored after the
    file was first opened and can be read from it.
    
    Signed-off-by: Christoph Hellwig <hch at lst.de>
    Signed-off-by: Jeremy Kerr <jk at ozlabs.org>

commit 45e741b89000519bedd4da4e7075a35acf5c655b
Author: Sam Ravnborg <sam at ravnborg.org>
Date:   Tue Apr 29 20:58:15 2008 -0700

    ipv4: annotate a few functions __init in ipconfig.c
    
    A few functions are only used from __init context.
    So annotate these with __init for consistency and silence
    the following warnings:
    
    WARNING: net/ipv4/built-in.o(.text+0x2a876): Section mismatch
             in reference from the function ic_bootp_init() to
             the variable .init.data:bootp_packet_type
    WARNING: net/ipv4/built-in.o(.text+0x2a907): Section mismatch
             in reference from the function ic_bootp_cleanup() to
             the variable .init.data:bootp_packet_type
    
    Note: The warnings only appear with CONFIG_DEBUG_SECTION_MISMATCH=y
    
    Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

commit 957d33fc1a3793e9ca8c24c6400271b924e46e19
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date:   Tue Apr 29 20:10:55 2008 -0700

    docbook: fix fatal rapidio yet again (and more to come)
    
    Don't refer to file that no longer exists:
    docproc: linux-2.6.25-git14/arch/powerpc/kernel/rio.c: No such file or directory
    
    Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 0ff5ce7f30b45cc2014cec465c0e96c16877116e
Merge: c4755d16fce9a4cdbb316c17657444856821bd4b ba7cc365f50cee0758e89217875e56ca3d972ed3
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Apr 29 20:37:59 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:
      V4L/DVB (7798): tuners/Kconfig: Change config name and help to reflect dynamic load for tuners
      V4L/DVB (7794): cx88: Fix a warning
      V4L/DVB (7792): ivtv: correct misspelled "HIMEM4G" to "HIGHMEM4G" in error message
      V4L/DVB (7791): ivtv: POLLHUP must be returned on eof
      V4L/DVB (7789b): Fix merge conflicts

commit c4755d16fce9a4cdbb316c17657444856821bd4b
Merge: c15a2434ed4868cad99278ac4d4ae4de9de62e02 f1fa3342e271029f93d323ca664809b94594fe04
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Apr 29 20:34:49 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: (48 commits)
      ext4: fix hot spins in mballoc after err_freebuddy and err_freemeta
      ext4: fix test ext_generic_write_end() copied return value
      ext3: fix test ext_generic_write_end() copied return value
      ext4: Move mballoc headers/structures to a seperate header file mballoc.h
      ext4: cleanup for compiling mballoc with verification and debugging #defines
      ext4: don't use ext4_error in ext4_check_descriptors
      ext4: mark inode dirty after initializing the extent tree
      ext4: update ctime and mtime for truncate with extents.
      ext4: Don't do GFP_NOFS allocations after taking ext4_lock_group
      ext4: move headers out of include/linux
      ext4: fix wrong gfp type under transaction
      ext4: Fix hang on umount with quotas when journal is aborted
      ext4: Fix update of mtime and ctime on rename
      jdb2: replace remaining __FUNCTION__ occurrences
      ext4: replace remaining __FUNCTION__ occurrences
      jbd2: only create debugfs and stats entries if init is successful
      jbd2: fix kernel-doc notation
      jbd2: replace potentially false assertion with if block
      jbd2: eliminate duplicated code in revocation table init/destroy functions
      jbd2: tidy up revoke cache initialisation and destruction
      ...

commit c15a2434ed4868cad99278ac4d4ae4de9de62e02
Merge: a94a630a4c69430bb4562ab8252104449bba9a67 adaa693b845373296631766176ebf0f73a342e10
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Apr 29 20:34:17 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: (24 commits)
      [XFS] Fix build failure after enabling CONFIG_XFS_DEBUG
      [XFS] remove dmapi cruft in xfs_file.c
      [XFS] remove sendfile leftovers
      [XFS] allow enabling CONFIG_XFS_DEBUG
      [XFS] Don't initialise new inode generation numbers to zero
      [XFS] Fix check for block zero access in xfs_write_iomap_allocate()
      [XFS] Don't double count reserved block changes on UP.
      [XFS] remove xfs_log_ticket_zone on rmmod
      [XFS] fix non-smp xfs build
      [XFS] Fix broken HAVE_SPLICE removal commit.
      [XFS] kill XFS_ICSB_SB_LOCKED
      [XFS] split xfs_icsb_balance_counter
      [XFS] Add xfs_icsb_sync_counters_locked for when m_sb_lock already held
      [XFS] Cleanup xfs_attr a bit with xfs_name and remove cred
      [XFS] kill usesless IHOLD calls in xfs_remove and xfs_rmdir
      [XFS] kill parent == child checks in xfs_remove and xfs_rmdir
      [XFS] kill usesless IHOLD calls in xfs_rename
      [XFS] remove manual lookup from xfs_rename and simplify locking
      [XFS] shrink mrlock_t
      [XFS] simplify xfs_lookup
      ...

commit ba7cc365f50cee0758e89217875e56ca3d972ed3
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date:   Wed Apr 30 03:19:33 2008 -0300

    V4L/DVB (7798): tuners/Kconfig: Change config name and help to reflect dynamic load for tuners
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit c17bf5db76f19211eaed4d01614414f179a06554
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date:   Wed Apr 30 02:17:14 2008 -0300

    V4L/DVB (7794): cx88: Fix a warning
    
    drivers/media/video/cx88/cx88-i2c.c: In function 'attach_inform':
    drivers/media/video/cx88/cx88-i2c.c:102: warning: unused variable 'tun_setup'
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit dab2ea48dcd3f75fda7ea25479666693321636be
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date:   Mon Apr 28 20:16:20 2008 -0300

    V4L/DVB (7792): ivtv: correct misspelled "HIMEM4G" to "HIGHMEM4G" in error message
    
    Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
    Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 16928be301b0881f7b7afcf95e0ee7dc3214de8d
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date:   Mon Apr 28 12:18:00 2008 -0300

    V4L/DVB (7791): ivtv: POLLHUP must be returned on eof
    
    Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit a94a630a4c69430bb4562ab8252104449bba9a67
Author: Stephen Rothwell <sfr at canb.auug.org.au>
Date:   Wed Apr 30 11:16:16 2008 +1000

    pasemi_edac needs to include linux/edac.h
    
    Commit c3c52bce6993c6d37af2c2de9b482a7013d646a7 ("edac: fix module
    initialization on several modules 2nd time") added a call to opstate_init
    but did not include linux/edac.h that declares it.
    
    Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
    Acked-by: Olof Johansson <olof at lixom.net>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit ff138171ec6f84f311fe8c0395ad7f9e6d04feec
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date:   Tue Apr 29 23:02:33 2008 -0300

    V4L/DVB (7789b): Fix merge conflicts
    
    Some Kconfig names were changed. This patch reapplies the rename script,
    fixing for those drivers merged after the patch that renamed those
    items.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit f1fa3342e271029f93d323ca664809b94594fe04
Author: Roel Kluin <12o3l at tiscali.nl>
Date:   Tue Apr 29 22:01:15 2008 -0400

    ext4: fix hot spins in mballoc after err_freebuddy and err_freemeta
    
    In ext4_mb_init_backend() 'i' is of type ext4_group_t. Since unsigned, i
    >= 0 is always true, so fix hot spins after err_freebuddy: and -meta:
    and prevent decrements when zero.
    
    Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
    Signed-off-by: Mingming Cao <cmm at us.ibm.com>
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>

commit f8a87d89304c1eea8e4a8dc02d134f57590913c6
Author: Roel Kluin <12o3l at tiscali.nl>
Date:   Tue Apr 29 22:01:18 2008 -0400

    ext4: fix test ext_generic_write_end() copied return value
    
    'copied' is unsigned, whereas 'ret2' is not. The test (copied < 0) fails
    
    Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
    Signed-off-by: Mingming Cao <cmm at us.ibm.com>
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>

commit 7c2f3d6f89aab04c5c66a0a757888d3a77a5e899
Author: Roel Kluin <12o3l at tiscali.nl>
Date:   Tue Apr 29 22:01:27 2008 -0400

    ext3: fix test ext_generic_write_end() copied return value
    
    'copied' is unsigned, whereas 'ret2' is not. The test (copied < 0) fails
    
    Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>

commit 8f6e39a7ade8a5329c5651a2bc07010b3011da6a
Author: Mingming Cao <cmm at us.ibm.com>
Date:   Tue Apr 29 22:01:31 2008 -0400

    ext4: Move mballoc headers/structures to a seperate header file mballoc.h
    
    Move function and structure definiations out of mballoc.c and put it under
    a new header file mballoc.h
    
    Signed-off-by: Mingming Cao <cmm at us.ibm.com>
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>

commit 60bd63d1928c65abd71d8b9b45672cf6e3101845
Author: Solofo Ramangalahy <Solofo.Ramangalahy at bull.net>
Date:   Tue Apr 29 21:59:59 2008 -0400

    ext4: cleanup for compiling mballoc with verification and debugging #defines
    
    This patch allows compiling mballoc with:
    #define AGGRESSIVE_CHECK
    #define DOUBLE_CHECK
    #define MB_DEBUG
    
    It fixes:
    Compilation errors:
    fs/ext4/mballoc.c: In function '__mb_check_buddy':
    fs/ext4/mballoc.c:605: error: 'struct ext4_prealloc_space' has no member named 'group_list'
    fs/ext4/mballoc.c:606: error: 'struct ext4_prealloc_space' has no member named 'pstart'
    fs/ext4/mballoc.c:608: error: 'struct ext4_prealloc_space' has no member named 'len'
    
    Compilation warnings:
    fs/ext4/mballoc.c: In function 'ext4_mb_normalize_group_request':
    fs/ext4/mballoc.c:2863: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'int'
    fs/ext4/mballoc.c: In function 'ext4_mb_use_inode_pa':
    fs/ext4/mballoc.c:3103: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'int'
    
    Sparse check:
    fs/ext4/mballoc.c:3818:2: warning: context imbalance in 'ext4_mb_show_ac' - different lock contexts for basic block
    
    Signed-off-by: Solofo Ramangalahy <Solofo.Ramangalahy at bull.net>
    Signed-off-by: Mingming Cao <cmm at us.ibm.com>
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>

commit c19204b0ae3f8a125118fd5d425d3c7a5f8fda9b
Author: Josef Bacik <jbacik at redhat.com>
Date:   Tue Apr 29 22:00:28 2008 -0400

    ext4: don't use ext4_error in ext4_check_descriptors
    
    Because ext4_check_descriptors is called at mount time you can't use ext4_error
    as it calls ext4_commit_sb, which since the sb isn't all the way initialized
    causes bad things to happen (ie a panic).  This patch changes the ext4_error's
    to printk's to keep this problem from happening.  Thanks much,
    
    Signed-off-by: Josef Bacik <jbacik at redhat.com>
    Signed-off-by: Mingming Cao <cmm at us.ibm.com>
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>

commit 8753e88f1b4345677620ec68f847222a6301e2fd
Author: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>
Date:   Tue Apr 29 22:00:36 2008 -0400

    ext4: mark inode dirty after initializing the extent tree
    
    We should mark the inode dirty only after initializing the extent
    tree.  Also if we fail during extent initialization we need
    to call DQUOT_FREE_INODE.
    
    Signed-off-by: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>

commit ef7377289a1510d638004158e43878643bc75dc5
Author: Solofo Ramangalahy <Solofo.Ramangalahy at bull.net>
Date:   Tue Apr 29 22:00:41 2008 -0400

    ext4: update ctime and mtime for truncate with extents.
    
    The recently announced "Linux POSIX file system test suite"
    caught a truncate issue when using extents:
    mtime and ctime are not updated when truncate is successful.
    
    This is the single issue caught with "default" ext4 (mkfs and mount
    with minimal options).
    The testsuite does not report failure with -o noextents.
    
    With the following patch, all tests of the testsuite pass.
    
    Signed-off-by: Solofo Ramangalahy <Solofo.Ramangalahy at bull.net>
    Signed-off-by: Mingming Cao <cmm at us.ibm.com>
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>

commit c83617db76353ff30e825874be2c15c185b95759
Author: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>
Date:   Tue Apr 29 22:00:47 2008 -0400

    ext4: Don't do GFP_NOFS allocations after taking ext4_lock_group
    
    We can't do GFP_NOFS allocation after taking ext4_lock_group
    
    BUG: sleeping function called from invalid context at mm/slab.c:3054
    in_atomic():1, irqs_disabled():0
    1 lock held by vi/2426:
    #0:  (&ei->i_data_sem){----}, at: [<c01cf665>] ext4_release_file+0x23/0x66
    Pid: 2426, comm: vi Not tainted 2.6.25-rc7 #24
    [<c011a3dc>] __might_sleep+0xbe/0xc5
    [<c01620c9>] kmem_cache_alloc+0x22/0xa6
    [<c01e382a>] ext4_mb_release_inode_pa+0x73/0x1b3
    [<c01e6adf>] ext4_mb_discard_inode_preallocations+0x22d/0x2d4
    [<c013000a>] ? param_set_ushort+0x32/0x39
    [<c01ceba1>] ext4_discard_reservation+0x27/0x6a
    [<c01cf66c>] ext4_release_file+0x2a/0x66
    [<c0165bd6>] __fput+0xae/0x155
    [<c0165e46>] fput+0x17/0x19
    [<c0163756>] filp_close+0x50/0x5a
    [<c01647c0>] sys_close+0x71/0xad
    [<c0104aba>] sysenter_past_esp+0x5f/0xa5
    
    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 127ce971adeb4514bc4edc5bf45f79beb0c94aa5
Author: bo yang <bo.yang at lsi.com>
Date:   Tue Apr 29 03:55:33 2008 -0400

    [SCSI] megaraid_sas; Update the Version and Changelog
    
    Update the Version and Changelog for megaraid_sas Driver
    
    Signed-off-by: Bo Yang<bo.yang at lsi.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit c3a3b55ae80a0d595445064159c69f8e80911e85
Author: Brian King <brking at linux.vnet.ibm.com>
Date:   Fri Apr 25 16:58:29 2008 -0500

    [SCSI] ibmvscsi: Handle non SCSI error status
    
    Adds support to the ibmvscsi driver to handle non SCSI error
    status. This is needed to support some new VIOS enhancements.
    
    Signed-off-by: Brian King <brking at linux.vnet.ibm.com>
    Signed-off-by: Santiago Leon <santil at us.ibm.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit 61d7416a286e840d905c18b1e6b0977c036c8656
Author: Alan D. Brunelle <Alan.Brunelle at hp.com>
Date:   Tue Apr 29 16:12:51 2008 -0400

    [SCSI] bug fix for free list handling
    
    commit:
    
    commit 542bd1377a963070bc4a03ff7d2690ddf3920596
    Author: James Bottomley <James.Bottomley at HansenPartnership.com>
    Date:   Mon Apr 21 10:57:20 2008 -0500
    
        [SCSI] fix SLUB WARN_ON
    
    Fixed another problem in free list handling by moving list allocation
    from scsi_host_alloc() to scsi_add_host().  Unfortunately it
    introduced a new failure mode in that hosts can pass straight from
    alloc to put without going through add, leaving the free list
    uninitialised.
    
    Fix by checking shost->cmd_pool on the release path to see if it got
    initialised.
    
    Signed-off-by: Alan D. Brunelle <alan.brunelle at hp.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit 49dd09613cf8ae3b697c341c501b7526b462cfeb
Author: Brian King <brking at linux.vnet.ibm.com>
Date:   Mon Apr 28 17:36:20 2008 -0500

    [SCSI] ipr: Rename ipr's state scsi host attribute to prevent collisions
    
    Due to recent device model changes it now no longer tolerates name
    collisions.  This causes a problem for ipr whose "state" attribute
    collides with an identically named one in the SCSI mid-layer. Rename
    the ipr driver attribute to be more specific.
    
    Signed-off-by: Brian King <brking at linux.vnet.ibm.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit 69cd39e94669e2994277a29249b6ef93b088ddbb
Author: Hannes Reinecke <hare at suse.de>
Date:   Fri Apr 18 13:57:20 2008 -0700

    [SCSI] megaraid_mbox: fix Dell CERC firmware problem
    
    Newer Dell CERC firmware (>= 6.62) implement a random deletion handling
    compatible with the legacy megaraid driver.  The legacy handling shifted
    the target ID by 0x80 only for I/O commands (READ/WRITE/etc), whereas
    megaraid_mbox shifts the target ID always if random deletion is supported.
    The resulted in megaraid_mbox sending an INQUIRY to the wrong channel, and
    not finding any devices, obviously.
    
    So we disable the random deletion support if the offending firmware is
    found.
    
    Addresses http://bugzilla.kernel.org/show_bug.cgi?id=6695
    
    Signed-off-by: Hannes Reinecke <hare at suse.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Acked-by: "Yang, Bo" <Bo.Yang at lsi.com>
    Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>

commit 33ae0cdd3eaba219e7c2f0647b6db4be540e2130
Merge: f5ba0cf3cb145f9a8cc125fb0cc013c5656d6259 fe086a7bea7ab714930bd48addba961ceeef7634
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Apr 29 16:50:49 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] Provide ACPI fixup for /proc/cpuinfo/physical_id
      [IA64] Remove printk noise on unimplemented SAL_PHYSICAL_ID_INFO
      [IA64] allocate multiple contiguous pages via uncached allocator
      [IA64] bugfix: nptcg breaks cpu-hotadd

commit f5ba0cf3cb145f9a8cc125fb0cc013c5656d6259
Merge: c65a3500b2947d344862da8cce626b7cc7ec5758 d20bdda6d45a4035e48ca7ae467a0d955c1ffc60
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Apr 29 15:58:24 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
      Smack: Integrate Smack with Audit
      Security: Typecast CAP_*_SET macros
      Security: Make secctx_to_secid() take const secdata

commit d20bdda6d45a4035e48ca7ae467a0d955c1ffc60
Author: Ahmed S. Darwish <darwish.07 at gmail.com>
Date:   Wed Apr 30 08:34:10 2008 +1000

    Smack: Integrate Smack with Audit
    
    Setup the new Audit hooks for Smack. SELinux Audit rule fields are recycled
    to avoid `auditd' userspace modifications. Currently only equality testing
    is supported on labels acting as a subject (AUDIT_SUBJ_USER) or as an object
    (AUDIT_OBJ_USER).
    
    Signed-off-by: Ahmed S. Darwish <darwish.07 at gmail.com>
    Acked-by: Casey Schaufler <casey at schaufler-ca.com>

commit 70b9f7dc1435412ca2b89b13a8353bd9915a7189
Author: Yinghai Lu <yhlu.kernel.send at gmail.com>
Date:   Mon Apr 28 16:27:23 2008 -0700

    x86/pci: remove flag in pci_cfg_space_size_ext
    
    so let pci_cfg_space_size call it directly without flag.
    
    Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
    Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>

commit 780db6c104de48104501f5943361f2371564b85d
Author: David Howells <dhowells at redhat.com>
Date:   Tue Apr 29 20:54:28 2008 +0100

    Security: Typecast CAP_*_SET macros
    
    Cast the CAP_*_SET macros to be of kernel_cap_t type to avoid compiler
    warnings.
    
    Signed-off-by: David Howells <dhowells at redhat.com>
    Signed-off-by: James Morris <jmorris at namei.org>

commit e52c1764f18a62776a0f2bc6752fb76b6e345827
Author: David Howells <dhowells at redhat.com>
Date:   Tue Apr 29 20:52:51 2008 +0100

    Security: Make secctx_to_secid() take const secdata
    
    Make secctx_to_secid() take constant secdata.
    
    Signed-off-by: David Howells <dhowells at redhat.com>
    Acked-by: Casey Schaufler <casey at schaufler-ca.com>
    Signed-off-by: James Morris <jmorris at namei.org>

commit c65a3500b2947d344862da8cce626b7cc7ec5758
Merge: d973664992d814d93db161b28c0cc9a4c7e68f42 f7e989301b6c232dec5489e94ee7741c85cb11ba
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Apr 29 15:19:09 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] linux/libata.h: reorganize ata_device struct members a bit
      ahci: SB600 ahci can't do MSI, blacklist that capability
      libata: More TSSTcorp pain, keep in sync with legacy IDE
      pata_via: Fix 6410 misdetect
      [libata] pata_atiixp: fix PIO timing data misprogramming

commit d973664992d814d93db161b28c0cc9a4c7e68f42
Merge: 2d5e3e8d28a7820de1eb7b18a7c15d645bb26992 9d87dd97ffcd3b5eb2bbaf0d5d93f4bfcaed3f04
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Apr 29 15:18:06 2008 -0700

    Merge master.kernel.org:/home/rmk/linux-2.6-arm
    
    * master.kernel.org:/home/rmk/linux-2.6-arm: (26 commits)
      [ARM] pxa: fix 1c104e0e4f6ab396960c058e95e18bdedcac945b
      [ARM] serial: s3c2410: platform_get_irq() may return signed unnoticed
      [ARM] am79c961a: platform_get_irq() may return signed unnoticed
      [ARM] Feroceon: Feroceon-specific WA-cache compatible {copy,clear}_user_page()
      [ARM] Feroceon: fix function alignment in proc-feroceon.S
      [ARM] Orion: catch a couple more alternative spellings of PCIe
      [ARM] Orion: fix orion-ehci platform resource end addresses
      [ARM] Orion: fix ->map_irq() PCIe bus number check
      [ARM] Orion: fix ioremap() optimization
      [ARM] feroceon: remove CONFIG_CPU_CACHE_ROUND_ROBIN check
      [ARM] feroceon: remove CONFIG_CPU_DCACHE_WRITETHROUGH check
      kprobes/arm: fix decoding of arithmetic immediate instructions
      kprobes/arm: fix cache flush address for instruction stub
      [ARM] 5022/1: Race in ARM MMCI PL18x driver, V2
      [ARM] 5021/1: at91: buildfix for sam9263 + PM
      [ARM] 5018/1: RealView: Fix the ARM11MPCore Oprofile compilation
      [ARM] 5016/1: AT91: typo in mci configuration for at91cap at91sam9263
      [ARM] 5017/1: pxa3xx: Report unsupported wakeup sources in pxa3xx_set_wake()
      [ARM] 5020/1: magician: remove __devinit marker from pasic3_leds_info
      [ARM] 5014/1: Cleanup reset state before entering suspend or resetting.
      ...

commit 3dcf54515aa4981a647ad74859199032965193a5
Author: Christoph Hellwig <hch at lst.de>
Date:   Tue Apr 29 18:13:32 2008 -0400

    ext4: move headers out of include/linux
    
    Move ext4 headers out of include/linux.  This is just the trivial move,
    there's some more thing that could be done later.
    
    Signed-off-by: Christoph Hellwig <hch at lst.de>
    Signed-off-by: Mingming Cao <cmm at us.ibm.com>
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>

commit 216553c4b7f3e3e2beb4981cddca9b2027523928
Author: Josef Bacik <jbacik at redhat.com>
Date:   Tue Apr 29 22:02:02 2008 -0400

    ext4: fix wrong gfp type under transaction
    
    This fixes the allocations with GFP_KERNEL while under a transaction problems
    in ext4.  This patch is the same as its ext3 counterpart, just switches these
    to GFP_NOFS.
    
    Signed-off-by: Josef Bacik <jbacik at redhat.com>
    Cc: <linux-ext4 at vger.kernel.org>
    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 2887df139c40512cdc147d1a84d95d4f3d261bd1
Author: Jan Kara <jack at suse.cz>
Date:   Tue Apr 29 22:02:07 2008 -0400

    ext4: Fix hang on umount with quotas when journal is aborted
    
    Call dquot_drop() from ext4_dquot_drop() even if we fail to start a
    transaction. Otherwise we never get to dropping references to quota structures
    from the inode and umount will hang indefinitely.  Thanks to Payphone LIOU for
    spotting the problem.
    
    Signed-off-by: Jan Kara <jack at suse.cz>
    Signed-off-by: Mingming Cao <cmm at us.ibm.com>
    CC: Payphone LIOU <lioupayphone at gmail.com>
    Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>

commit 53b7e9f6807c1274eee19201396b4c2b5f721553
Author: Jan Kara <jack at suse.cz>
Date:   Tue Apr 29 22:02:11 2008 -0400

    ext4: Fix update of mtime and ctime on rename
    
    The patch below makes ext4 update mtime and ctime of the directory
    into which we move file even if the directory entry already exists.
    
    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 fe086a7bea7ab714930bd48addba961ceeef7634
Author: Alex Chiang <achiang at hp.com>
Date:   Tue Apr 29 15:05:29 2008 -0700

    [IA64] Provide ACPI fixup for /proc/cpuinfo/physical_id
    
    Legacy HP ia64 platforms currently cannot provide
    /proc/cpuinfo/physical_id due to legacy SAL/PAL implementations.
    However, that physical topology information can be obtained
    via ACPI.
    
    Provide an interface that gives ACPI one last chance to provide
    physical_id for these legacy platforms. This logic only comes
    into play iff:
    
    - ACPI actually provides slot information for the CPU
    - we lack a valid socket_id
    
    Otherwise, we don't do anything.
    
    Since x86 uses the ACPI processor driver as well, we provide a nop
    stub function for arch_fix_phys_package_id() in asm-x86/topology.h
    
    Signed-off-by: Alex Chiang <achiang at hp.com>
    Signed-off-by: Tony Luck <tony.luck at intel.com>

commit 2d5e3e8d28a7820de1eb7b18a7c15d645bb26992
Merge: b57ab7632b8fc1eef139bbbb7a89002be61f99e1 aed6abd662c2903733bea7fcd3856c306e650680
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Apr 29 14:53:40 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: (28 commits)
      V4L-DVB(7789a): cx18: fix symbol conflict with ivtv driver
      V4L/DVB (7789): tuner: remove static dependencies on analog tuner sub-modules
      V4L/DVB (7785): [2.6 patch] make mt9{m001,v022}_controls[] static
      V4L/DVB (7786): cx18: new driver for the Conexant CX23418 MPEG encoder chip
      V4L/DVB (7783): drivers/media/dvb/frontends/s5h1420.c: printk fix
      V4L/DVB (7782): pvrusb2: Driver is no longer experimental
      V4L/DVB (7781): pvrusb2-dvb: include dvb support by default and update Kconfig help text
      V4L/DVB (7780): pvrusb2: always enable support for OnAir Creator / HDTV USB2
      V4L/DVB (7779): pvrusb2-dvb: quiet down noise in kernel log for feed debug
      Rename common tuner Kconfig names to use the same
      Fix V4L/DVB core help messages
      V4L/DVB (7769): Move other terrestrial tuners to common/tuners
      V4L/DVB (7768): reorganize some DVB-S Kconfig items
      V4L/DVB(7767): Move tuners to common/tuners
      V4L/DVB (7766): saa7134: add another PCI ID for Beholder M6
      V4L/DVB (7765): Add support for Beholder BeholdTV H6
      V4L/DVB (7763): ivtv: add tuner support for the AverMedia M116
      V4L/DVB (7762): ivtv: fix tuner detection for PAL-N/Nc
      V4L/DVB (7761): ivtv: increase the DMA timeout from 100 to 300 ms
      V4L/DVB (7759): ivtv: increase version number to 1.2.1
      ...

commit b57ab7632b8fc1eef139bbbb7a89002be61f99e1
Merge: f12c03722045882a50c270f6332cf2c7b16a83d2 3760f736716f74bdc62a4ba5406934338da93eb2
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Apr 29 14:48:31 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: Convert most new-style drivers to use module aliasing
      i2c: Add support for device alias names
      i2c-amd756-s4882: Fix an error path
      i2c: Drop unused RTC driver IDs
      i2c/tps65010: Add missing intialization of client data
      i2c-sis5595: Minor cleanups in sis5595_access
      i2c-piix4: Minor cleanups
      i2c: Spelling fix (successful)
      i2c-stub: No newline in parameter description

commit f7e989301b6c232dec5489e94ee7741c85cb11ba
Author: Jeff Garzik <jeff at garzik.org>
Date:   Tue Apr 29 17:47:34 2008 -0400

    [libata] linux/libata.h: reorganize ata_device struct members a bit
    
    Put the big stuff at the end, to prepare for upcoming changes (and
    also hopefully achieve nicer packing of remaining members).
    
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 22b5e7a74280deae560c20ee1a9b502b35181327
Author: Tejun Heo <htejun at gmail.com>
Date:   Tue Apr 29 16:09:22 2008 +0900

    ahci: SB600 ahci can't do MSI, blacklist that capability
    
    This fixes bz#10507.
    
    Signed-off-by: Tejun Heo <htejun at gmail.com>
    Cc: Shane Huang <Shane.Huang at amd.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit aed6abd662c2903733bea7fcd3856c306e650680
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date:   Tue Apr 29 21:38:51 2008 -0300

    V4L-DVB(7789a): cx18: fix symbol conflict with ivtv driver
    
    LD      drivers/media/video/built-in.o
    drivers/media/video/cx18/built-in.o: In function `get_service_set':
    /home/v4l/tokernel/git/drivers/media/video/cx18/cx18-ioctl.c:118: multiple definition of `get_service_set'
    drivers/media/video/ivtv/built-in.o:/home/v4l/tokernel/git/drivers/media/video/ivtv/ivtv-ioctl.c:119: first defined here
    drivers/media/video/cx18/built-in.o: In function `expand_service_set':
    /home/v4l/tokernel/git/drivers/media/video/cx18/cx18-ioctl.c:92: multiple definition of `expand_service_set'
    drivers/media/video/ivtv/built-in.o:/home/v4l/tokernel/git/drivers/media/video/ivtv/ivtv-ioctl.c:92: first defined here
    drivers/media/video/cx18/built-in.o: In function `service2vbi':
    /home/v4l/tokernel/git/drivers/media/video/cx18/cx18-ioctl.c:44: multiple definition of `service2vbi'
    drivers/media/video/ivtv/built-in.o:/home/v4l/tokernel/git/drivers/media/video/ivtv/ivtv-ioctl.c:42: first defined here
    make[2]: ** [drivers/media/video/built-in.o] Erro 1
    make[1]: ** [drivers/media/video] Erro 2
    make: ** [drivers/media/] Erro 2
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit a07c8779fd212dcbad886a2824ef5f8b42cd5a06
Author: Michael Krufky <mkrufky at linuxtv.org>
Date:   Tue Apr 29 03:54:19 2008 -0300

    V4L/DVB (7789): tuner: remove static dependencies on analog tuner sub-modules
    
    Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 4407a463dd6afc892aedfbdc4237c42136d9f848
Author: Adrian Bunk <bunk at kernel.org>
Date:   Mon Apr 28 17:13:51 2008 -0300

    V4L/DVB (7785): [2.6 patch] make mt9{m001,v022}_controls[] static
    
    This patch makes the needlessly global mt9{m001,v022}_controls[] static.
    
    Signed-off-by: Adrian Bunk <bunk at kernel.org>
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 1c1e45d17b663d4749af456ab7c2fc1f36405ef8
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date:   Mon Apr 28 20:24:33 2008 -0300

    V4L/DVB (7786): cx18: new driver for the Conexant CX23418 MPEG encoder chip
    
    Many thanks to Steve Toth from Hauppauge and Nattu Dakshinamurthy from
    Conexant for their support. I am in particular thankful to Hauppauge
    since without their help this driver would not exist. It should also
    be noted that Steve did the work to get the DVB part up and running.
    Thank you!
    
    Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
    Signed-off-by: Steven Toth <stoth at hauppauge.com>
    Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
    Signed-off-by: G. Andrew Walls <awalls at radix.net>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit d74bee8b4776b5051c650a90f49a2022d46d8588
Author: Andrew Morton <akpm at linux-foundation.org>
Date:   Mon Apr 28 08:54:56 2008 -0300

    V4L/DVB (7783): drivers/media/dvb/frontends/s5h1420.c: printk fix
    
    drivers/media/dvb/frontends/s5h1420.c: In function `s5h1420_setsymbolrate':
    drivers/media/dvb/frontends/s5h1420.c:484: warning: long long unsigned int format, u64 arg (arg 2)
    
    We do not know what type the architecture uses for u64.
    
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit f4d2782411d502c39f2c21376377c745c0f09061
Author: Mike Isely <isely at pobox.com>
Date:   Sun Apr 27 21:37:33 2008 -0300

    V4L/DVB (7782): pvrusb2: Driver is no longer experimental
    
    This driver has been in-kernel and reasonably stable for well over a
    year.  It is in a stable form and is known to work well.  Remove its
    experimental status.
    
    Signed-off-by: Mike Isely <isely at pobox.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 8ed3c844040e492239609c9559de04d5397a6b2b
Author: Michael Krufky <mkrufky at linuxtv.org>
Date:   Sun Apr 27 19:22:45 2008 -0300

    V4L/DVB (7781): pvrusb2-dvb: include dvb support by default and update Kconfig help text
    
    Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
    Signed-off-by: Mike Isely <isely at pobox.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 749b6a77b0cb43b12b51f62735f948e9ccc34ba6
Author: Michael Krufky <mkrufky at linuxtv.org>
Date:   Sun Apr 27 19:12:29 2008 -0300

    V4L/DVB (7780): pvrusb2: always enable support for OnAir Creator / HDTV USB2
    
    This was a build option in the past, to avoid conflicts with the cxusb module
    for digital televsion support.  Now that dtv mode support has been merged into
    pvrusb2, the OnAir devices are fully supported by this single module.  This no
    longer should be a build option.
    
    Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
    Signed-off-by: Mike Isely <isely at pobox.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 485fcaed25ed42d064445f9a65faa79a1faa6b0c
Author: Michael Krufky <mkrufky at linuxtv.org>
Date:   Sat Apr 26 19:44:59 2008 -0300

    V4L/DVB (7779): pvrusb2-dvb: quiet down noise in kernel log for feed debug
    
    Get rid of the noise in dmesg during dvb feed changes,
    unless the appropriate debug trace flag is enabled.
    
    Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
    Reviewed-by: Mike Isely <isely at pobox.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 149ef72deeba57078216c9fa678baff392295853
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date:   Tue Apr 29 21:38:46 2008 -0300

    Rename common tuner Kconfig names to use the same
    namespace for all of them.

commit f1784354f774e1fa4863fc6382296ef6ede26dc5
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date:   Tue Apr 29 21:38:45 2008 -0300

    Fix V4L/DVB core help messages
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit b094516f9589245617eb5d0452769826063f72ac
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date:   Tue Apr 29 21:38:45 2008 -0300

    V4L/DVB (7769): Move other terrestrial tuners to common/tuners
    
    Those tuners are currently used only under media/dvb. However,
    they can support also analog TV. Better to move them to the same place
    as the other hybrid tuners. This would make easier to use those tuners also
    by analog drivers.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit df7aaaf3a74016cbc72382b6388c7c62f3df49b2
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date:   Sat Apr 26 16:19:58 2008 -0300

    V4L/DVB (7768): reorganize some DVB-S Kconfig items
    
    There are some DVB-S tuners together with DVB-S tags, while
    others together with tuners. Better to have all of them together.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 7c91f0624a9a2b8b9b122cf94fef34bc7f7347a6
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date:   Tue Apr 29 21:38:44 2008 -0300

    V4L/DVB(7767): Move tuners to common/tuners
    
    There were several issues in the past, caused by the hybrid tuner design, since
    now, the same tuner can be used by drivers/media/dvb and drivers/media/video.
    
    Kconfig items were rearranged, to split V4L/DVB core from their drivers.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 5fe95e0b865060839449e1a61c1d5c67a4faab9a
Author: Igor Kuznetsov <igk at igk.ru>
Date:   Sat Apr 26 14:59:08 2008 -0300

    V4L/DVB (7766): saa7134: add another PCI ID for Beholder M6
    
    Signed-off-by: Igor Kuznetsov <igk at igk.ru>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 025052716d124ab6e5f23d6a535e843a31fb8b35
Author: Igor Kuznetsov <igk at igk.ru>
Date:   Sat Apr 26 14:53:48 2008 -0300

    V4L/DVB (7765): Add support for Beholder BeholdTV H6
    
    Signed-off-by: Igor Kuznetsov <igk at igk.ru>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 136531dac435828c4aa9ca694a7693b63a573be1
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date:   Sat Apr 26 14:16:18 2008 -0300

    V4L/DVB (7763): ivtv: add tuner support for the AverMedia M116
    
    Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit a0bdd273a2fdb2a0debc90d5f8826073e2ddea4d
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date:   Sat Apr 26 12:10:58 2008 -0300

    V4L/DVB (7762): ivtv: fix tuner detection for PAL-N/Nc
    
    Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 2968e31361a2687cebeda6f558f82a3ec9354ca6
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date:   Sat Apr 26 11:22:11 2008 -0300

    V4L/DVB (7761): ivtv: increase the DMA timeout from 100 to 300 ms
    
    When there is a lot of DMA traffic this timeout might sometimes be too low.
    Increase it to be on the safe side.
    
    Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit fcbbf6fb07aa020088d5a35c289c80449a8e684b
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date:   Sat Apr 26 09:43:22 2008 -0300

    V4L/DVB (7759): ivtv: increase version number to 1.2.1
    
    Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 94dee760823606ff6e191efc60e5bb98b81f1676
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date:   Sat Apr 26 09:26:13 2008 -0300

    V4L/DVB (7758): ivtv: fix oops when itv->speed == 0 and VIDEO_CMD_PLAY is called
    
    Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 22f23fcc13e34a1efde8e7c37d157516fc1aa24f
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date:   Sat Apr 26 09:19:44 2008 -0300

    V4L/DVB (7757): ivtv: add autodetect for the AVermedia M104 card
    
    Note that this card is only detected and not yet working.
    
    Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit cebfadff4a5c877c524ae6014613edab9f50a2a9
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date:   Sat Apr 26 08:51:51 2008 -0300

    V4L/DVB (7756): ivtv: use strlcpy instead of strcpy
    
    Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit ecfcc83b8d6ff8ac65b072b309a1774ca52d955e
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date:   Sat Apr 26 08:48:26 2008 -0300

    V4L/DVB (7755): ivtv: add support for card comments and detected but unsupported cards
    
    Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit d86e2ee98eeef61bdab8ca1bf4837c5709173790
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date:   Sat Apr 26 08:43:50 2008 -0300

    V4L/DVB (7754): ivtv: change initialization order to fix an oops when device registration failed
    
    Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit c117d05cd4c09342f97ba1c6ef63f0bae3239a39
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date:   Sat Apr 26 14:05:58 2008 -0300

    V4L/DVB (7753): saa7134: fix tuner setup
    
    Tuner setup were happening during i2c attach callback. This means that it would
    happen on two conditions:
    
            1) if tuner module weren't load, it will happen at request_module("tuner");
    
            2) if tuner is not compiled as a module, or it is already loaded
               (for example, on setups with more than one tuner), it will happen
               when saa7134 registers I2C bus.
    
    Due to that, if tuner were loaded, tuner setup will happen _before_ reading
    the proper values at tuner eeprom. Since set_addr refuses to change for a tuner
    that were previously defined (except if the tuner_addr is set), this were
    making eeprom tuner detection useless.
    
    This patch removes tuner type setup from saa7134-i2c, moving it to the proper
    place, after taking eeprom into account.
    
    Reviewed-by: Hermann Pitton <hermann-pitton at arcor.de>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 397be5c4d66e6583ce3d38b0f99a56eb9818492b
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date:   Sat Apr 26 14:04:10 2008 -0300

    V4L/DVB (7752): tuner-core: add a missing \n after a debug printk
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit 4bf1226a7018bf79d05e0ce59244d702819529d1
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date:   Sat Apr 26 11:55:09 2008 -0300

    V4L/DVB (7749): cx88: fix tuner setup
    
    Tuner setup were happening during i2c attach callback. This means that it would
    happen on two conditions:
    
    	1) if tuner module weren't load, it will happen at request_module("tuner");
    
    	2) if tuner is not compiled as a module, or it is already loaded
    	   (for example, on setups with more than one tuner), it will happen
    	   when cx88 registers I2C bus.
    
    Due to that, if tuner were loaded, tuner setup will happen _before_ reading
    the proper values at tuner eeprom. Since set_addr refuses to change for a tuner
    that were previously defined (except if the tuner_addr is set), this were making
    eeprom tuner detection useless.
    
    This patch removes tuner type setup from cx88-i2c, moving it to the proper
    place, after taking eeprom into account.
    
    Reviewed-by: Gert Vervoort <gert.vervoort at hccnet.nl>
    Reviewed-by: Ian Pickworth <ian at pickworth.me.uk>
    Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>

commit a79067e513c71733223e13a52aacc8dbd71e9f46
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Tue Apr 29 14:08:36 2008 +0100

    libata: More TSSTcorp pain, keep in sync with legacy IDE
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 11f6400e92aa3fc0aa936f20f7cc363674a4e3c4
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date:   Tue Apr 29 14:10:57 2008 +0100

    pata_via: Fix 6410 misdetect
    
    The discrete VIA ATA chips don't have 0x40 enable bits. We check that
    properly in one location but not another. This causes some users 6410
    RAID cards to be incorrectly skipped.
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit d7b5a23fc6e85456ed00a997ff2d925fb3f0dc52
Author: Jeff Garzik <jeff at garzik.org>
Date:   Tue Apr 29 17:39:45 2008 -0400

    [libata] pata_atiixp: fix PIO timing data misprogramming
    
    Use correct variable, achieve desired result...
    
    Spotted by LKML/linux-ide poster whose name I lost (apologies!)
    
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>

commit 3760f736716f74bdc62a4ba5406934338da93eb2
Author: Jean Delvare <khali at linux-fr.org>
Date:   Tue Apr 29 23:11:40 2008 +0200

    i2c: Convert most new-style drivers to use module aliasing
    
    Based on earlier work by Jon Smirl and Jochen Friedrich.
    
    Update most new-style i2c drivers to use standard module aliasing
    instead of the old driver_name/type driver matching scheme. I've
    left the video drivers apart (except for SoC camera drivers) as
    they're a bit more diffcult to deal with, they'll have their own
    patch later.
    
    Signed-off-by: Jean Delvare <khali at linux-fr.org>
    Cc: Jon Smirl <jonsmirl at gmail.com>
    Cc: Jochen Friedrich <jochen at scram.de>

commit d2653e92732bd3911feff6bee5e23dbf959381db
Author: Jean Delvare <khali at linux-fr.org>
Date:   Tue Apr 29 23:11:39 2008 +0200

    i2c: Add support for device alias names
    
    Based on earlier work by Jon Smirl and Jochen Friedrich.
    
    This patch allows new-style i2c chip drivers to have alias names using
    the official kernel aliasing system and MODULE_DEVICE_TABLE(). At this
    point, the old i2c driver binding scheme (driver_name/type) is still
    supported.
    
    Signed-off-by: Jean Delvare <khali at linux-fr.org>
    Cc: Jochen Friedrich <jochen at scram.de>
    Cc: Jon Smirl <jonsmirl at gmail.com>
    Cc: Kay Sievers <kay.sievers at vrfy.org>

commit ee56d977423a58b53fd0fc1ef0aca0c9cb564c53
Author: Jean Delvare <khali at linux-fr.org>
Date:   Tue Apr 29 23:11:38 2008 +0200

    i2c-amd756-s4882: Fix an error path
    
    If initialization fails, we want to restore the physical bus, not delete
    it again.
    
    Signed-off-by: Jean Delvare <khali at linux-fr.org>

commit 306f39f8f2ecf896ae761748843b148b90d3494d
Author: Jean Delvare <khali at linux-fr.org>
Date:   Tue Apr 29 23:11:38 2008 +0200

    i2c: Drop unused RTC driver IDs
    
    The x1208, pcf8563 and isl1208 RTC drivers have been converted to
    new-style i2c drivers, so they no longer use I2C driver IDs.
    
    Signed-off-by: Jean Delvare <khali at linux-fr.org>
    Cc: Alessandro Zummo <a.zummo at towertech.it>

commit 6d072d78f87e8fe0fe30d096991b83af07f8bdfe
Author: Jean Delvare <khali at linux-fr.org>
Date:   Tue Apr 29 23:11:38 2008 +0200

    i2c/tps65010: Add missing intialization of client data
    
    tps65010_remove() calls i2c_get_clientdata(client) but the client data
    is never set during initialization, so it gets a NULL pointer at best.
    
    I guess it was never spotted because the tps65010 driver is typically
    not built modular so this function is discarded.
    
    Signed-off-by: Jean Delvare <khali at linux-fr.org>
    Cc: David Brownell <dbrownell at users.sourceforge.net>

commit 1842cc2eeb345c4eef069ffd46e95359fb37b4b5
Author: Jean Delvare <khali at linux-fr.org>
Date:   Tue Apr 29 23:11:38 2008 +0200

    i2c-sis5595: Minor cleanups in sis5595_access
    
    * Remove commented-out code.
    * Use dev_warn instead of printk.
    * Remove a legacy comment.
    
    Signed-off-by: Jean Delvare <khali at linux-fr.org>

commit 3578a0759ed2f0ea1f2409144e628dad4d748059
Author: Jean Delvare <khali at linux-fr.org>
Date:   Tue Apr 29 23:11:37 2008 +0200

    i2c-piix4: Minor cleanups
    
    * Remove a needless include.
    * Remove a legacy comment in piix4_access.
    * Minor optimization in piix4_access.
    
    Signed-off-by: Jean Delvare <khali at linux-fr.org>

commit c5d21b7fb747042cb2155698649cffccfd77d1f3
Author: Jean Delvare <khali at linux-fr.org>
Date:   Tue Apr 29 23:11:37 2008 +0200

    i2c: Spelling fix (successful)
    
    Signed-off-by: Jean Delvare <khali at linux-fr.org>

commit 85d6931cde5bbb80254dcd2a9f0851bd3eb8960b
Author: Jean Delvare <khali at linux-fr.org>
Date:   Tue Apr 29 23:11:37 2008 +0200

    i2c-stub: No newline in parameter description
    
    Signed-off-by: Jean Delvare <khali at linux-fr.org>

commit f12c03722045882a50c270f6332cf2c7b16a83d2
Merge: eeb85d0b0e312ab9a6c3476f18308409913ab369 7495ab6837ea4660f5e14ad49e5bfc558d6862e7
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Apr 29 14:02:48 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/nes: Formatting cleanup
      RDMA/nes: Add support for SFP+ PHY
      RDMA/nes: Use LRO
      IPoIB: Copy child MTU from parent
      IB/mthca: Avoid changing userspace ABI to handle DMA write barrier attribute
      IB/mthca: Avoid recycling old FMR R_Keys too soon
      mlx4_core: Avoid recycling old FMR R_Keys too soon
      IB/ehca: Allocate event queue size depending on max number of CQs and QPs
      IPoIB: Use separate CQ for UD send completions
      IB/iser: Count FMR alignment violations per session
      IB/iser: Move high-volume debug output to higher debug level
      IB/ehca: handle negative return value from ibmebus_request_irq() properly
      RDMA/cxgb3: Support peer-2-peer connection setup
      RDMA/cxgb3: Set the max_mr_size device attribute correctly
      RDMA/cxgb3: Correctly serialize peer abort path
      mlx4_core: Add a way to set the "collapsed" CQ flag

commit eeb85d0b0e312ab9a6c3476f18308409913ab369
Merge: 355a46961b58012de239cafccbfce4c9321d4395 6d1cee44361b8d06ccd1812e80448d86ae60dfe3
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Apr 29 14:01:25 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:
      alim15x3: disable init_hwif_ali15x3 for PowerPC
      ide: fix crash at boot with siimage driver

commit 6d1cee44361b8d06ccd1812e80448d86ae60dfe3
Author: Anton Vorontsov <avorontsov at ru.mvista.com>
Date:   Tue Apr 29 22:57:38 2008 +0200

    alim15x3: disable init_hwif_ali15x3 for PowerPC
    
    We don't need init_hwif_ali15x3() on the PowerPC systems either.
    
    Before:
    
    ALI15X3: IDE controller (0x10b9:0x5229 rev 0xc8) at  PCI slot 0001:03:1f.0
    ALI15X3: 100% native mode on irq 19
        ide0: BM-DMA at 0x1120-0x1127
        ide1: BM-DMA at 0x1128-0x112f
    hda: SONY DVD RW AW-Q170A, ATAPI CD/DVD-ROM drive
    hda: UDMA/66 mode selected
    ide0: Disabled unable to get IRQ 14.
    ide0: failed to initialize IDE interface
    ide1: Disabled unable to get IRQ 15.
    ide1: failed to initialize IDE interface
    
    After:
    
    ALI15X3: IDE controller (0x10b9:0x5229 rev 0xc8) at  PCI slot 0001:03:1f.0
    ALI15X3: 100% native mode on irq 19
        ide0: BM-DMA at 0x1120-0x1127
        ide1: BM-DMA at 0x1128-0x112f
    hda: SONY DVD RW AW-Q170A, ATAPI CD/DVD-ROM drive
    hda: UDMA/66 mode selected
    ide0 at 0x1100-0x1107,0x110a on irq 19
    ide1 at 0x1110-0x1117,0x111a on irq 19
    hda: ATAPI 48X DVD-ROM DVD-R CD-R/RW drive, 2048kB Cache
    
    ide0 works well, though I can't test ide1, it isn't traced out on
    the board.
    
    Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>

commit b26b0c590066f65ff3b1ff438502f3c40ea39520
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date:   Tue Apr 29 22:57:37 2008 +0200

    ide: fix crash at boot with siimage driver
    
    Some change to the IDE layer are causing the siimage driver to crash
    at boot with a NULL dereference. This is due to the sil_dma_ops not
    containing all the necessary pointers. I suppose it used to just
    "override" the defaults while now, it needs to contain everything.
    
    [bart: while at it: sil_dma_ops should be const now (pointed out by Sergei)]
    
    Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
    Cc: Sergei Shtylyov <sshtylyov at ru.mvista.com>,
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>

commit 6ff0bc94eee96fe45e5caa338c8b03cb99431fa9
Author: Alex Chiang <achiang at hp.com>
Date:   Thu Apr 24 12:57:08 2008 -0600

    [IA64] Remove printk noise on unimplemented SAL_PHYSICAL_ID_INFO
    
    Commit 113134fcbca83619be4c68d0ca66db6093777b5d changed the flow of
    control when calling PAL_LOGICAL_TO_PHYSICAL and SAL_PHYSICAL_ID_INFO.
    With the change, if a platform did not implement the latter, a useless
    printk would appear in the boot log:
    
    	ia64_sal_pltid failed with -1
    
    So let's check the return code and only printk on a true error, and do
    not print anything in the unimplemented case. While we're in there,
    clean up some stylistic issues too.
    
    Signed-off-by: Alex Chiang <achiang at hp.com>
    Signed-off-by: Tony Luck <tony.luck at intel.com>

commit e4a064dfa2b242519a9f06f9a1e58c27bf0c371b
Author: Dean Nelson <dcn at sgi.com>
Date:   Fri Apr 25 15:22:19 2008 -0500

    [IA64] allocate multiple contiguous pages via uncached allocator
    
    Enable the uncached allocator to allocate multiple pages of contiguous
    uncached memory.
    
    Signed-off-by: Dean Nelson <dcn at sgi.com>
    Signed-off-by: Tony Luck <tony.luck at intel.com>

commit e617fce64e5faea149fcf3bffc1b42e4ba29e7e5
Author: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
Date:   Fri Apr 25 23:13:09 2008 +0900

    [IA64] bugfix: nptcg breaks cpu-hotadd
    
    If "max_purges" from PAL is 0, it actually means 1.
    
    However it was not handled later when a hot-added cpu pass the
    max_purges from PAL.  This makes systems easy to go BUG_ON().
    
    Signed-off-by: Hidetoshi Seto <seto.hidetoshi at jp.fujitsu.com>
    Signed-off-by: Tony Luck <tony.luck at intel.com>

commit 7495ab6837ea4660f5e14ad49e5bfc558d6862e7
Author: Glenn Streiff <gstreiff at neteffect.com>
Date:   Tue Apr 29 13:46:54 2008 -0700

    RDMA/nes: Formatting cleanup
    
    Various cleanups:
    	- Change // to /* .. */
    	- Place whitespace around binary operators.
    	- Trim down a few long lines.
    	- Some minor alignment formatting for better readability.
    	- Remove some silly tabs.
    
    Signed-off-by: Glenn Streiff <gstreiff at neteffect.com>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit 0e1de5d62e751ca9c589d8dfabfc1e5074e62724
Author: Eric Schneider <eric.schneider at neteffect.com>
Date:   Tue Apr 29 13:46:54 2008 -0700

    RDMA/nes: Add support for SFP+ PHY
    
    This patch enables the iw_nes module for NetEffect RNICs to support
    additional PHYs including SFP+ (referred to as ARGUS in the code).
    
    Signed-off-by: Eric Schneider <eric.schneider at neteffect.com>
    Signed-off-by: Glenn Streiff <gstreiff at neteffect.com>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit 37dab4112d7b53c3574426ef7bdd92a78d32ac3e
Author: Faisal Latif <flatif at neteffect.com>
Date:   Tue Apr 29 13:46:54 2008 -0700

    RDMA/nes: Use LRO
    
    Signed-off-by: Faisal Latif <flatif at neteffect.com.
    Signed-off-by: Glenn Streiff <gstreiff at neteffect.com>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit b4132efa1a47858d741ecb05b8735e6fcb603bc8
Author: Eli Cohen <eli at dev.mellanox.co.il>
Date:   Tue Apr 29 13:46:53 2008 -0700

    IPoIB: Copy child MTU from parent
    
    When creating a child interface, copy the MTU information from the
    parent.  Otherwise when the child's multicast join completes, the MTU
    will not be updated since the code does
    
    	dev->mtu = min(priv->mcast_mtu, priv->admin_mtu);
    
    and priv->admin_mtu will be set to 0.
    
    Signed-off-by: Eli Cohen <eli at mellanox.co.il>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit baaad380c0aa955f7d62e846467316c94067f1a5
Author: Roland Dreier <rolandd at cisco.com>
Date:   Tue Apr 29 13:46:53 2008 -0700

    IB/mthca: Avoid changing userspace ABI to handle DMA write barrier attribute
    
    Commit cb9fbc5c ("IB: expand ib_umem_get() prototype") changed the
    mthca userspace ABI to provide a way for userspace to indicate which
    memory regions need the DMA write barrier attribute.  However, it is
    possible to handle this without breaking existing userspace, by having
    the mthca kernel driver recognize whether it is talking to old or new
    userspace, depending on the size of the register MR structure passed in.
    
    The only potential drawback of this is that is allows old userspace
    (which has a bug with DMA ordering on large SGI Altix systems) to
    continue to run on new kernels, but the advantage of allowing old
    userspace to continue to work on unaffected systems seems to outweigh
    this, and we can print a warning to push people to upgrade their
    userspace.
    
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit 0bfe151cc4049f3f304adf28b37ea5437d02ad96
Author: Olaf Kirch <okir at lst.de>
Date:   Tue Apr 29 13:46:53 2008 -0700

    IB/mthca: Avoid recycling old FMR R_Keys too soon
    
    When a FMR is unmapped, mthca resets the map count to 0, and clears
    the upper part of the R_Key which is used as the sequence counter.
    
    This poses a problem for RDS, which uses ib_fmr_unmap as a fence
    operation.  RDS assumes that after issuing an unmap, the old R_Keys
    will be invalid for a "reasonable" period of time. For instance,
    Oracle processes uses shared memory buffers allocated from a pool of
    buffers.  When a process dies, we want to reclaim these buffers -- but
    we must make sure there are no pending RDMA operations to/from those
    buffers.  The only way to achieve that is by using unmap and sync the
    TPT.
    
    However, when the sequence count is reset on unmap, there is a high
    likelihood that a new mapping will be given the same R_Key that was
    issued a few milliseconds ago.
    
    To prevent this, don't reset the sequence count when unmapping a FMR.
    
    Signed-off-by: Olaf Kirch <olaf.kirch at oracle.com>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit bbdc2821db041fb07ffa52e4a0e1ebb5410790e9
Author: Olaf Kirch <okir at lst.de>
Date:   Tue Apr 29 13:46:53 2008 -0700

    mlx4_core: Avoid recycling old FMR R_Keys too soon
    
    When a FMR is unmapped, mlx4 resets the map count to 0, and clears the
    upper part of the R_Key which is used as the sequence counter.
    
    This poses a problem for RDS, which uses ib_fmr_unmap as a fence
    operation.  RDS assumes that after issuing an unmap, the old R_Keys
    will be invalid for a "reasonable" period of time. For instance,
    Oracle processes uses shared memory buffers allocated from a pool of
    buffers.  When a process dies, we want to reclaim these buffers -- but
    we must make sure there are no pending RDMA operations to/from those
    buffers.  The only way to achieve that is by using unmap and sync the
    TPT.
    
    However, when the sequence count is reset on unmap, there is a high
    likelihood that a new mapping will be given the same R_Key that was
    issued a few milliseconds ago.
    
    To prevent this, don't reset the sequence count when unmapping a FMR.
    
    Signed-off-by: Olaf Kirch <olaf.kirch at oracle.com>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit d227fa7288adebe5ba37fa8e4a589c977d4e4a34
Author: Stefan Roscher <ossrosch at linux.vnet.ibm.com>
Date:   Tue Apr 29 13:46:53 2008 -0700

    IB/ehca: Allocate event queue size depending on max number of CQs and QPs
    
    If a lot of QPs fall into Error state at once and the EQ of the
    respective HCA is too small, it might overrun, causing the eHCA driver
    to stop processing completion events and calling the application's
    completion handlers, effectively causing traffic to stop.
    
    Fix this by limiting available QPs and CQs to a customizable max
    count, and determining EQ size based on these counts and a worst-case
    assumption.
    
    Signed-off-by: Stefan Roscher <stefan.roscher at de.ibm.com>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit f56bcd8013566d4ad4759ae5fc85a6660e4655c7
Author: Eli Cohen <eli at dev.mellanox.co.il>
Date:   Tue Apr 29 13:46:53 2008 -0700

    IPoIB: Use separate CQ for UD send completions
    
    Use a dedicated CQ for UD send completions. Also, do not arm the UD
    send CQ, which reduces the number of interrupts generated.  This patch
    farther reduces overhead by not calling poll CQ for every posted send
    WR -- it does polls only when there 16 or more outstanding work requests.
    
    Signed-off-by: Eli Cohen <eli at mellanox.co.il>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit 87528227dfa8776d12779d073c217f0835fd6d20
Author: Eli Dorfman <dorfman.eli at gmail.com>
Date:   Tue Apr 29 13:46:52 2008 -0700

    IB/iser: Count FMR alignment violations per session
    
    Count FMR alignment violations per session as part of the iscsi
    statistics.
    
    Signed-off-by: Eli Dorfman <elid at voltaire.com>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit 6f735e36bad6fa4949271b3c3d0f331aad812313
Author: Eli Dorfman <dorfman.eli at gmail.com>
Date:   Tue Apr 29 13:46:52 2008 -0700

    IB/iser: Move high-volume debug output to higher debug level
    
    Add another level for debug.
    
    Signed-off-by: Eli Dorfman <elid at voltaire.com>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit 7df109d917e85d3da2e25bd495c4997e87ed2a4e
Author: Hoang-Nam Nguyen <hnguyen at linux.vnet.ibm.com>
Date:   Tue Apr 29 13:46:52 2008 -0700

    IB/ehca: handle negative return value from ibmebus_request_irq() properly
    
    ehca_create_eq() was assigning a signed return value to an unsiged
    local variable and then checking if the variable was < 0, which meant
    that errors were always ignored.  Fix this by using one variable for
    signed integer return values and another for u64 hcall return values.
    
    Bug originally found by Roel Kluin <12o3l at tiscali.nl>.
    
    Signed-off-by: Hoang-Nam Nguyen <hnguyen at de.ibm.com>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit f8b0dfd15277974b5c9f3ff17f9e3ab6fdbe45ee
Author: Steve Wise <swise at opengridcomputing.com>
Date:   Tue Apr 29 13:46:52 2008 -0700

    RDMA/cxgb3: Support peer-2-peer connection setup
    
    Open MPI, Intel MPI and other applications don't respect the iWARP
    requirement that the client (active) side of the connection send the
    first RDMA message.  This class of application connection setup is
    called peer-to-peer.  Typically once the connection is setup, _both_
    sides want to send data.
    
    This patch enables supporting peer-to-peer over the chelsio RNIC by
    enforcing this iWARP requirement in the driver itself as part of RDMA
    connection setup.
    
    Connection setup is extended, when the peer2peer module option is 1,
    such that the MPA initiator will send a 0B Read (the RTR) just after
    connection setup.  The MPA responder will suspend SQ processing until
    the RTR message is received and reply-to.
    
    In the longer term, this will be handled in a standardized way by
    enhancing the MPA negotiation so peers can indicate whether they
    want/need the RTR and what type of RTR (0B read, 0B write, or 0B send)
    should be sent.  This will be done by standardizing a few bits of the
    private data in order to negotiate all this.  However this patch
    enables peer-to-peer applications now and allows most of the required
    firmware and driver changes to be done and tested now.
    
    Design:
    
     - Add a module option, peer2peer, to enable this mode.
    
     - New firmware support for peer-to-peer mode:
    
    	- a new bit in the rdma_init WR to tell it to do peer-2-peer
    	  and what form of RTR message to send or expect.
    
    	- process _all_ preposted recvs before moving the connection
    	  into rdma mode.
    
    	- passive side: defer completing the rdma_init WR until all
    	  pre-posted recvs are processed.  Suspend SQ processing until
    	  the RTR is received.
    
    	- active side: expect and process the 0B read WR on offload TX
    	  queue. Defer completing the rdma_init WR until all
    	  pre-posted recvs are processed.  Suspend SQ processing until
    	  the 0B read WR is processed from the offload TX queue.
    
     - If peer2peer is set, driver posts 0B read request on offload TX
       queue just after posting the rdma_init WR to the offload TX queue.
    
     - Add CQ poll logic to ignore unsolicitied read responses.
    
    Signed-off-by: Steve Wise <swise at opengridcomputing.com>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit ccaf10d0ad17bf755750160ebe594de7261a893e
Author: Steve Wise <swise at opengridcomputing.com>
Date:   Tue Apr 29 13:46:52 2008 -0700

    RDMA/cxgb3: Set the max_mr_size device attribute correctly
    
    cxgb3 only supports 4GB memory regions.  The lustre RDMA code uses
    this attribute and currently has to code around our bad setting.
    
    Signed-off-by: Steve Wise <swise at opengridcomputing.com>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit 989a1780698c65dfe093a6aa89ceeff84c31f528
Author: Steve Wise <swise at opengridcomputing.com>
Date:   Tue Apr 29 13:46:51 2008 -0700

    RDMA/cxgb3: Correctly serialize peer abort path
    
    Open MPI and other stress testing exposed a few bad bugs in handling
    aborts in the middle of a normal close.  Fix these by:
    
     - serializing abort reply and peer abort processing with disconnect
       processing
    
     - warning (and ignoring) if ep timer is stopped when it wasn't running
    
     - cleaning up disconnect path to correctly deal with aborting and
       dead endpoints
    
     - in iwch_modify_qp(), taking a ref on the ep before releasing the qp
       lock if iwch_ep_disconnect() will be called.  The ref is dropped
       after calling disconnect.
    
    Signed-off-by: Steve Wise <swise at opengridcomputing.com>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit e463c7b197dbe64b8a99b0612c65f286937e5bf1
Author: Yevgeny Petrilin <yevgenyp at mellanox.co.il>
Date:   Tue Apr 29 13:46:50 2008 -0700

    mlx4_core: Add a way to set the "collapsed" CQ flag
    
    Extend the mlx4_cq_resize() API with a way to set the "collapsed" flag
    for the CQ being created.
    
    Signed-off-by: Yevgeny Petrilin <yevgenyp at mellanox.co.il>
    Signed-off-by: Roland Dreier <rolandd at cisco.com>

commit 98db6f193c93e9b4729215af2c9101210e11d26c
Author: Sam Ravnborg <sam at ravnborg.org>
Date:   Tue Apr 29 22:38:48 2008 +0200

    x86: fix section mismatch in pci_scan_bus
    
    Fix following section mismatch warning:
    WARNING: vmlinux.o(.text+0x275616): Section mismatch in reference from the function pci_scan_bus() to the function .devinit.text:pci_scan_bus_parented()
    
    The warning was seen with a CONFIG_DEBUG_SECTION_MISMATCH=y build.
    The inline function pci_scan_bus refer to functions annotated
    __devinit - so annotate it __devinit too.
    This revealed a few x86 specific functions that were only
    used from __init or __devinit context.
    So annotate these __devinit and the warning was killed.
    
    The added include in pci.h was not strictly required but
    added to avoid being dependent on indirect includes.
    
    Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
    Signed-off-by: Jesse Barnes <jbarnes at hobbes.lan>

commit 9d87dd97ffcd3b5eb2bbaf0d5d93f4bfcaed3f04
Merge: 92794a5d6359f9e8ed0d43fe0f3c653f748dcc90 0ed1507183adea174bc4b6611b50d90e044730c2
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date:   Tue Apr 29 21:31:13 2008 +0100

    Merge branch 'orion-fixes2'

commit 92794a5d6359f9e8ed0d43fe0f3c653f748dcc90
Merge: 681587c58639444215a7c88f7471819997d2f226 7883938b0d5ee8dd6381e1e2a9f71254252fd504 b46926bb2d9977799c88aef17a4386ee02c326d8
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date:   Tue Apr 29 21:31:06 2008 +0100

    Merge branches 'pxa' and 'orion-fixes1'

commit 7883938b0d5ee8dd6381e1e2a9f71254252fd504
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date:   Tue Apr 29 21:28:03 2008 +0100

    [ARM] pxa: fix 1c104e0e4f6ab396960c058e95e18bdedcac945b
    
    The referenced commit changed the order such that the CPU code was
    initialised before MFP, resulting in unregistered MFP sysfs objects
    being referenced.  Reverse the link order of these so MFP is
    initialised before the CPU code.
    
    Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>

commit 355a46961b58012de239cafccbfce4c9321d4395
Author: Dave Jones <davej at redhat.com>
Date:   Tue Apr 29 16:01:22 2008 -0400

    trivial: fix user-visible typo in hfsplus
    
    Signed-off-by: Dave Jones <davej at redhat.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 25f2ea9fc8c7ec34d351cef7dade2e8046e49ed1
Author: David Howells <dhowells at redhat.com>
Date:   Tue Apr 29 20:54:28 2008 +0100

    Security: Typecast CAP_*_SET macros
    
    Cast the CAP_*_SET macros to be of kernel_cap_t type to avoid compiler
    warnings.
    
    Signed-off-by: David Howells <dhowells at redhat.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 7bf570dc8dcf76df2a9f583bef2da96d4289ed0d
Author: David Howells <dhowells at redhat.com>
Date:   Tue Apr 29 20:52:51 2008 +0100

    Security: Make secctx_to_secid() take const secdata
    
    Make secctx_to_secid() take constant secdata.
    
    Signed-off-by: David Howells <dhowells at redhat.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 7663c1e2792a9662b23dec6e19bfcd3d55360b8f
Author: Jens Axboe <jens.axboe at oracle.com>
Date:   Tue Apr 29 21:31:27 2008 +0200

    Improve queue_is_locked()
    
    spin_is_locked() doesn't work on UP without spinlock debugging. Make it
    safer and just return 1 on UP, so we don't get false positives. The plan
    is to kill this debug function during the -rc cycle.
    
    Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 6203554207728f43cfb9fd48585cd6500da73d42
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Apr 29 11:45:16 2008 -0700

    drivers/net/tehuti: use proper capability check for raw IO access
    
    Yeah, in practice they both mean "root", but Alan correctly points out
    that anybody who gets to do raw IO space accesses should really be using
    CAP_SYS_RAWIO rather than CAP_NET_ADMIN.
    
    Pointed-out-by: Alan Cox <alan at lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 9781db7b345b5dfe93787aaaf310c861db7c1ede
Merge: 97094dcf5cefc8ccfdf93839f54dac2c4d316165 8b67dca9420474623709e00d72a066068a502b20
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Apr 29 11:41:22 2008 -0700

    Merge branch 'audit.b50' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current
    
    * 'audit.b50' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
      [PATCH] new predicate - AUDIT_FILETYPE
      [patch 2/2] Use find_task_by_vpid in audit code
      [patch 1/2] audit: let userspace fully control TTY input auditing
      [PATCH 2/2] audit: fix sparse shadowed variable warnings
      [PATCH 1/2] audit: move extern declarations to audit.h
      Audit: MAINTAINERS update
      Audit: increase the maximum length of the key field
      Audit: standardize string audit interfaces
      Audit: stop deadlock from signals under load
      Audit: save audit_backlog_limit audit messages in case auditd comes back
      Audit: collect sessionid in netlink messages
      Audit: end printk with newline

commit 97094dcf5cefc8ccfdf93839f54dac2c4d316165
Author: akpm at linux-foundation.org <akpm at linux-foundation.org>
Date:   Tue Apr 29 10:47:54 2008 -0700

    drivers/pcmcia/pcmcia_ioctl.c: fix build
    
    argh.  A hunk got lost from "proc: remove proc_bus"
    
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit c9a3f6d6f541915bd7451fc7e9cb23a8b33a3ab8
Author: Jens Axboe <jens.axboe at oracle.com>
Date:   Tue Apr 29 19:12:35 2008 +0200

    dm: use unlocked variants of queue flag check/set
    
    dm.c already provides mutual exclusion through ->map_lock.
    
    Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit a217656cb26c5b7ebe9900354b2e808c1f74b470
Merge: 8f45c1a58a25c3a1a2f42521445e1e786c4c0b92 a53edac131cadee317e7e36a5908bb4c71d874cd
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Apr 29 10:17: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: (21 commits)
      pciehp: fix error message about getting hotplug control
      pci/irq: let pci_device_shutdown to call pci_msi_shutdown v2
      pci/irq: restore mask_bits in msi shutdown -v3
      doc: replace yet another dev with pdev for consistency in DMA-mapping.txt
      PCI: don't expose struct pci_vpd to userspace
      doc: fix an incorrect suggestion to pass NULL for PCI like buses
      Consistently use pdev as the variable of type struct pci_dev *.
      pciehp: Fix command write
      shpchp: fix slot name
      make pciehp_acpi_get_hp_hw_control_from_firmware()
      pciehp: Clean up pcie_init()
      pciehp: Mask hotplug interrupt at controller release
      pciehp: Remove useless hotplug interrupt enabling
      pciehp: Fix wrong slot capability check
      pciehp: Fix wrong slot control register access
      pciehp: Add missing memory barrier
      pciehp: Fix interrupt event handlig
      pciehp: fix slot name
      Update MAINTAINERS with location of PCI tree
      PCI: Add Intel SCH PCI IDs
      ...

commit 8f45c1a58a25c3a1a2f42521445e1e786c4c0b92
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Apr 29 10:16:38 2008 -0700

    block: fix queue locking verification
    
    The new queue_flag_set/clear() functions verify that the queue is
    locked, but in doing so they will actually instead oops if the queue
    lock hasn't been initialized at all.
    
    So fix the lock debug test to consider the "no lock" case to be
    unlocked.  This way you get a nice WARN_ON_ONCE() instead of a fatal
    oops.
    
    Bug introduced by commit 75ad23bc0fcb4f992a5d06982bf0857ab1738e9e
    ("block: make queue flags non-atomic").
    
    Cc: Jens Axboe <jens.axboe at oracle.com>
    Cc: Nick Piggin <npiggin at suse.de>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 25a025863e024f6b86b48137b10b4960c50351b0
Merge: 1f43c5393033de90bac4410352b1d2a69dcbe7ef 7e48bf653c37eb32c2ba4c13f15aa154aa807e61
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Apr 29 09:38:52 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] soc - wm9712 - checkpatch fixes
      [ALSA] pcsp - Fix more dependency
      [ALSA] hda - Add support of Medion RIM 2150
      [ALSA] ASoC: Add drivers for the Texas Instruments OMAP processors
      [ALSA] ice1724 - Enable watermarks
      [ALSA] Add MPU401_INFO_NO_ACK bitflag

commit 7e48bf653c37eb32c2ba4c13f15aa154aa807e61
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date:   Mon Apr 28 14:15:28 2008 +0100

    [ALSA] soc - wm9712 - checkpatch fixes
    
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit bad7785d4a787dd32245772e7daecf80d3618de9
Author: Takashi Iwai <tiwai at suse.de>
Date:   Mon Apr 28 12:35:41 2008 +0200

    [ALSA] pcsp - Fix more dependency
    
    Added the missing dependency and select for snd-pcsp driver.
    
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit df99cd334e5356b002a9480048c06265e558e180
Author: Takashi Iwai <tiwai at suse.de>
Date:   Fri Apr 25 15:25:04 2008 +0200

    [ALSA] hda - Add support of Medion RIM 2150
    
    Added the support of Medion RIM 2150 laptop with ALC880 codec.
    ALSA bug#3708:
    	https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3708
    
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 2e74796a45ee05bd901968ef1eb6cb884d1dca5e
Author: Jarkko Nikula <jarkko.nikula at nokia.com>
Date:   Fri Apr 25 13:55:19 2008 +0200

    [ALSA] ASoC: Add drivers for the Texas Instruments OMAP processors
    
    Add common OMAP ASoC drivers and machine driver for Nokia N810. Currently
    supported features are:
    
    - Covers OMAPs from 1510 to 2420
    - Common DMA driver
    - DAI link driver using McBSP port in I2S mode
    - Basic machine driver for Nokia N810
    
    Signed-off-by: Jarkko Nikula <jarkko.nikula at nokia.com>
    Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 7f70f046af855e027f7b53ec7d214c2d0c790b6d
Author: Takashi Iwai <tiwai at suse.de>
Date:   Fri Apr 25 09:15:12 2008 +0200

    [ALSA] ice1724 - Enable watermarks
    
    Enable watermarks settings (previously commented out) for MPU RX/TX.
    Otherwise irqs aren't issued properly.
    
    Tested-by: Pavel Hofman <pavel.hofman at insite.cz>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit df7e3fdf83699328d1fdf7000ce0dc852fbb0ad9
Author: Takashi Iwai <tiwai at suse.de>
Date:   Fri Apr 25 09:13:45 2008 +0200

    [ALSA] Add MPU401_INFO_NO_ACK bitflag
    
    Added MPU401_INFO_NO_ACK bitflag to ignore the ACK check for UART
    commands.  VT172x doesn't handle ACK commands, for example.
    
    Tested-by: Pavel Hofman <pavel.hofman at insite.cz>
    Signed-off-by: Takashi Iwai <tiwai at suse.de>

commit 7aa0f1a8b1f7072990c9dc37f238c96dc6d78911
Author: Len Brown <len.brown at intel.com>
Date:   Tue Apr 29 12:24:24 2008 -0400

    intel_menlo: fix build warning
    
    drivers/misc/intel_menlow.c:191: warning: label ‘unregister’ defined but not used
    
    Signed-off-by: Len Brown <len.brown at intel.com>

commit a53edac131cadee317e7e36a5908bb4c71d874cd
Author: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Date:   Tue Apr 29 09:15:04 2008 -0700

    pciehp: fix error message about getting hotplug control
    
    People are confused by the following error message that actually is
    not for indicating a error.
    
        Cannot get control of hotplug hardware for pci %s
    
    This patch changes this message to debug message.
    
    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 hobbes.lan>

commit d52877c7b1afb8c37ebe17e2005040b79cb618b0
Author: Yinghai Lu <yhlu.kernel.send at gmail.com>
Date:   Wed Apr 23 14:58:09 2008 -0700

    pci/irq: let pci_device_shutdown to call pci_msi_shutdown v2
    
    [PATCH 2/2] pci/irq: let pci_device_shutdown to call pci_msi_shutdown v2
    
    this change
    
    | commit 23a274c8a5adafc74a66f16988776fc7dd6f6e51
    | Author: Prakash, Sathya <sathya.prakash at lsi.com>
    | Date:   Fri Mar 7 15:53:21 2008 +0530
    |
    |     [SCSI] mpt fusion: Enable MSI by default for SAS controllers
    |
    |     This patch modifies the driver to enable MSI by default for all SAS chips.
    |
    |     Signed-off-by: Sathya Prakash <sathya.prakash at lsi.com>
    |     Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
    |
    Causes the kexec of a RHEL 5.1 kernel to fail.
    
    root casue: the rhel 5.1 kernel still uses INTx emulation.  and
    mptscsih_shutdown doesn't call pci_disable_msi to reenable INTx on kexec path
    
    So call pci_msi_shutdown in the shutdown path to do the same thing to msix
    
    Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
    Signed-off-by: Jesse Barnes <jbarnes at hobbes.lan>

commit 8e149e09f91098fd72bf9ac5b4a77a693abf721e
Author: Yinghai Lu <yhlu.kernel.send at gmail.com>
Date:   Wed Apr 23 14:56:30 2008 -0700

    pci/irq: restore mask_bits in msi shutdown -v3
    
    [PATCH 1/2] pci/irq: restore mask_bits in msi shutdown -v3
    
    Yinghai found that kexec'ing a RHEL 5.1 kernel with 2.6.25-rc3+ kernels
    prevents his NIC from working.  He bisected to
    
    | commit 89d694b9dbe769ca1004e01db0ca43964806a611
    | Author: Thomas Gleixner <tglx at linutronix.de>
    | Date:   Mon Feb 18 18:25:17 2008 +0100
    |
    |   genirq: do not leave interupts enabled on free_irq
    |
    |   The default_disable() function was changed in commit:
    |
    |    76d2160147f43f982dfe881404cfde9fd0a9da21
    |    genirq: do not mask interrupts by default
    |
    
    For MSI, default_shutdown will call mask_bit for msi device.  All mask bits
    will left disabled after free_irq.  Then in the kexec case, the next kernel
    can only use msi_enable bit, so all device's MSI can not be used.
    
    So lets to restore the mask bit to its pci reset defined value (enabled) when
    we disable the kernels use of msi to be a little friendlier to kexec'd kernels.
    
    Extend msi_set_mask_bit to msi_set_mask_bits to take mask, so we can fully
    restore that to 0x00 instead of 0xfe.
    
    Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
    Signed-off-by: Jesse Barnes <jbarnes at hobbes.lan>

commit 1f43c5393033de90bac4410352b1d2a69dcbe7ef
Merge: c135b6592bd63925397e60425e0301f33f06c7a6 e90955c26d8af318658c45caadb1d330ac6a506c
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Apr 29 09:03:19 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes:
      x86: fix PCI MSI breaks when booting with nosmp
      x86: vget_cycles() __always_inline
      x86: add more boot protocol documentation
      bootprotocol: cleanup
      x86: fix warning in "x86: clean up vSMP detection"
      x86: !x & y typo in mtrr code

commit 2768f92c06a59c3ebf17a6b86002c3f33ab61a28
Author: Matti Linnanvuori <mattilinnanvuori at yahoo.com>
Date:   Tue Apr 29 10:54:09 2008 +0300

    doc: replace yet another dev with pdev for consistency in DMA-mapping.txt
    
    Replace "dev" with "pdev" for consistency in DMA-mapping.txt.
    
    Signed-off-by: Matti Linnanvuori <mattilinnanvuori at yahoo.com>
    Signed-off-by: Jesse Barnes <jbarnes at hobbes.lan>

commit c135b6592bd63925397e60425e0301f33f06c7a6
Merge: 5f78e4d33945b291d12765cdd7e4304f437b9361 65c0d4e54ae4b81d8c8bb685169e48306656bb5c
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Apr 29 08:52: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:
      Fix bug - Implement bfin ata interrupt handler to avoid "irq 68 nobody cared" (v2)
      sata_mv: Improve naming of main_irq cause/mask identifiers
      libata-scsi: improve rbuf handling for simulated commands
      libata-scsi: clean up inquiry / mode sense related functions
      [MIPS] ATA: Rename routerboard 500 to 532

commit 5f78e4d33945b291d12765cdd7e4304f437b9361
Merge: 867a89e0b73af48838c7987e80899a1ff26dd6ff 5f0b2976cb2b62668a076f54419c24b8ab677167
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Apr 29 08:26:51 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-bigbox-pci
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-bigbox-pci:
      x86: add pci=check_enable_amd_mmconf and dmi check
      x86: work around io allocation overlap of HT links
      acpi: get boot_cpu_id as early for k8_scan_nodes
      x86_64: don't need set default res if only have one root bus
      x86: double check the multi root bus with fam10h mmconf
      x86: multi pci root bus with different io resource range, on 64-bit
      x86: use bus conf in NB conf fun1 to get bus range on, on 64-bit
      x86: get mp_bus_to_node early
      x86 pci: remove checking type for mmconfig probe
      x86: remove unneeded check in mmconf reject
      driver core: try parent numa_node at first before using default
      x86: seperate mmconf for fam10h out from setup_64.c
      x86: if acpi=off, force setting the mmconf for fam10h
      x86_64: check MSR to get MMCONFIG for AMD Family 10h
      x86_64: check and enable MMCONFIG for AMD Family 10h
      x86_64: set cfg_size for AMD Family 10h in case MMCONFIG
      x86: mmconf enable mcfg early
      x86: clear pci_mmcfg_virt when mmcfg get rejected
      x86: validate against acpi motherboard resources
    
    Fixed up fairly trivial conflicts in arch/x86/pci/{init.c,pci.h} due to
    OLPC support manually.

commit 867a89e0b73af48838c7987e80899a1ff26dd6ff
Merge: 44473d991332053eb3fea1e08f8a6ee2c6fb409c 6c39103ce5192bdb2195f3daab7323dfa44fb52e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Apr 29 08:19:14 2008 -0700

    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
    
    * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
      [RAPIDIO] Change RapidIO doorbell source and target ID field to 16-bit
      [RAPIDIO] Add RapidIO connection info print out and re-training for broken connections
      [RAPIDIO] Add serial RapidIO controller support, which includes MPC8548, MPC8641
      [RAPIDIO] Add RapidIO node probing into MPC86xx_HPCN board id table
      [RAPIDIO] Add RapidIO node into MPC8641HPCN dts file
      [RAPIDIO] Auto-probe the RapidIO system size
      [RAPIDIO] Add OF-tree support to RapidIO controller driver
      [RAPIDIO] Add RapidIO multi mport support
      [RAPIDIO] Move include/asm-ppc/rio.h to asm-powerpc
      [RAPIDIO] Add RapidIO option to kernel configuration
      [RAPIDIO] Change RIO function mpc85xx_ to fsl_
      [POWERPC] Provide walk_memory_resource() for powerpc
      [POWERPC] Update lmb data structures for hotplug memory add/remove
      [POWERPC] Hotplug memory remove notifications for powerpc
      [POWERPC] windfarm: Add PowerMac 12,1 support
      [POWERPC] Fix building of pmac32 when CONFIG_NVRAM=m
      [POWERPC] Add IRQSTACKS support on ppc32
      [POWERPC] Use __always_inline for xchg* and cmpxchg*
      [POWERPC] Add fast little-endian switch system call

commit 44473d991332053eb3fea1e08f8a6ee2c6fb409c
Merge: bd5d435a96837c3495e62eef37cbe4cb728b79ae 6501faf8c1bbaa51dc493f3681df016d2ebce833
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Apr 29 08:18:49 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
      [CPUFREQ] state info wrong after resume
      [CPUFREQ] allow use of the powersave governor as the default one
      [CPUFREQ] document the currently undocumented parts of the sysfs interface
      [CPUFREQ] expose cpufreq coordination requirements regardless of coordination mechanism

commit bd5d435a96837c3495e62eef37cbe4cb728b79ae
Merge: fee4b19fb3f28d17c0b9f9ea0668db5275697178 ac9fafa1243640349aa481adf473db283a695766
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Apr 29 08:18:03 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:
      block: Skip I/O merges when disabled
      block: add large command support
      block: replace sizeof(rq->cmd) with BLK_MAX_CDB
      ide: use blk_rq_init() to initialize the request
      block: use blk_rq_init() to initialize the request
      block: rename and export rq_init()
      block: no need to initialize rq->cmd with blk_get_request
      block: no need to initialize rq->cmd in prepare_flush_fn hook
      block/blk-barrier.c:blk_ordered_cur_seq() mustn't be inline
      block/elevator.c:elv_rq_merge_ok() mustn't be inline
      block: make queue flags non-atomic
      block: add dma alignment and padding support to blk_rq_map_kern
      unexport blk_max_pfn
      ps3disk: Remove superfluous cast
      block: make rq_init() do a full memset()
      relay: fix splice problem

commit fee4b19fb3f28d17c0b9f9ea0668db5275697178
Author: Thomas Gleixner <tglx at linutronix.de>
Date:   Tue Apr 29 12:01:02 2008 +0200

    bitops: remove "optimizations"
    
    The mapsize optimizations which were moved from x86 to the generic
    code in commit 64970b68d2b3ed32b964b0b30b1b98518fde388e increased the
    binary size on non x86 architectures.
    
    Looking into the real effects of the "optimizations" it turned out
    that they are not used in find_next_bit() and find_next_zero_bit().
    
    The ones in find_first_bit() and find_first_zero_bit() are used in a
    couple of places but none of them is a real hot path.
    
    Remove the "optimizations" all together and call the library functions
    unconditionally.
    
    Boot-tested on x86 and compile tested on every cross compiler I have.
    
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 8972331292753c89dbdd10b175e999ce78dc3be7
Author: Christoph Lameter <clameter at sgi.com>
Date:   Tue Apr 29 01:04:12 2008 -0700

    v850: use kbuild.h instead of defining macros in asm-offsets.c
    
    Signed-off-by: Christoph Lameter <clameter at sgi.com>
    Cc: Miles Bader <miles at gnu.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit fc1c3a003edb8a6778e64e10ef671a38c76c969e
Author: Christoph Lameter <clameter at sgi.com>
Date:   Tue Apr 29 01:04:12 2008 -0700

    sh: use kbuild.h instead of defining macros in asm-offsets.c
    
    Signed-off-by: Christoph Lameter <clameter at sgi.com>
    Cc: Paul Mundt <lethal at linux-sh.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 4ca4d7bf7a650817c441073cb8d1c2c8dfbb9959
Author: Christoph Lameter <clameter at sgi.com>
Date:   Tue Apr 29 01:04:10 2008 -0700

    s390: use kbuild.h instead of defining macros in asm-offsets.c
    
    New version that does not preserve the marker. Arch maintainers indicate
    that the marker functionality is is not needed anymore.
    
    Note you may simplify the s390 asm-offsets.c code further if you use the
    OFFSET() macro instead of the DEFINE. See kbuild.h
    
    Signed-off-by: Christoph Lameter <clameter at sgi.com>
    Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
    Cc: 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 7a88d7a8f467e4ab1d3393ed5bce3d68cdf9be2e
Author: Christoph Lameter <clameter at sgi.com>
Date:   Tue Apr 29 01:04:09 2008 -0700

    s390: use kbuild.h instead of defining macros in asm-offsets.c
    
    s390 has a strange marker in DEFINE.  Undefine the DEFINE from kbuild.h and
    define it the way s390 wants it to preserve things as they were.
    
    May be good if the arch maintainer could go over this and check if this
    workaround is really necessary.
    
    Signed-off-by: Christoph Lameter <clameter at sgi.com>
    Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
    Cc: 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 d4d298feeaebb43e0a74e5e2333f1b566c34a37c
Author: Christoph Lameter <clameter at sgi.com>
Date:   Tue Apr 29 01:04:08 2008 -0700

    ppc/powerpc: use kbuild.h instead of defining macros in asm-offsets.c
    
    Signed-off-by: Christoph Lameter <clameter 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 943de37dbf313d33d1b4ee15a57fadeeeedc2556
Author: Christoph Lameter <clameter at sgi.com>
Date:   Tue Apr 29 01:04:08 2008 -0700

    parisc: use kbuild.h instead of defining macros in asm-offsets.c
    
    Signed-off-by: Christoph Lameter <clameter at sgi.com>
    Cc: Kyle McMartin <kyle at mcmartin.ca>
    Cc: Grant Grundler <grundler at parisc-linux.org>
    Cc: Matthew Wilcox <matthew at wil.cx>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 59957fc31fb78806fc95c99466caa9a0fff735aa
Author: Christoph Lameter <clameter at sgi.com>
Date:   Tue Apr 29 01:04:07 2008 -0700

    mn10300: use kbuild.h instead of defining macros in asm-offsets.c
    
    Signed-off-by: Christoph Lameter <clameter at sgi.com>
    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 d8045b4af69c905a2b44ffffb4a1c13ba85e0867
Author: Christoph Lameter <clameter at sgi.com>
Date:   Tue Apr 29 01:04:05 2008 -0700

    m68k/m68kmmu: use kbuild.h instead of defining macros in asm-offsets.c
    
    Signed-off-by: Christoph Lameter <clameter at sgi.com>
    Cc: Geert Uytterhoeven <geert at linux-m68k.org>
    Cc: Roman Zippel <zippel at linux-m68k.org>
    Cc: 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 501cd36f9de960f640f15ed37428631167108006
Author: Christoph Lameter <clameter at sgi.com>
Date:   Tue Apr 29 01:04:04 2008 -0700

    h8300: use kbuild.h instead of defining macros in asm-offsets.c
    
    Signed-off-by: Christoph Lameter <clameter at sgi.com>
    Cc: Yoshinori Sato <ysato at users.sourceforge.jp>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit de400bd278464fe811186b4b0d3a5cfac0d747fb
Author: Christoph Lameter <clameter at sgi.com>
Date:   Tue Apr 29 01:04:04 2008 -0700

    frv: use kbuild.h instead of defining macros in asm-offsets.c
    
    Signed-off-by: Christoph Lameter <clameter at sgi.com>
    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 5544b9ed81bf1677ad6c3e5b58c05837249805b7
Author: Christoph Lameter <clameter at sgi.com>
Date:   Tue Apr 29 01:04:03 2008 -0700

    blackfin: use kbuild.h instead of defining macros in asm-macros.c
    
    Signed-off-by: Christoph Lameter <clameter at sgi.com>
    Cc: Bryan Wu <bryan.wu at analog.com>
    Cc: Mike Frysinger <vapier.adi at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 40765200b688939a012f5facc87d8ee07c40288b
Author: Christoph Lameter <clameter at sgi.com>
Date:   Tue Apr 29 01:04:02 2008 -0700

    avr32: use kbuild.h macros instead of defining macros in asm-offsets.c
    
    Signed-off-by: Christoph Lameter <clameter at sgi.com>
    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 32b07679b479eee9195870b337b05046f5efedfb
Author: Christoph Lameter <clameter at sgi.com>
Date:   Tue Apr 29 01:04:01 2008 -0700

    sparc: use kbuild.h instead of defining macros in asm-offsets.c
    
    Signed-off-by: Christoph Lameter <clameter at sgi.com>
    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 0fcfbb1d317593d3d713a850bfdb310cc1585ae2
Author: Christoph Lameter <clameter at sgi.com>
Date:   Tue Apr 29 01:04:00 2008 -0700

    xtensa: use kbuild.h macros instead of defining them in asm-offsets.c
    
    Signed-off-by: Christoph Lameter <clameter at sgi.com>
    Cc: Chris Zankel <chris at zankel.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 02cbe4749a79f880b29ce42bbb5441b8d57222e4
Author: Christoph Lameter <clameter at sgi.com>
Date:   Tue Apr 29 01:03:59 2008 -0700

    arm: use kbuild.h instead of macros in asm-offsets.c
    
    Signed-off-by: Christoph Lameter <clameter at sgi.com>
    Cc: Russell King <rmk at arm.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit ad2bc7b480230fb298919c54fea37b7879f2251d
Author: Christoph Lameter <clameter at sgi.com>
Date:   Tue Apr 29 01:03:58 2008 -0700

    ia64: use kbuild.h macros instead of defining macros in asm-offsets.c
    
    Signed-off-by: Christoph Lameter <clameter at sgi.com>
    Cc: "Luck, Tony" <tony.luck at intel.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 26946f4e9b3385f475df094371a016c9d217206a
Author: Christoph Lameter <clameter at sgi.com>
Date:   Tue Apr 29 01:03:58 2008 -0700

    alpha: use kbuild.h instead of macros in asm-offsets.c
    
    Use the macros in kbuild.h
    
    Signed-off-by: Christoph Lameter <clameter at sgi.com>
    Cc: Jay Estabrook <jay.estabrook at hp.com>
    Cc: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
    Cc: Richard Henderson <rth at twiddle.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit fd04d2067508d4a2b8cdb51d9ede1c0d96f13602
Author: Christoph Lameter <clameter at sgi.com>
Date:   Tue Apr 29 01:03:55 2008 -0700

    mips: use kbuild.h instead of macros in asm-offsets.c
    
    Use the macros provided in kbuild.h
    
    Signed-off-by: Christoph Lameter <clameter at sgi.com>
    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 66916cd2670e2033a468c492a0192a643ff0965e
Author: Christoph Lameter <clameter at sgi.com>
Date:   Tue Apr 29 01:03:54 2008 -0700

    x86: use kbuild.h
    
    Drop the macro definitions in asm-offsets_*.c and use kbuild.h
    
    Signed-off-by: Christoph Lameter <clameter at sgi.com>
    Cc: Sam Ravnborg <sam at ravnborg.org>
    Acked-by: Ingo Molnar <mingo at elte.hu>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 37487a56523d402e25650da16c337acf4cecd13d
Author: Christoph Lameter <clameter at sgi.com>
Date:   Tue Apr 29 01:03:49 2008 -0700

    Add kbuild.h that contains common definitions for kbuild users
    
    The same definitions are used for the bounds logic and the asm-offsets.h
    generation by kbuild.  Put them into include/linux/kbuild.h file.
    
    Also add a new feature
    
    	COMMENT("text")
    
    which can be used to insert lines of ocmments into asm-offsets.h and
    bounds.h.
    
    Cc: Sam Ravnborg <sam at ravnborg.org>
    Signed-off-by: Christoph Lameter <clameter at sgi.com>
    Cc: Ingo Molnar <mingo at elte.hu>
    Cc: Thomas Gleixner <tglx at linutronix.de>
    Cc: Ralf Baechle <ralf at linux-mips.org>
    Cc: Jay Estabrook <jay.estabrook at hp.com>
    Cc: Ivan Kokshaysky <ink at jurassic.park.msu.ru>
    Cc: Richard Henderson <rth at twiddle.net>
    Cc: "Luck, Tony" <tony.luck at intel.com>
    Cc: Russell King <rmk at arm.linux.org.uk>
    Cc: Chris Zankel <chris at zankel.net>
    Cc: David S. Miller <davem at davemloft.net>
    Cc: Haavard Skinnemoen <hskinnemoen at atmel.com>
    Cc: Bryan Wu <bryan.wu at analog.com>
    Cc: Mike Frysinger <vapier.adi at gmail.com>
    Cc: Yoshinori Sato <ysato at users.sourceforge.jp>
    Cc: Geert Uytterhoeven <geert at linux-m68k.org>
    Cc: Roman Zippel <zippel at linux-m68k.org>
    Cc: Greg Ungerer <gerg at uclinux.org>
    Cc: David Howells <dhowells at redhat.com>
    Cc: Kyle McMartin <kyle at mcmartin.ca>
    Cc: Grant Grundler <grundler at parisc-linux.org>
    Cc: Matthew Wilcox <matthew at wil.cx>
    Cc: Paul Mackerras <paulus at samba.org>
    Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
    Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
    Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
    Cc: Paul Mundt <lethal at linux-sh.org>
    Cc: Miles Bader <miles at gnu.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 39fa00311f21318cc498b139c2cc2830dcad98ff
Author: Jeff Moyer <jmoyer at redhat.com>
Date:   Tue Apr 29 01:03:48 2008 -0700

    aio: fix misleading comments
    
    The FIXME comments are inaccurate.
    The locking comment over lookup_ioctx() is wrong.
    
    Signed-off-by: Jeff Moyer <jmoyer at redhat.com>
    Signed-off-by: Zach Brown <zach.brown at oracle.com>
    Signed-off-by: Shen Feng <shen at cn.fujitsu.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 68ab3d883a2df13f4b93a923bae3a287cbee29d3
Author: Masami Hiramatsu <mhiramat at redhat.com>
Date:   Tue Apr 29 01:03:46 2008 -0700

    relayfs: support larger relay buffer
    
    Use vmalloc() and memset() instead of kcalloc() to allocate a page* array when
    the array size is bigger than one page.  This enables relayfs to support
    bigger relay buffers than 64MB on 4k-page system, 512MB on 16k-page system.
    
    [akpm at linux-foundation.org: cleanup]
    Signed-off-by: Masami Hiramatsu <mhiramat at redhat.com>
    Cc: David Wilder <dwilder at us.ibm.com>
    Reviewed-by: Tom Zanussi <zanussi at comcast.net>
    Reviewed-by: Pekka Enberg <penberg at cs.helsinki.fi>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 97a4feb4a78ae5cd130be7d546471a0779f1aa14
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Tue Apr 29 01:03:45 2008 -0700

    ncpfs: use get/put_unaligned_* helpers
    
    [akpm at linux-foundation.org: coding-style fixes]
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Cc: Al Viro <viro at zeniv.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 58d485d481013b47f50b7cd2cf9eab7795a0fcbd
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Tue Apr 29 01:03:44 2008 -0700

    isofs: use get/put_unaligned_* helpers
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Cc: Jan Kara <jack at suse.cz>
    Cc: Al Viro <viro at zeniv.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 8b3789e5d552b8ba4841926066ef0ccd664e209c
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Tue Apr 29 01:03:44 2008 -0700

    hfsplus: use get/put_unaligned_* helpers
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Cc: Roman Zippel <zippel at linux-m68k.org>
    Cc: Al Viro <viro at zeniv.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 803f445f17aa1b71235ad6febae734dd7ad23ddd
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Tue Apr 29 01:03:43 2008 -0700

    fat: use get/put_unaligned_* helpers
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Acked-by: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
    Cc: Al Viro <viro at zeniv.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit d15c0a4dc44f9d47d3dad03d17175aa1e6428093
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Tue Apr 29 01:03:41 2008 -0700

    video: use get/put_unaligned_* helpers
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Cc: Petr Vandrovec <vandrove at vc.cvut.cz>
    Cc: Antonino Daplas <adaplas at gmail.com>
    Cc: Al Viro <viro at zeniv.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit a5abdeafedf722b0f3f357f4a23089a686b1b80d
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Tue Apr 29 01:03:40 2008 -0700

    usb: use get/put_unaligned_* helpers
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Acked-by: Greg Kroah-Hartman <gregkh at suse.de>
    Cc: Alan Stern <stern at rowland.harvard.edu>
    Cc: David Brownell <dbrownell at users.sourceforge.net>
    Cc: Al Viro <viro at zeniv.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 6b1e6f637469647f435f8f8ab00fbafa3c129712
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Tue Apr 29 01:03:39 2008 -0700

    pcmcia: use get/put_unaligned_* helpers
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Cc: Dominik Brodowski <linux at dominikbrodowski.net>
    Cc: Daniel Ritz <daniel.ritz at gmx.ch>
    Cc: Al Viro <viro at zeniv.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 533dd1b0be103b0ff11da71152877e1ba530f1c2
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Tue Apr 29 01:03:36 2008 -0700

    wireless: use get/put_unaligned_* helpers
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Cc: John W. Linville <linville at tuxdriver.com>
    Cc: Michael Buesch <mb at bu3sch.de>
    Cc: Daniel Drake <dsd at gentoo.org>
    Cc: Al Viro <viro at zeniv.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 6caf52a453d5fe0bc584a2895bfd39a3d9054829
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Tue Apr 29 01:03:36 2008 -0700

    net: use get/put_unaligned_* helpers
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Cc: Jeff Garzik <jeff at garzik.org>
    Cc: Auke Kok <auke-jan.h.kok at intel.com>
    Cc: John Ronciak <john.ronciak at intel.com>
    Cc: Jesse Brandeburg <jesse.brandeburg at intel.com>
    Cc: Grant Grundler <grundler at parisc-linux.org>
    Cc: Al Viro <viro at zeniv.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 48b2cf9e2921581c3f72295397da07673cdde072
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Tue Apr 29 01:03:34 2008 -0700

    mmc: use get/put_unaligned_* helpers
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Cc: David Brownell <dbrownell at users.sourceforge.net>
    Cc: Tony Jones <tonyj at suse.de>
    Cc: Pierre Ossman <drzeus at drzeus.cx>
    Cc: Al Viro <viro at zeniv.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 858ad08cf4c32a51d26552d3cb5fa8d5e2f0e579
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Tue Apr 29 01:03:34 2008 -0700

    input: use get_unaligned_* helpers
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Cc: Dmitry Torokhov <dtor at mail.ru>
    Cc: Jiri Kosina <jkosina at suse.cz>
    Cc: Al Viro <viro at zeniv.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 973ea70c7c9be50d5ac34ff82a1c48fbe8fb2efb
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Tue Apr 29 01:03:32 2008 -0700

    char: use get_unaligned_* helpers
    
    Remove unnecessary temp variable from_buf in snsc_event.c
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Cc: Jiri Slaby <jirislaby at gmail.com>
    Cc: Al Viro <viro at zeniv.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit c105068f2b35343eecf2bf16ee29a362b6121fa3
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Tue Apr 29 01:03:31 2008 -0700

    hid-core: use get_unaligned_* helpers
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Acked-by: Jiri Kosina <jkosina at suse.cz>
    Cc: Al Viro <viro at zeniv.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit f885f8d127665e784a8071755243bd4e18f594d5
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Tue Apr 29 01:03:30 2008 -0700

    drivers/block: use get_unaligned_* helpers
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Cc: Ed L. Cashin <ecashin at coraid.com>
    Cc: Jens Axboe <jens.axboe at oracle.com>
    Cc: Al Viro <viro at zeniv.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 6510d41954dc6a9c8b1dbca7eaca0f23195ca727
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Tue Apr 29 01:03:30 2008 -0700

    kernel: Move arches to use common unaligned access
    
    Unaligned access is ok for the following arches:
    cris, m68k, mn10300, powerpc, s390, x86
    
    Arches that use the memmove implementation for native endian, and
    the byteshifting for the opposite endianness.
    h8300, m32r, xtensa
    
    Packed struct for native endian, byteshifting for other endian:
    alpha, blackfin, ia64, parisc, sparc, sparc64, mips, sh
    
    m86knommu is generic_be for Coldfire, otherwise unaligned access is ok.
    
    frv, arm chooses endianness based on compiler settings, uses the byteshifting
    versions.  Remove the unaligned trap handler from frv as it is now unused.
    
    v850 is le, uses the byteshifting versions for both be and le.
    
    Remove the now unused asm-generic implementation.
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Acked-by: David S. Miller <davem at davemloft.net>
    Cc: <linux-arch at vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 064106a91be5e76cb42c1ddf5d3871e3a1bd2a23
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date:   Tue Apr 29 01:03:27 2008 -0700

    kernel: add common infrastructure for unaligned access
    
    Create a linux/unaligned directory similar in spirit to the linux/byteorder
    folder to hold generic implementations collected from various arches.
    
    Currently there are five implementations:
    1) packed_struct.h: C-struct based, from asm-generic/unaligned.h
    2) le_byteshift.h: Open coded byte-swapping, heavily based on asm-arm
    3) be_byteshift.h: Open coded byte-swapping, heavily based on asm-arm
    4) memmove.h: taken from multiple implementations in tree
    5) access_ok.h: taken from x86 and others, unaligned access is ok.
    
    All of the new implementations checks for sizes not equal to 1,2,4,8
    and will fail to link.
    
    API additions:
    
    get_unaligned_{le16|le32|le64|be16|be32|be64}(p) which is meant to replace
    code of the form:
    le16_to_cpu(get_unaligned((__le16 *)p));
    
    put_unaligned_{le16|le32|le64|be16|be32|be64}(val, pointer) which is meant to
    replace code of the form:
    put_unaligned(cpu_to_le16(val), (__le16 *)p);
    
    The headers that arches should include from their asm/unaligned.h:
    
    access_ok.h : Wrappers of the byteswapping functions in asm/byteorder
    
    Choose a particular implementation for little-endian access:
    le_byteshift.h
    le_memmove.h (arch must be LE)
    le_struct.h (arch must be LE)
    
    Choose a particular implementation for big-endian access:
    be_byteshift.h
    be_memmove.h (arch must be BE)
    be_struct.h (arch must be BE)
    
    After including as needed from the above, include unaligned/generic.h and
    define your arch's get/put_unaligned as (for LE):
    
    Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
    Cc: <linux-arch at vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit dddfbaf8f86894415abb8256b55da68dab966ebe
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date:   Tue Apr 29 01:03:26 2008 -0700

    sysv fs: remove superfluous check for __GNUC__ compiler
    
    Since <linux/sysv_fs.h> isn't exported to userspace, there is little
    point checking that this is a GNU-compatible compiler.
    
    Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
    Acked-by: Christoph Hellwig <hch at lst.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit cedb27de0450fef73bc7dc28431d1108af54134c
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date:   Tue Apr 29 01:03:25 2008 -0700

    tpm: change Kconfig dependencies from PNPACPI to PNP
    
    There is no "PNPACPI" driver interface as such.  PNPACPI is an internal
    backend of PNP, and drivers just use the generic PNP interface.
    
    The drivers should depend on CONFIG_PNP, not CONFIG_PNPACPI.
    
    tpm_nsc.c doesn't use PNP at all, so we can just remove the dependency
    completely.  It probably *should* use PNP to discover the device, but until it
    does, there's no point in depending on PNP.
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
    Cc: Kylene Jo Hall <kjhall at us.ibm.com>
    Cc: Marcel Selhorst <tpm at selhorst.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 4821cd111d1dbe4bf230a3ecd7f8d3e803f1eec3
Author: Sam Ravnborg <sam at ravnborg.org>
Date:   Tue Apr 29 01:03:23 2008 -0700

    tpm: fix section mismatch warning
    
    Fix following warning:
    WARNING: vmlinux.o(.init.text+0x32804): Section mismatch in reference from the function init_nsc() to the function .devexit.text:tpm_nsc_remove()
    
    The function tpm_nsc_remove() are used outside __exit, so remove the __exit
    annotation to make sure the function is always avilable.
    
    Note: Trying to compare this module with other users of platform_device gve me
    the impression that this driver needs some work to match other users.
    
    Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
    Cc: Kylene Hall <kjhall at us.ibm.com>
    Cc: Marcel Selhorst <tpm at selhorst.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit f2b9a3962c69754e8eeb3d578bb33fdb1cf97cca
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date:   Tue Apr 29 01:03:22 2008 -0700

    parport_pc: wrap PNP probe code in #ifdef CONFIG_PNP
    
    Wrap PNP probe code in #ifdef CONFIG_PNP.  We already do the same for
    CONFIG_PCI.
    
    Without this change, we'll have unresolved references to pnp_get_resource()
    function when CONFIG_PNP=n.  (This is a new interface that's not in mainline
    yet.)
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 9396d496d74587d46a74b93a8b6b41659d2daf2e
Author: David Howells <dhowells at redhat.com>
Date:   Tue Apr 29 01:03:22 2008 -0700

    afs: support the CB.ProbeUuid RPC op
    
    Add support for the CB.ProbeUuid cache manager RPC op.  This allows a modern
    OpenAFS server to quickly ask if the client has been rebooted.
    
    Signed-off-by: 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 7c80bcce34a355c0920f8cab250d766d7827341d
Author: David Howells <dhowells at redhat.com>
Date:   Tue Apr 29 01:03:21 2008 -0700

    afs: the AFS RPC op CBGetCapabilities is actually CBTellMeAboutYourself
    
    The AFS RxRPC op CBGetCapabilities is actually CBTellMeAboutYourself.
    
    Signed-off-by: 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 0ae52d6fbaf7ffe4d00876d25ea000e94f85819c
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date:   Tue Apr 29 01:03:20 2008 -0700

    afs: use the shorter LIST_HEAD for brevity
    
    Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
    Acked-by: 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 c3c52bce6993c6d37af2c2de9b482a7013d646a7
Author: Hitoshi Mitake <h.mitake at gmail.com>
Date:   Tue Apr 29 01:03:18 2008 -0700

    edac: fix module initialization on several modules 2nd time
    
    I implemented opstate_init() as a inline function in linux/edac.h.
    
    added calling opstate_init() to:
    	i82443bxgx_edac.c
    	i82860_edac.c
    	i82875p_edac.c
    	i82975x_edac.c
    
    I wrote a fixed patch of
    edac-fix-module-initialization-on-several-modules.patch,
    and tested building 2.6.25-rc7 with applying this. It was succeed.
    I think the patch is now correct.
    
    Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
    Signed-off-by: Hitoshi Mitake <h.mitake at gmail.com>
    Signed-off-by: Doug Thompson <dougthompson at xmission.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 1a45027d1afd7e85254b5ef8535e93ce3d588cf4
Author: Adrian Bunk <bunk at kernel.org>
Date:   Tue Apr 29 01:03:18 2008 -0700

    edac: remove unneeded functions and add static accessor
    
    Collection of patches, merged into one, from Adrian that do the following:
    
    1) This patch makes the following needlessly global functions static:
    - edac_pci_get_log_pe()
    - edac_pci_get_log_npe()
    - edac_pci_get_panic_on_pe()
    - edac_pci_unregister_sysfs_instance_kobj()
    - edac_pci_main_kobj_setup()
    
    2) Remove unneeded function edac_device_find()
    
    3) Added #if 0 around function  edac_pci_find()
    
    4) make the needlessly global edac_pci_generic_check() static
    
    5) Removed function edac_check_mc_devices()
    
    Doug Thompson modified Adrian's patches, to bettern represent
    the direction of EDAC, and make them one patch.
    
    Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
    Signed-off-by: Adrian Bunk <bunk at kernel.org>
    Signed-off-by: Doug Thompson <dougthompson at xmission.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit ff6ac2a616c85d1215899ffda815e29b699cbd3a
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date:   Tue Apr 29 01:03:17 2008 -0700

    edac: use the shorter LIST_HEAD for brevity
    
    Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
    Acked-by: Doug Thompson <norsk5 at yahoo.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 94ee1cf5a88e12f5cbf8c0c78a6c18d3e043241e
Author: Peter Tyser <ptyser at xes-inc.com>
Date:   Tue Apr 29 01:03:15 2008 -0700

    edac: add e752x parameter for sysbus_parity selection
    
    Add a module parameter "sysbus_parity" to allow forcing system bus parity
    error checking on or off.  Also add support to automatically disable system
    bus parity errors for processors which do not support it.
    
    If the sysbus_parity parameter is specified, sysbus parity detection will be
    forced on or off.  If it is not specified, the driver will attempt to look at
    the CPU identifier string and determine if the CPU supports system bus parity.
     A blacklist was used instead of a whitelist so that system bus parity would
    be enabled by default and to minimize the chances of breaking things for those
    people already using the driver which for some reason have a processor that
    does not have a valid CPU identifier string.
    
    [akpm at linux-foundation.org: coding-style fixes]
    Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
    Signed-off-by: Peter Tyser <ptyser at xes-inc.com>
    Signed-off-by: Doug Thompson <dougthompson at xmission.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 5135b797c8466eac39dc7fb4ae1fac6e7276377a
Author: Andrei Konovalov <akonovalov at ru.mvista.com>
Date:   Tue Apr 29 01:03:13 2008 -0700

    edac: new support for Intel 3100 chipset
    
    Add Intel 3100 chipset support to e752x EDAC driver.
    
    Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
    Signed-off-by: Andrei Konovalov <akonovalov at ru.mvista.com>
    Signed-off-by: Doug Thompson <dougthompson at xmission.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 199f0ca514f9c17668eec4f935c4ba24cd789f85
Author: Akinobu Mita <akinobu.mita at gmail.com>
Date:   Tue Apr 29 01:03:13 2008 -0700

    idr: create idr_layer_cache at boot time
    
    Avoid a possible kmem_cache_create() failure by creating idr_layer_cache
    unconditionary at boot time rather than creating it on-demand when idr_init()
    is called the first time.
    
    This change also enables us to eliminate the check every time idr_init() is
    called.
    
    [akpm at linux-foundation.org: rename init_id_cache() to idr_init_cache()]
    [akpm at linux-foundation.org: fix alpha build]
    Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 801678c5a3b4c79236970bcca27c733f5559e0d1
Author: Hirofumi Nakagawa <hnakagawa at miraclelinux.com>
Date:   Tue Apr 29 01:03:09 2008 -0700

    Remove duplicated unlikely() in IS_ERR()
    
    Some drivers have duplicated unlikely() macros.  IS_ERR() already has
    unlikely() in itself.
    
    This patch cleans up such pointless code.
    
    Signed-off-by: Hirofumi Nakagawa <hnakagawa at miraclelinux.com>
    Acked-by: David S. Miller <davem at davemloft.net>
    Acked-by: Jeff Garzik <jeff at garzik.org>
    Cc: Paul Clements <paul.clements at steeleye.com>
    Cc: Richard Purdie <rpurdie at rpsys.net>
    Cc: Alessandro Zummo <a.zummo at towertech.it>
    Cc: David Brownell <david-b at pacbell.net>
    Cc: James Bottomley <James.Bottomley at HansenPartnership.com>
    Cc: Michael Halcrow <mhalcrow at us.ibm.com>
    Cc: Anton Altaparmakov <aia21 at cantab.net>
    Cc: Al Viro <viro at zeniv.linux.org.uk>
    Cc: Carsten Otte <cotte at de.ibm.com>
    Cc: Patrick McHardy <kaber at trash.net>
    Cc: Paul Mundt <lethal at linux-sh.org>
    Cc: Jaroslav Kysela <perex at perex.cz>
    Cc: Takashi Iwai <tiwai at suse.de>
    Acked-by: Mike Frysinger <vapier at gentoo.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 9a6f70bbed4e8b72dd340812d7c606bfd5e00b47
Author: Jeff Dike <jdike at addtoit.com>
Date:   Tue Apr 29 01:03:08 2008 -0700

    random: add async notification support to /dev/random
    
    Add async notification support to /dev/random.
    
    A little test case is below.  Without this patch, you get:
    
    $ ./async-random
    Drained the pool
    Found more randomness
    
    With it, you get:
    
    $ ./async-random
    Drained the pool
    SIGIO
    Found more randomness
    
    #include <stdio.h>
    #include <stdlib.h>
    #include <signal.h>
    #include <errno.h>
    #include <fcntl.h>
    
    static void handler(int sig)
    {
            printf("SIGIO\n");
    }
    
    int main(int argc, char **argv)
    {
            int fd, n, err, flags;
    
            if(signal(SIGIO, handler) < 0){
                    perror("setting SIGIO handler");
                    exit(1);
            }
    
            fd = open("/dev/random", O_RDONLY);
            if(fd < 0){
                    perror("open");
                    exit(1);
            }
    
            flags = fcntl(fd, F_GETFL);
            if (flags < 0){
                    perror("getting flags");
                    exit(1);
            }
    
            flags |= O_NONBLOCK;
            if (fcntl(fd, F_SETFL, flags) < 0){
                    perror("setting flags");
                    exit(1);
            }
    
            while((err = read(fd, &n, sizeof(n))) > 0) ;
    
            if(err == 0){
                    printf("random returned 0\n");
                    exit(1);
            }
            else if(errno != EAGAIN){
                    perror("read");
                    exit(1);
            }
    
            flags |= O_ASYNC;
            if (fcntl(fd, F_SETFL, flags) < 0){
                    perror("setting flags");
                    exit(1);
            }
    
            if (fcntl(fd, F_SETOWN, getpid()) < 0) {
                    perror("Setting SIGIO");
                    exit(1);
            }
    
            printf("Drained the pool\n");
            read(fd, &n, sizeof(n));
            printf("Found more randomness\n");
    
            return(0);
    }
    
    Signed-off-by: Jeff Dike <jdike at linux.intel.com>
    Signed-off-by: Matt Mackall <mpm at selenic.com>
    Cc: Theodore Ts'o <tytso at mit.edu>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit adc782dae6c4c0f6fb679a48a544cfbcd79ae3dc
Author: Matt Mackall <mpm at selenic.com>
Date:   Tue Apr 29 01:03:07 2008 -0700

    random: simplify and rename credit_entropy_store
    
    - emphasize bits in the name
    - make zero bits lock-free
    - simplify logic
    
    Signed-off-by: Matt Mackall <mpm at selenic.com>
    Cc: Theodore Ts'o <tytso at mit.edu>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit e68e5b664ecb9bccf68102557107a6b6d739a97c
Author: Matt Mackall <mpm at selenic.com>
Date:   Tue Apr 29 01:03:05 2008 -0700

    random: make mixing interface byte-oriented
    
    Switch add_entropy_words to a byte-oriented interface, eliminating numerous
    casts and byte/word size rounding issues.  This also reduces the overall
    bit/byte/word confusion in this code.
    
    We now mix a byte at a time into the word-based pool.  This takes four times
    as many iterations, but should be negligible compared to hashing overhead.
    This also increases our pool churn, which adds some depth against some
    theoretical failure modes.
    
    The function name is changed to emphasize pool mixing and deemphasize entropy
    (the samples mixed in may not contain any).  extract is added to the core
    function to make it clear that it extracts from the pool.
    
    Signed-off-by: Matt Mackall <mpm at selenic.com>
    Cc: Theodore Ts'o <tytso at mit.edu>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 993ba2114c554c1561a018e5c63a771ec8e1c469
Author: Matt Mackall <mpm at selenic.com>
Date:   Tue Apr 29 01:03:04 2008 -0700

    random: simplify add_ptr logic
    
    The add_ptr variable wasn't used in a sensible way, use only i instead.
    i got reused later for a different purpose, use j instead.
    
    While we're here, put tap0 first in the tap list and add a comment.
    
    Signed-off-by: Matt Mackall <mpm at selenic.com>
    Cc: Theodore Ts'o <tytso at mit.edu>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 6d38b827400d7c02bce391f90d044e4c57d5bc1e
Author: Matt Mackall <mpm at selenic.com>
Date:   Tue Apr 29 01:03:03 2008 -0700

    random: remove some prefetch logic
    
    The urandom output pool (ie the fast path) fits in one cacheline, so
    this is pretty unnecessary. Further, the output path has already
    fetched the entire pool to hash it before calling in here.
    
    (This was the only user of prefetch_range in the kernel, and it passed
    in words rather than bytes!)
    
    Signed-off-by: Matt Mackall <mpm at selenic.com>
    Cc: Theodore Ts'o <tytso at mit.edu>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit feee76972bcc54b2b1d1dc28bc6c16a8daa9aff8
Author: Matt Mackall <mpm at selenic.com>
Date:   Tue Apr 29 01:03:02 2008 -0700

    random: eliminate redundant new_rotate variable
    
    - eliminate new_rotate
    - move input_rotate masking
    - simplify input_rotate update
    - move input_rotate update to end of inner loop for readability
    
    Signed-off-by: Matt Mackall <mpm at selenic.com>
    Cc: Theodore Ts'o <tytso at mit.edu>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 433582093a9dc5454ba03b4a7ea201d85e6aa4de
Author: Matt Mackall <mpm at selenic.com>
Date:   Tue Apr 29 01:03:01 2008 -0700

    random: remove cacheline alignment for locks
    
    Earlier changes greatly reduce the number of times we grab the lock
    per output byte, so we shouldn't need this particular hack any more.
    
    Signed-off-by: Matt Mackall <mpm at selenic.com>
    Cc: Theodore Ts'o <tytso at mit.edu>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 1c0ad3d492adf670e47bf0a3d65c6ba5cdee0114
Author: Matt Mackall <mpm at selenic.com>
Date:   Tue Apr 29 01:03:00 2008 -0700

    random: make backtracking attacks harder
    
    At each extraction, we change (poolbits / 16) + 32 bits in the pool,
    or 96 bits in the case of the secondary pools. Thus, a brute-force
    backtracking attack on the pool state is less difficult than breaking
    the hash. In certain cases, this difficulty may be is reduced to 2^64
    iterations.
    
    Instead, hash the entire pool in one go, then feedback the whole hash
    (160 bits) in one go. This will make backtracking at least as hard as
    inverting the hash.
    
    Signed-off-by: Matt Mackall <mpm at selenic.com>
    Cc: Theodore Ts'o <tytso at mit.edu>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit ffd8d3fa5813430fe3926fe950fde23630f6b1a0
Author: Matt Mackall <mpm at selenic.com>
Date:   Tue Apr 29 01:02:59 2008 -0700

    random: improve variable naming, clear extract buffer
    
    - split the SHA variables apart into hash and workspace
    - rename data to extract
    - wipe extract and workspace after hashing
    
    Signed-off-by: Matt Mackall <mpm at selenic.com>
    Cc: Theodore Ts'o <tytso at mit.edu>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 53c3f63e824764da23676e5c718755ff4aac9b63
Author: Matt Mackall <mpm at selenic.com>
Date:   Tue Apr 29 01:02:58 2008 -0700

    random: reuse rand_initialize
    
    Signed-off-by: Matt Mackall <mpm at selenic.com>
    Cc: Theodore Ts'o <tytso at mit.edu>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 43ae4860ff4a358c29b9d364e45c2d09ad9fa067
Author: Matt Mackall <mpm at selenic.com>
Date:   Tue Apr 29 01:02:58 2008 -0700

    random: use unlocked_ioctl
    
    No locking actually needed.
    
    Signed-off-by: Matt Mackall <mpm at selenic.com>
    Cc: Theodore Ts'o <tytso at mit.edu>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 88c730da8c8b20fa732221725347bd9460842bac
Author: Matt Mackall <mpm at selenic.com>
Date:   Tue Apr 29 01:02:56 2008 -0700

    random: consolidate wakeup logic
    
    Signed-off-by: Matt Mackall <mpm at selenic.com>
    Cc: Theodore Ts'o <tytso at mit.edu>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 90b75ee54666fe615ebcacfc8d8540b80afdedd5
Author: Matt Mackall <mpm at selenic.com>
Date:   Tue Apr 29 01:02:55 2008 -0700

    random: clean up checkpatch complaints
    
    Signed-off-by: Matt Mackall <mpm at selenic.com>
    Cc: Theodore Ts'o <tytso at mit.edu>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 0302190411c2ba79819303503999cc839d600704
Author: Adrian Bunk <bunk at kernel.org>
Date:   Tue Apr 29 01:02:54 2008 -0700

    remove aoedev_isbusy()
    
    Remove the no longer used aoedev_isbusy().
    
    Signed-off-by: Adrian Bunk <bunk at kernel.org>
    Cc: "Ed L. Cashin" <ecashin at coraid.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 10521bd9f74be94b83cfcf639601ece1c8e4faad
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date:   Tue Apr 29 01:02:54 2008 -0700

    generalize asm-generic/ioctl.h to allow overriding values
    
    In the spirit of a number of other asm-generic header files,
    generalize asm-generic/ioctl.h to allow arch-specific ioctl.h headers
    to simply override _IOC_SIZEBITS and/or _IOC_DIRBITS before including
    this header file, allowing a number of ioctl.h header files to be
    shortened considerably.
    
    Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 098ef1c0ea7b1b3ff9d89364af5ebc5b672cf932
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date:   Tue Apr 29 01:02:52 2008 -0700

    nbd: delete superfluous test for __GNUC__
    
    Since <linux/compiler.h> already tests for __GNUC__, there's no point in nbd.h
    repeating that test.
    
    Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
    Cc: Paul Clements <paul.clements at steeleye.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit d71a6d7332e5881a65249f4fb97b0db3c61dd5ec
Author: Laurent Vivier <Laurent.Vivier at bull.net>
Date:   Tue Apr 29 01:02:51 2008 -0700

    NBD: add partition support
    
    Permit the use of partitions with network block devices (NBD).
    
    A new parameter is introduced to define how many partition we want to be able
    to manage per network block device.  This parameter is "max_part".
    
    For instance, to manage 63 partitions / loop device, we will do:
    
       [on the server side]
    # nbd-server 1234 /dev/sdb
       [on the client side]
    # modprobe nbd max_part=63
    # ls -l /dev/nbd*
    brw-rw---- 1 root disk 43,   0 2008-03-25 11:14 /dev/nbd0
    brw-rw---- 1 root disk 43,  64 2008-03-25 11:11 /dev/nbd1
    brw-rw---- 1 root disk 43, 640 2008-03-25 11:11 /dev/nbd10
    brw-rw---- 1 root disk 43, 704 2008-03-25 11:11 /dev/nbd11
    brw-rw---- 1 root disk 43, 768 2008-03-25 11:11 /dev/nbd12
    brw-rw---- 1 root disk 43, 832 2008-03-25 11:11 /dev/nbd13
    brw-rw---- 1 root disk 43, 896 2008-03-25 11:11 /dev/nbd14
    brw-rw---- 1 root disk 43, 960 2008-03-25 11:11 /dev/nbd15
    brw-rw---- 1 root disk 43, 128 2008-03-25 11:11 /dev/nbd2
    brw-rw---- 1 root disk 43, 192 2008-03-25 11:11 /dev/nbd3
    brw-rw---- 1 root disk 43, 256 2008-03-25 11:11 /dev/nbd4
    brw-rw---- 1 root disk 43, 320 2008-03-25 11:11 /dev/nbd5
    brw-rw---- 1 root disk 43, 384 2008-03-25 11:11 /dev/nbd6
    brw-rw---- 1 root disk 43, 448 2008-03-25 11:11 /dev/nbd7
    brw-rw---- 1 root disk 43, 512 2008-03-25 11:11 /dev/nbd8
    brw-rw---- 1 root disk 43, 576 2008-03-25 11:11 /dev/nbd9
    # nbd-client localhost 1234 /dev/nbd0
    Negotiation: ..size = 80418240KB
    bs=1024, sz=80418240
    
    -------NOTE, RFC: partition table is not automatically read.
    The driver sets bdev->bd_invalidated to 1 to force the read of the partition
    table of the device, but this is done only on an open of the device.
    So we have to do a "touch /dev/nbdX" or something like that.
    It can't be done from the nbd-client or nbd driver because at this
    level we can't ask to read the partition table and to serve the request
    at the same time (-> deadlock)
    
    If someone has a better idea, I'm open to any suggestion.
    -------NOTE, RFC
    
    # fdisk -l /dev/nbd0
    
    Disk /dev/nbd0: 82.3 GB, 82348277760 bytes
    255 heads, 63 sectors/track, 10011 cylinders
    Units = cylinders of 16065 * 512 = 8225280 bytes
    
         Device Boot      Start         End      Blocks   Id  System
    /dev/nbd0p1   *           1        9965    80043831   83  Linux
    /dev/nbd0p2            9966       10011      369495    5  Extended
    /dev/nbd0p5            9966       10011      369463+  82  Linux swap / Solaris
    
    # ls -l /dev/nbd0*
    brw-rw---- 1 root disk 43,   0 2008-03-25 11:16 /dev/nbd0
    brw-rw---- 1 root disk 43,   1 2008-03-25 11:16 /dev/nbd0p1
    brw-rw---- 1 root disk 43,   2 2008-03-25 11:16 /dev/nbd0p2
    brw-rw---- 1 root disk 43,   5 2008-03-25 11:16 /dev/nbd0p5
    # mount /dev/nbd0p1 /mnt
    # ls /mnt
    bin    dev   initrd      lost+found  opt   sbin     sys  var
    boot   etc   initrd.img  media       proc  selinux  tmp  vmlinuz
    cdrom  home  lib         mnt         root  srv      usr
    # umount /mnt
    # nbd-client -d /dev/nbd0
    # ls -l /dev/nbd0*
    brw-rw---- 1 root disk 43, 0 2008-03-25 11:16 /dev/nbd0
    -------NOTE
    On "nbd-client -d", we can do an iocl(BLKRRPART) to update partition table:
    as the size of the device is 0, we don't have to serve the partition manager
    request (-> no deadlock).
    -------NOTE
    
    Signed-off-by: Paul Clements <paul.clements at steeleye.com>
    Cc: Al Viro <viro at zeniv.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 48cf6061b30205b29b306bf9bc22dd6f0b091461
Author: Laurent Vivier <Laurent.Vivier at bull.net>
Date:   Tue Apr 29 01:02:46 2008 -0700

    NBD: allow nbd to be used locally
    
    This patch allows Network Block Device to be mounted locally (nbd-client to
    nbd-server over 127.0.0.1).
    
    It creates a kthread to avoid the deadlock described in NBD tools
    documentation.  So, if nbd-client hangs waiting for pages, the kblockd thread
    can continue its work and free pages.
    
    I have tested the patch to verify that it avoids the hang that always occurs
    when writing to a localhost nbd connection.  I have also tested to verify that
    no performance degradation results from the additional thread and queue.
    
    Patch originally from Laurent Vivier.
    
    Signed-off-by: Paul Clements <paul.clements at steeleye.com>
    Signed-off-by: Laurent Vivier <Laurent.Vivier at bull.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 8c4dd6068221cd1d0d90490ace80eb4344914a8c
Author: Tim Gardner <tim.gardner at canonical.com>
Date:   Tue Apr 29 01:02:45 2008 -0700

    edd: add default mode CONFIG_EDD_OFF=n, override with edd={on,off}
    
    Add a kernel parameter option to 'edd' to enable/disable BIOS Enhanced Disk
    Drive Services.  CONFIG_EDD_OFF disables EDD while still compiling EDD into
    the kernel.  Default behavior can be forced using 'edd=on' or 'edd=off' as
    a kernel parameter.
    
    [akpm at linux-foundation.org: fix kernel-parameters.txt]
    Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
    Signed-off-by: Matt Domsch <Matt_Domsch at dell.com>
    Cc: "H. Peter Anvin" <hpa at zytor.com>
    Cc: "Randy.Dunlap" <rdunlap at xenotime.net>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit d7321cd62470b70d2717dae5a963e7a8fabff4d5
Author: Pavel Emelyanov <xemul at openvz.org>
Date:   Tue Apr 29 01:02:44 2008 -0700

    sysctl: add the ->permissions callback on the ctl_table_root
    
    When reading from/writing to some table, a root, which this table came from,
    may affect this table's permissions, depending on who is working with the
    table.
    
    The core hunk is at the bottom of this patch.  All the rest is just pushing
    the ctl_table_root argument up to the sysctl_perm() function.
    
    This will be mostly (only?) used in the net sysctls.
    
    Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
    Acked-by: David S. Miller <davem at davemloft.net>
    Cc: "Eric W. Biederman" <ebiederm at xmission.com>
    Cc: Alexey Dobriyan <adobriyan at sw.ru>
    Cc: Denis V. Lunev <den at openvz.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 2c4c7155f25192da3511a6c911db4d08102d36c4
Author: Pavel Emelyanov <xemul at openvz.org>
Date:   Tue Apr 29 01:02:41 2008 -0700

    sysctl: clean from unneeded extern and forward declarations
    
    The do_sysctl_strategy isn't used outside kernel/sysctl.c, so this can be
    static and without a prototype in header.
    
    Besides, move this one and parse_table() above their callers and drop the
    forward declarations of the latter call.
    
    One more "besides" - fix two checkpatch warnings: space before a ( and an
    extra space at the end of a line.
    
    Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
    Acked-by: David S. Miller <davem at davemloft.net>
    Cc: "Eric W. Biederman" <ebiederm at xmission.com>
    Cc: Alexey Dobriyan <adobriyan at sw.ru>
    Cc: Denis V. Lunev <den at openvz.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 7708bfb1c855f2a076ef71cc21647deea022ebe7
Author: Pavel Emelyanov <xemul at openvz.org>
Date:   Tue Apr 29 01:02:40 2008 -0700

    sysctl: merge equal proc_sys_read and proc_sys_write
    
    Many (most of) sysctls do not have a per-container sense.  E.g.
    kernel.print_fatal_signals, vm.panic_on_oom, net.core.netdev_budget and so on
    and so forth.  Besides, tuning then from inside a container is not even
    secure.  On the other hand, hiding them completely from the container's tasks
    sometimes causes user-space to stop working.
    
    When developing net sysctl, the common practice was to duplicate a table and
    drop the write bits in table->mode, but this approach was not very elegant,
    lead to excessive memory consumption and was not suitable in general.
    
    Here's the alternative solution.  To facilitate the per-container sysctls
    ctl_table_root-s were introduced.  Each root contains a list of
    ctl_table_header-s that are visible to different namespaces.  The idea of this
    set is to add the permissions() callback on the ctl_table_root to allow ctl
    root limit permissions to the same ctl_table-s.
    
    The main user of this functionality is the net-namespaces code, but later this
    will (should) be used by more and more namespaces, containers and control
    groups.
    
    Actually, this idea's core is in a single hunk in the third patch.  First two
    patches are cleanups for sysctl code, while the third one mostly extends the
    arguments set of some sysctl functions.
    
    This patch:
    
    These ->read and ->write callbacks act in a very similar way, so merge these
    paths to reduce the number of places to patch later and shrink the .text size
    (a bit).
    
    Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
    Acked-by: "David S. Miller" <davem at davemloft.net>
    Cc: "Eric W. Biederman" <ebiederm at xmission.com>
    Cc: Alexey Dobriyan <adobriyan at sw.ru>
    Cc: Denis V. Lunev <den at openvz.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 1a46674b996bf9a15f0333178f5829ca2d7c32e2
Author: Adrian Bunk <bunk at kernel.org>
Date:   Tue Apr 29 01:02:38 2008 -0700

    include/linux/sysctl.h: remove empty #else
    
    Remove an empty #else.
    
    Signed-off-by: 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 88f458e4b91348b2e892c72977b5f665d7f374da
Author: Holger Schurig <hs4233 at mail.mn-solutions.de>
Date:   Tue Apr 29 01:02:36 2008 -0700

    sysctl: allow embedded targets to disable sysctl_check.c
    
    Disable sysctl_check.c for embedded targets. This saves about about 11 kB
    in .text and another 11 kB in .data on a PXA255 embedded platform.
    
    Signed-off-by: Holger Schurig <hs4233 at mail.mn-solutions.de>
    Cc: "Eric W. Biederman" <ebiederm at xmission.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit c7705f3449c7edd5c1744871097f93977227afc4
Author: Denis V. Lunev <den at openvz.org>
Date:   Tue Apr 29 01:02:35 2008 -0700

    drivers: use non-racy method for proc entries creation (2)
    
    Use proc_create()/proc_create_data() to make sure that ->proc_fops and ->data
    be setup before gluing PDE to main tree.
    
    Signed-off-by: Denis V. Lunev <den at openvz.org>
    Cc: Greg Kroah-Hartman <gregkh at suse.de>
    Cc: Alexey Dobriyan <adobriyan at gmail.com>
    Cc: "Eric W. Biederman" <ebiederm at xmission.com>
    Cc: Peter Osterlund <petero2 at telia.com>
    Cc: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
    Cc: Dmitry Torokhov <dtor at mail.ru>
    Cc: Neil Brown <neilb at suse.de>
    Cc: Mauro Carvalho Chehab <mchehab at infradead.org>
    Cc: Bjorn Helgaas <bjorn.helgaas at hp.com>
    Cc: Alessandro Zummo <a.zummo at towertech.it>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 1b50221738108c438d5f25c7a043fb89e9e27044
Author: Denis V. Lunev <den at openvz.org>
Date:   Tue Apr 29 01:02:34 2008 -0700

    drivers: use non-racy method for proc entries creation
    
    Use proc_create()/proc_create_data() to make sure that ->proc_fops and ->data
    be setup before gluing PDE to main tree.
    
    Signed-off-by: Denis V. Lunev <den at openvz.org>
    Acked-by: Greg Kroah-Hartman <gregkh at suse.de>
    Cc: Alexey Dobriyan <adobriyan at gmail.com>
    Cc: "Eric W. Biederman" <ebiederm at xmission.com>
    Acked-by: Dmitry Torokhov <dtor at mail.ru>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

commit 0fd689468231cb5eee9cc5d6331081b77c7a7a76
Author: Denis V. Lunev <den at openvz.org>
Date:   Tue Apr 29 01:02:32 2008 -0700

    parisc: use non-racy method for proc entries creation
    
    Use proc_create() to make sure that ->proc_fops be setup before gluing PDE to
    main tree.
    
    Signed-off-by: Denis V. Lunev <den at openvz.org>
    Cc: Kyle McMartin <kyle at parisc-linux.org>
    Cc: Matthew Wilcox <matthew at wil.cx>
    Cc: Grant Grundler <grundler at parisc-linux.org>
    Cc: Alexey Dobriyan <adobriyan at gmail.com>
    Cc: "Eric W. Biederman" <ebiederm at xmission.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundati