commit 5d5d80001df3fbd06bd2b8893b6e3847e38a12d6
Merge: c60ecec... d8cf538...
Author: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date:   Mon Jan 14 21:26:08 2008 -0800

    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: relocate sdev->manage_start_stop configuration
      sata_sil24: freeze on non-dev errors reported via CERR
      sata_sil24: fix stupid typo
      ata_piix: ignore ATA_DMA_ERR on vmware ich4

commit c60ecec67ab3f6b5791ef49d502b7a61909aa13e
Merge: c23f72c... 2e4f958...
Author: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date:   Mon Jan 14 21:25:39 2008 -0800

    Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
    
    * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
      [MIPS] Cacheops.h: Fix typo.
      [MIPS] Cobalt: Qube1 has no serial port so don't use it
      [MIPS] Cobalt: Fix ethernet interrupts for RaQ1
      [MIPS] Kconfig fixes for BCM47XX platform

commit c23f72cae9523d29ff94eec8f30ccbdaf234b20e
Author: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date:   Mon Jan 14 21:21:29 2008 -0800

    Revert "writeback: introduce writeback_control.more_io to indicate more io"
    
    This reverts commit 2e6883bdf49abd0e7f0d9b6297fc3be7ebb2250b, as
    requested by Fengguang Wu.  It's not quite fully baked yet, and while
    there are patches around to fix the problems it caused, they should get
    more testing.  Says Fengguang: "I'll resend them both for -mm later on,
    in a more complete patchset".
    
    See
    
    	http://bugzilla.kernel.org/show_bug.cgi?id=9738
    
    for some of this discussion.
    
    Requested-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit d8cf5389bd9d1f0ac9fea51796c274ba64b83d80
Author: Tejun Heo <htejun@gmail.com>
Date:   Tue Jan 15 08:46:59 2008 +0900

    libata: relocate sdev->manage_start_stop configuration
    
    After 9b8e8de7, manage_start_stop configuration depends on valid ATA
    device.  Move it into ata_scsi_dev_config().  This was detected by the
    coverity checker.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Cc: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit c2e14f11120bbef0c883e795da8180b58f3cddae
Author: Tejun Heo <htejun@gmail.com>
Date:   Sun Jan 13 14:04:16 2008 +0900

    sata_sil24: freeze on non-dev errors reported via CERR
    
    CERR reports errors detected during executing a command.  This doesn't
    mean the error is tied to the command and can be recovered by just
    issuing it again.  Many of the errors are fatal port-wide connditions
    including HSM violation, host bus error and ATA bus error and require
    freezing and port reset.
    
    The freezing part wasn't implemented previously.  This used to be okay
    because port resets were scheduled anyway and EH eventually resets and
    recovers the port.  With PMP support added, this is no longer true.
    The error condition and recover actions are attributed to the fan-out
    port and the host port condition isn't properly recovered leading to
    EH failures.
    
    This patch makes CERR errors which require resets to freeze the port.
    This will force host port reset and proper recovery.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Cc: Andrew Ryder <tireman@shaw.ca>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 7293fa8fb74f17077a2ac7ccd5b58ae3225317d0
Author: Tejun Heo <htejun@gmail.com>
Date:   Sun Jan 13 13:49:22 2008 +0900

    sata_sil24: fix stupid typo
    
    Fix stupid typo.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 25f98131a292f4c81e4619bdf48f00a991386f73
Author: Tejun Heo <htejun@gmail.com>
Date:   Mon Jan 7 19:38:53 2008 +0900

    ata_piix: ignore ATA_DMA_ERR on vmware ich4
    
    VMware ich4 emulation incorrectly sets DMA_ERR on TF error.  Ignore
    it.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 2e4f95822cc17cb7095d50babe2d2fc4c043fa25
Author: Ralf Baechle <ralf@linux-mips.org>
Date:   Mon Jan 14 14:46:31 2008 +0000

    [MIPS] Cacheops.h: Fix typo.
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit c43756da94863395d5ee088659676029b3ae7191
Author: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Date:   Sat Jan 12 00:25:17 2008 +0100

    [MIPS] Cobalt: Qube1 has no serial port so don't use it
    
    Because Qube1 doesn't have a serial chip waiting for transmit fifo empty
    takes forever, which isn't a good idea. No prom_putchar/early console
    for Qube1 fixes this.
    
    Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
    Acked-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit f6c0f32ee8d21e800097fc35ba8ab2b5a3b9bdfa
Author: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Date:   Sat Jan 12 00:25:14 2008 +0100

    [MIPS] Cobalt: Fix ethernet interrupts for RaQ1
    
    RAQ1 uses the same interrupt routing as Qube2.
    
    Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 2f02c15a5d963007bd721d76f644c9491f6fec06
Author: Aurelien Jarno <aurelien@aurel32.net>
Date:   Tue Dec 11 11:30:34 2007 +0100

    [MIPS] Kconfig fixes for BCM47XX platform
    
    The patch below fixes two problems for Kconfig on the BCM47xx platform:
    
    - arch/mips/bcm47xx/gpio.c uses ssb_extif_* functions. Selecting
      SSB_DRIVER_EXTIF makes sure those functions are available.
    - arch/mips/pci/pci.c needs, when enabled, platform specific functions,
      which are defined when SSB_PCICORE_HOSTMODE is enabled.
    
    Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 031f2dcd7075e218e74dd7f942ad015cf82dffab
Merge: a98fdce... 5cd6e67...
Author: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date:   Mon Jan 14 13:23:20 2008 -0800

    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-sibyte: Fix an error path
      i2c: Driver IDs are optional
      i2c: Spelling fixes
      i2c-omap: Fix NULL pointer dereferencing

commit a98fdcef941e107eeabae622d85a1f476f25a160
Author: Oleg Nesterov <oleg@tv-sign.ru>
Date:   Tue Jan 15 00:02:37 2008 +0300

    fix the "remove task_ppid_nr_ns" commit
    
    Commit 84427eaef1fb91704c7112bdb598c810003b99f3 (remove task_ppid_nr_ns)
    moved the task_tgid_nr_ns(task->real_parent) outside of lock_task_sighand().
    This is wrong, ->real_parent could be freed/reused.
    
    Both ->parent/real_parent point to nothing after __exit_signal() because
    we remove the child from ->children list, and thus the child can't be
    reparented when its parent exits.
    
    rcu_read_lock() protects ->parent/real_parent, but _only_ if we know it was
    valid before we take rcu lock.
    
    Revert this part of the patch.
    
    Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 5cd6e675f862568ad73c061665ee5080cfd952c5
Author: Jean Delvare <khali@linux-fr.org>
Date:   Mon Jan 14 21:53:31 2008 +0100

    i2c-sibyte: Fix an error path
    
    If the registration of the second I2C channel fails, we really want to
    unregister the first one before we return with an error.
    
    While we're here, fix the printk right above so that it displays the
    real driver name.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: Ralf Baechle <ralf@linux-mips.org>

commit f9dd0194ff23d612e463be764d73da7825da4aa1
Author: Jean Delvare <khali@linux-fr.org>
Date:   Mon Jan 14 21:53:31 2008 +0100

    i2c: Driver IDs are optional
    
    Document the fact that I2C driver IDs are optional.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>

commit 96acafe05fad2c9429ca2c39af47efc5db2d8042
Author: Joe Perches <joe@perches.com>
Date:   Mon Jan 14 21:53:30 2008 +0100

    i2c: Spelling fixes
    
    [JD: One more fix in i2c-dev.]
    
    Signed-off-by: Joe Perches <joe@perches.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>

commit 3e39752d5367f9087e058abe768708165e1ec373
Author: Tony Lindgren <tony@atomide.com>
Date:   Mon Jan 14 21:53:30 2008 +0100

    i2c-omap: Fix NULL pointer dereferencing
    
    This patch fixes bug #9581 reported by Marcio Buss. If kzalloc fails,
    omap_i2c_write_reg() tries to reset an unallocated I2C controller.
    
    Cc: Marcio Buss <marciobuss@gmail.com>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>

commit 4fd3670eb1d3c33e8952cf1e79edbb2d517dcfb5
Merge: ea8e165... 4ff891e...
Author: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date:   Mon Jan 14 09:10:45 2008 -0800

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
      Input: improve Kconfig help entries for HP Jornada devices
      Input: pass EV_PWR events to event handlers
      Input: spitzkbd - fix suspend key handling
      gameport: don't export functions that are static inline
      Input: jornada680_kbd - fix default keymap
      Input: Handle EV_PWR type of input caps in input_set_capability.

commit ea8e1652c5f4202fa90cfae49f2ca8485423d263
Author: Adrian Bunk <bunk@kernel.org>
Date:   Mon Jan 14 00:55:25 2008 -0800

    OSS msnd: fix array overflows
    
    Fix array overflows in the OSS msnd driver spotted by the Coverity checker.
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit bbde25b1257c169c119601590d011b9b3aaf77f8
Author: Jesper Nilsson <jesper.nilsson@axis.com>
Date:   Mon Jan 14 00:55:24 2008 -0800

    CRIS v10: driver for ds1302 needs to include cris-specific i2c.h
    
    This fixes compilation error where i2c_init wasn't defined.
    Also, remove the CVS log and version tags, they are no longer useful.
    
    Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
    Cc: Mikael Starvik <mikael.starvik@axis.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 27b526a09086d563d61cf0e0fdd5c8e3f3c295d4
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date:   Mon Jan 14 00:55:24 2008 -0800

    uvesafb: fix section mismatch warnings
    
    Mark uvesafb_init_mtrr() as __devinit since its caller is __devinit
    and since it accesses __devinitdata.
    
    WARNING: vmlinux.o(.text+0x4df80e): Section mismatch: reference to .init.data: (between 'uvesafb_init_mtrr' and 'uvesafb_show_vbe_ver')
    
    Variable 'blank' cannot be __devinitdata since it is referenced in an
    fb_ops method that could be called at any time.
    
    WARNING: vmlinux.o(.text+0x4dfc1e): Section mismatch: reference to .init.data:blank (between 'param_set_scroll' and 'vesa_setpalette')
    WARNING: vmlinux.o(.text+0x4dfc24): Section mismatch: reference to .init.data:blank (between 'param_set_scroll' and 'vesa_setpalette')
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Cc: "Antonino A. Daplas" <adaplas@pol.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit d2d159dbd51a99abdd4ae02fecc68cd1e0b0558e
Author: Jesper Nilsson <jesper.nilsson@axis.com>
Date:   Mon Jan 14 00:55:23 2008 -0800

    CRIS v10: kernel/time.c needs to include linux/vmstat.h to compile
    
    This fixes compile error when nr_free_pages() from linux/swap.h
    expands to global_page_state(NR_FREE_PAGES), but linux/vmstat.h isn't
    included to declare global_page_state().
    
    Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
    Cc: Mikael Starvik <mikael.starvik@axis.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit a4858d4dab4580ec8b1fb7576f91522b6962502c
Author: Jesper Nilsson <jesper.nilsson@axis.com>
Date:   Mon Jan 14 00:55:22 2008 -0800

    CRIS v10: correct do_signal to fix oops and clean up signal handling in general
    
    This fixes a kernel panic on boot due to do_signal not being compatible
    with it's callers.
    
    - do_signal now returns void, and does not have the previous signal set
      as a parameter.
    - Remove sys_rt_sigsuspend, we can use the common one instead.
    - Change sys_sigsuspend to be more like x86, don't call do_signal here.
    - handle_signal, setup_frame and setup_rt_frame now return -EFAULT
      if we've delivered a segfault, which is used by callers to perform
      necessary cleanup.
    - Break long lines, correct whitespace and formatting errors.
    
    Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
    Cc: Mikael Starvik <mikael.starvik@axis.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 3ea0345be38555c6a1a04ed7e9c015a42e76bd0e
Author: Jesper Nilsson <jesper.nilsson@axis.com>
Date:   Mon Jan 14 00:55:22 2008 -0800

    CRIS: define __ARCH_WANT_SYS_RT_SIGSUSPEND in unistd.h for CRIS
    
    This allows us to use the commong sys_rt_sigsuspend instead of
    having our own.
    
    Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
    Cc: Mikael Starvik <mikael.starvik@axis.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit f0466441492dc17d0749ef0cce9831fc7e4a7a5d
Author: Krzysztof Helt <krzysztof.h1@wp.pl>
Date:   Mon Jan 14 00:55:20 2008 -0800

    s3c2410fb: fix incorrect argument type in resume function
    
    Fix wrong pointer type passed into the s3c2410fb_init_registers()
    function.
    
    Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
    Cc: "Antonino A. Daplas" <adaplas@pol.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 68842c9b94560e647e8e7cc75cbb3dbe59f6fcb5
Author: Ken Chen <kenchen@google.com>
Date:   Mon Jan 14 00:55:19 2008 -0800

    hugetlbfs: fix quota leak
    
    In the error path of both shared and private hugetlb page allocation,
    the file system quota is never undone, leading to fs quota leak.  Fix
    them up.
    
    [akpm@linux-foundation.org: cleanup, micro-optimise]
    Signed-off-by: Ken Chen <kenchen@google.com>
    Acked-by: Adam Litke <agl@us.ibm.com>
    Cc: David Gibson <david@gibson.dropbear.id.au>
    Cc: William Lee Irwin III <wli@holomorphy.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 747d016e7e25e216b31022fe2b012508d99fb682
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date:   Mon Jan 14 00:55:18 2008 -0800

    advansys: fix section mismatch warning
    
    Fix section mismatch warning:
    
    WARNING: vmlinux.o(.exit.text+0x152a): Section mismatch: reference to .init.data:_asc_def_iop_base (between 'advansys_isa_remove' and 'advansys_exit')
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Cc: Matthew Wilcox <willy@debian.org>
    Cc: James Bottomley <James.Bottomley@steeleye.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 7d1fd970e4b2e84a624b3274669fa642fcd19c98
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date:   Mon Jan 14 00:55:17 2008 -0800

    cciss: section mismatch
    
    Mark cciss_pci_init() as __devinit, to fix section mismatch warning.
    
    WARNING: vmlinux.o(.text+0x601fc9): Section mismatch: reference to .init.text: (between 'cciss_pci_init' and 'cciss_getgeometry')
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Cc: <mike.miller@hp.com>
    Acked-by: Sam Ravnborg <sam@ravnborg.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 4c993f76698bcee594f081a295f1b8f48f58062a
Author: Adrian Bunk <bunk@kernel.org>
Date:   Mon Jan 14 00:55:16 2008 -0800

    scsi/qla2xxx/qla_os.c section fix
    
    WARNING: vmlinux.o(.text+0x2a4462): Section mismatch: reference to .exit.text:qla2x00_remove_one (between 'qla2xxx_pci_error_detected' and 'qla2x00_stop_timer')
    
    qla2x00_remove_one() mustn't be __devexit since it's called from
    qla2xxx_pci_error_detected().
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Acked-by: Seokmann Ju <seokmann.ju@qlogic.com>
    Acked-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
    Cc: Randy Dunlap <randy.dunlap@oracle.com>
    Cc: James Bottomley <James.Bottomley@steeleye.com>
    Acked-by: Sam Ravnborg <sam@ravnborg.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 9f31c05ea0f5690d002ae30710fc0fbe0f0c201f
Author: Andy Wingo <wingo@pobox.com>
Date:   Mon Jan 14 00:55:15 2008 -0800

    macintosh: fix fabrication of caplock key events
    
    If the user has turned on the "restore_caplock_events" parameter, the
    code mangles the capslock events correctly, then erroneously ignores
    those events.  Fix logic to allow correct fallthrough.
    
    Signed-off-by: Andy Wingo <wingo@pobox.com>
    Acked-by: Andrew McNabb <amcnabb@mcnabbs.org>
    Cc: Dmitry Torokhov <dtor@mail.ru>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    cc: Paul Mackerras <paulus@samba.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 96990a4ae979df9e235d01097d6175759331e88c
Author: Christoph Lameter <clameter@sgi.com>
Date:   Mon Jan 14 00:55:14 2008 -0800

    quicklists: Only consider memory that can be used with GFP_KERNEL
    
    Quicklists calculates the size of the quicklists based on the number of
    free pages.  This must be the number of free pages that can be allocated
    with GFP_KERNEL.  node_page_state() includes the pages in ZONE_HIGHMEM and
    ZONE_MOVABLE which may lead the quicklists to become too large causing OOM.
    
    Signed-off-by: Christoph Lameter <clameter@sgi.com>
    Tested-by: Dhaval Giani <dhaval@linux.vnet.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 8f4c79ce79d1552014af3c115d03e13092443905
Author: Nicolas Ferre <nicolas.ferre@atmel.com>
Date:   Mon Jan 14 00:55:13 2008 -0800

    MAINTAINERS: email update and add missing entry
    
     - MAINTAINERS email update
     - add atmel_lcdfb entry
    
    Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 2490c681ea3d7f5ac3fb876f14567bf1a9e0aa87
Author: David Smith <dds@google.com>
Date:   Mon Jan 14 00:55:12 2008 -0800

    TPM: fix suspend and resume failure
    
    The savestate command structure was being overwritten by the result of
    running the TPM_SaveState command after one run, so make it a local
    variable to the function instead of a global variable that gets
    overwritten.
    
    Acked-by: Pavel Machek <pavel@ucw.cz>
    Cc: Kent Yoder <shpedoikal@gmail.com>
    Cc: Marcel Selhorst <tpm@selhorst.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 40d6a146629b98d8e322b6f9332b182c7cbff3df
Author: Steven Rostedt <rostedt@goodmis.org>
Date:   Mon Jan 14 00:55:10 2008 -0800

    Kick CPUS that might be sleeping in cpus_idle_wait
    
    Sometimes cpu_idle_wait gets stuck because it might miss CPUS that are
    already in idle, have no tasks waiting to run and have no interrupts going
    to them.  This is common on bootup when switching cpu idle governors.
    
    This patch gives those CPUS that don't check in an IPI kick.
    
     Background:
     -----------
    I notice this while developing the mcount patches, that every once in a
    while the system would hang. Looking deeper, the hang was always at boot
    up when registering init_menu of the cpu_idle menu governor. Talking
    with Thomas Gliexner, we discovered that one of the CPUS had no timer
    events scheduled for it and it was in idle (running with NO_HZ). So the
    CPU would not set the cpu_idle_state bit.
    
    Hitting sysrq-t a few times would eventually route the interrupt to the
    stuck CPU and the system would continue.
    
    Note, I would have used the PDA isidle but that is set after the
    cpu_idle_state bit is cleared, and would leave a window open where we
    may miss being kicked.
    
    hmm, looking closer at this, we still have a small race window between
    clearing the cpu_idle_state and disabling interrupts (hence the RFC).
    
        CPU0:                          CPU 1:
      ---------                       ---------
     cpu_idle_wait():                 cpu_idle():
          |                           __cpu_cpu_var(is_idle) = 1;
          |                           if (__get_cpu_var(cpu_idle_state)) /* == 0 */
     per_cpu(cpu_idle_state, 1) = 1;         |
     if (per_cpu(is_idle, 1)) /* == 1 */     |
     smp_call_function(1)                    |
          |                             receives ipi and runs do_nothing.
     wait on map == empty               idle();
       /* waits forever */
    
    So really we need interrupts off for most of this then. One might think
    that we could simply clear the cpu_idle_state from do_nothing, but I'm
    assuming that cpu_idle governors can be removed, and this might cause a
    race that a governor might be used after the module was removed.
    
    Venki said:
    
      I think your RFC patch is the right solution here.  As I see it, there is
      no race with your RFC patch.  As long as you call a dummy smp_call_function
      on all CPUs, we should be OK.  We can get rid of cpu_idle_state and the
      current wait forever logic altogether with dummy smp_call_function.  And so
      there wont be any wait forever scenario.
    
      The whole point of cpu_idle_wait() is to make all CPUs come out of idle
      loop atleast once.  The caller will use cpu_idle_wait something like this.
    
      // Want to change idle handler
    
      - Switch global idle handler to always present default_idle
    
      - call cpu_idle_wait so that all cpus come out of idle for an instant
        and stop using old idle pointer and start using default idle
    
      - Change the idle handler to a new handler
    
      - optional cpu_idle_wait if you want all cpus to start using the new
        handler immediately.
    
    Maybe the below 1s patch is safe bet for .24.  But for .25, I would say we
    just replace all complicated logic by simple dummy smp_call_function and
    remove cpu_idle_state altogether.
    
    Signed-off-by: Steven Rostedt <srostedt@redhat.com>
    Cc: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Acked-by: Ingo Molnar <mingo@elte.hu>
    Acked-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Andi Kleen <ak@suse.de>
    Cc: Len Brown <lenb@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit a2a6c74d34c3ae9de6825767a30ab17f709b59ce
Author: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Date:   Mon Jan 14 00:55:08 2008 -0800

    w1: decrement slave counter only in ->release() callback
    
    Decrement the slave counter only in ->release() callback instead of both
    in ->release() and w1 control.
    
    Patch is based on debug work and preliminary patch made by Henri Laakso.
    Henri noticed in debug that this counter becomes negative after w1 slave
    device is physically removed.
    
    Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
    Cc: Henri Laakso <henri.laakso@wapice.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit cb2a52052cebe4716e83b9d2e53682ba00f67de6
Author: Rusty Russell <rusty@rustcorp.com.au>
Date:   Mon Jan 14 00:55:03 2008 -0800

    modules: de-mutex more symbol lookup paths in the module code
    
    Kyle McMartin reports sysrq_timer_list_show() can hit the module mutex
    from hard interrupt context.  These paths don't need to though, since we
    long ago changed all the module list manipulation to occur via
    stop_machine().
    
    Disabling preemption is enough.
    
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Kyle McMartin <kyle@mcmartin.ca>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 4ff891eb3d3dd6854f11d616c6397a0e403f4e88
Author: Kristoffer Ericson <kristoffer.ericson@gmail.com>
Date:   Mon Jan 14 00:54:23 2008 -0500

    Input: improve Kconfig help entries for HP Jornada devices
    
    Signed-off-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit 1a1b285c24e1468afe82b09330dde5192a6e0013
Merge: d72ec9e... 90e6b04...
Author: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date:   Sun Jan 13 10:03:10 2008 -0800

    Merge master.kernel.org:/home/rmk/linux-2.6-arm
    
    * master.kernel.org:/home/rmk/linux-2.6-arm:
      [ARM] vfp: fix fuitod/fsitod instructions
      [ARM] pxa: silence warnings from cpu_is_xxx() macros

commit d72ec9e20e4de995aa957f171cf84b136689e4c0
Merge: fd4be69... cb8da8a...
Author: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date:   Sun Jan 13 10:02:26 2008 -0800

    Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
      spidernet MAINTAINERship update
      sky2: remove check for PCI wakeup setting from BIOS
      sky2: large memory workaround.
      fs_enet: check for phydev existence in the ethtool handlers
      [usb netdev] asix: fix regression
      r8169: fix missing loop variable increment
      ip1000: menu location change
      Fixed a small typo in the loopback driver
      3c509: PnP resource management fix
      netxen: fix byte-swapping in tx and rx
      netxen: optimize tx handling
      netxen: stop second phy correctly
      netxen: update driver version
      netxen: update MAINTAINERS
      endianness noise in tulip_core
      de4x5 fixes
      xircom_cb endianness fixes
      rt2x00: Put 802.11 data on 4 byte boundary
      rt2x00: Corectly initialize rt2500usb MAC
      rt2x00: Allow rt61 to catch up after a missing tx report

commit fd4be699b5b6b1744c9b0736d991ccfb35eea575
Merge: 417009f... 473980a...
Author: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date:   Sun Jan 13 10:01:45 2008 -0800

    Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
      [POWERPC] Fix CPU hotplug when using the SLB shadow buffer
      [POWERPC] efika: add phy-handle property for fec_mpc52xx

commit 417009f64f17d76322d148a2cda40dfec37bcf0b
Merge: ba67a39... 55d1bb9...
Author: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date:   Sun Jan 13 09:58:22 2008 -0800

    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:
      pnpacpi: print resource shortage message only once
      PM: ACPI and APM must not be enabled at the same time
      ACPI: apply quirk_ich6_lpc_acpi to more ICH8 and ICH9
      ACPICA: fix acpi_serialize hang regression
      ACPI : Not register gsi for PCI IDE controller in legacy mode
      ACPI: Reintroduce run time configurable max_cstate for !CPU_IDLE case
      ACPI: Make sysfs interface in ACPI power optional.
      ACPI: EC: Enable boot EC before bus_scan
      increase PNP_MAX_PORT to 40 from 24

commit ba67a39efde8312e386c6f603054f8945433d91f
Author: NeilBrown <neilb@suse.de>
Date:   Fri Jan 11 17:06:52 2008 -0500

    knfsd: Allow NFSv2/3 WRITE calls to succeed when krb5i etc is used.
    
    When RPCSEC/GSS and krb5i is used, requests are padded, typically to a multiple
    of 8 bytes.  This can make the request look slightly longer than it
    really is.
    
    As of
    
    	f34b95689d2ce001c "The NFSv2/NFSv3 server does not handle zero
    		length WRITE request correctly",
    
    the xdr decode routines for NFSv2 and NFSv3 reject requests that aren't
    the right length, so krb5i (for example) WRITE requests can get lost.
    
    This patch relaxes the appropriate test and enhances the related comment.
    
    Signed-off-by: Neil Brown <neilb@suse.de>
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
    Cc: Peter Staubach <staubach@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 84427eaef1fb91704c7112bdb598c810003b99f3
Author: Roland McGrath <roland@redhat.com>
Date:   Thu Jan 10 12:52:04 2008 -0800

    remove task_ppid_nr_ns
    
    task_ppid_nr_ns is called in three places.  One of these should never
    have called it.  In the other two, using it broke the existing
    semantics.  This was presumably accidental.  If the function had not
    been there, it would have been much more obvious to the eye that those
    patches were changing the behavior.  We don't need this function.
    
    In task_state, the pid of the ptracer is not the ppid of the ptracer.
    
    In do_task_stat, ppid is the tgid of the real_parent, not its pid.
    I also moved the call outside of lock_task_sighand, since it doesn't
    need it.
    
    In sys_getppid, ppid is the tgid of the real_parent, not its pid.
    
    Signed-off-by: Roland McGrath <roland@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 55d1bb9a3b0f7f791ce597086791ebe54ea4c46a
Merge: 8df042e... 66a2173...
Author: Len Brown <len.brown@intel.com>
Date:   Sat Jan 12 18:06:27 2008 -0500

    Pull bugzilla-9535 into release branch

commit 66a21736defda339cd93a0e70c1120ab813640f6
Author: Len Brown <len.brown@intel.com>
Date:   Sat Jan 12 17:56:36 2008 -0500

    pnpacpi: print resource shortage message only once
    
    pnpacpi: exceeded the max number of IO resources: 40
    
    While this message is a real error and should thus
    remain KERN_ERR (even a new dmesg line is seen as a regression
    by some, since it was not printed in 2.6.23...) it is certainly
    impolite to print this warning 50 times should you happen to
    have the oddball system with 90 io resources under a device...
    
    So print the warning just once.
    
    In 2.6.25 we'll get rid of the limits altogether
    and these warnings will vanish with them.
    
    http://bugzilla.kernel.org/show_bug.cgi?id=9535
    
    Signed-off-by: Len Brown <len.brown@intel.com>

commit cb8da8a38015ded1df319a39b7298e69f89036ac
Author: Jens Osterkamp <jens@de.ibm.com>
Date:   Fri Jan 11 13:44:35 2008 +0100

    spidernet MAINTAINERship update
    
    Acked-by: Linas Vepstas <linasvepstas@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 84cd2dfb04d23a961c5f537baa243fa54d0987ac
Author: Stephen Hemminger <shemminger@linux-foundation.org>
Date:   Thu Jan 10 16:14:13 2008 -0800

    sky2: remove check for PCI wakeup setting from BIOS
    
    The driver checks status of PCI power management to mark
    default setting of Wake On Lan. On some systems this works, but often
    it reports a that WOL is disabled when it isn't.
    
    This patch gets rid of that check and just reports the wake on
    lan status based on the hardware capablity.
    
    Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 86c6887e6fea0b395dc939174ac80ad0ae88288c
Author: Stephen Hemminger <shemminger@linux-foundation.org>
Date:   Thu Jan 10 16:14:12 2008 -0800

    sky2: large memory workaround.
    
    This patch might fix problems with 4G or more of memory.
    It stops the driver from doing a small optimization for Tx and Rx,
    and instead always sets the high-page on tx/rx descriptors.
    
    Fixes-bug: http://bugzilla.kernel.org/show_bug.cgi?id=9725
    
    Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 974a9f0b47da74e28f68b9c8645c3786aa5ace1a
Author: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date:   Sat Jan 12 14:06:34 2008 -0800

    Use access mode instead of open flags to determine needed permissions
    
    Way back when (in commit 834f2a4a1554dc5b2598038b3fe8703defcbe467, aka
    "VFS: Allow the filesystem to return a full file pointer on open intent"
    to be exact), Trond changed the open logic to keep track of the original
    flags to a file open, in order to pass down the the intent of a dentry
    lookup to the low-level filesystem.
    
    However, when doing that reorganization, it changed the meaning of
    namei_flags, and thus inadvertently changed the test of access mode for
    directories (and RO filesystem) to use the wrong flag.  So fix those
    test back to use access mode ("acc_mode") rather than the open flag
    ("flag").
    
    Issue noticed by Bill Roman at Datalight.
    
    Reported-and-tested-by: Bill Roman <bill.roman@datalight.com>
    Acked-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Acked-by: Al Viro <viro@ZenIV.linux.org.uk>
    Cc: Christoph Hellwig <hch@lst.de>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit dfd9a421bed2325059fae04f810769b648fa1302
Author: Anton Vorontsov <avorontsov@ru.mvista.com>
Date:   Tue Jan 8 22:05:55 2008 +0300

    fs_enet: check for phydev existence in the ethtool handlers
    
    Otherwise oops will happen if ethernet device has not been opened:
    
    Unable to handle kernel paging request for data at address 0x0000014c
    Faulting instruction address: 0xc016f7f0
    Oops: Kernel access of bad area, sig: 11 [#1]
    MPC85xx
    NIP: c016f7f0 LR: c01722a0 CTR: 00000000
    REGS: c79ddc70 TRAP: 0300   Not tainted  (2.6.24-rc3-g820a386b)
    MSR: 00029000 <EE,ME>  CR: 20004428  XER: 20000000
    DEAR: 0000014c, ESR: 00000000
    TASK = c789f5e0[999] 'snmpd' THREAD: c79dc000
    GPR00: c01aceb8 c79ddd20 c789f5e0 00000000 c79ddd3c 00000000 c79ddd64 00000000
    GPR08: 00000000 c7845b60 c79dde3c c01ace80 20004422 200249fc 000002a0 100da728
    GPR16: 100c0000 00000000 00000000 00000000 20022078 00000009 200220e0 bfc85558
    GPR24: c79ddd3c 00000000 00000000 c02e0e70 c022fc64 ffffffff c7845800 bfc85498
    NIP [c016f7f0] phy_ethtool_gset+0x0/0x4c
    LR [c01722a0] fs_get_settings+0x18/0x28
    Call Trace:
    [c79ddd20] [c79dde38] 0xc79dde38 (unreliable)
    [c79ddd30] [c01aceb8] dev_ethtool+0x294/0x11ec
    [c79dde30] [c01aaa44] dev_ioctl+0x454/0x6a8
    [c79ddeb0] [c019b9d4] sock_ioctl+0x84/0x230
    [c79dded0] [c007ded8] do_ioctl+0x34/0x8c
    [c79ddee0] [c007dfbc] vfs_ioctl+0x8c/0x41c
    [c79ddf10] [c007e38c] sys_ioctl+0x40/0x74
    [c79ddf40] [c000d4c0] ret_from_syscall+0x0/0x3c
    Instruction dump:
    81630000 800b0030 2f800000 419e0010 7c0803a6 4e800021 7c691b78 80010014
    7d234b78 38210010 7c0803a6 4e800020 <8003014c> 7c6b1b78 38600000 90040004
    
    Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
    Acked-by: Vitaly Bordug <vitb@kernel.crashing.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 9ea7d6cb9c223e8b0887b8b0355470acb947a1c9
Merge: 94d4336... c5d0dc5...
Author: Jeff Garzik <jeff@garzik.org>
Date:   Sat Jan 12 17:44:35 2008 -0500

    Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes

commit 94d433630a1e63d383d592d488f60581e0d98190
Author: Russ Dill <Russ.Dill@asu.edu>
Date:   Wed Jan 9 21:32:07 2008 -0700

    [usb netdev] asix: fix regression
    
    51bf2976b55d07f9daae9697a0a3ac9f58abcedc caused a regression in the asix
    usbnet driver. usb_control_msg returns the number of bytes read on
    success, not 0. Tested with NETGEAR FA120.
    
    Signed-off-by: Russ Dill <Russ.Dill@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit cadf1855e9f97d3f6857a168e1e7798fe27530a1
Author: Francois Romieu <romieu@fr.zoreil.com>
Date:   Thu Jan 3 23:38:38 2008 +0100

    r8169: fix missing loop variable increment
    
    Spotted-by: Citizen Lee <citizen_lee@thecus.com>
    Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit ab7a9831763f0c10ad137352431eca9a6d97f76e
Author: Stephen Hemminger <shemminger@linux-foundation.org>
Date:   Tue Jan 1 09:27:58 2008 -0800

    ip1000: menu location change
    
    Move the ip1000 driver into the expected place for gigabit cards
    in the configuration menu structure. It should be under the gigabit
    cards, not at the top level.
    
    Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 2d2c54e3d058a9be78c04f429fa5e090eb454daa
Author: Emil Medve <Emilian.Medve@freescale.com>
Date:   Thu Dec 27 08:17:22 2007 -0600

    Fixed a small typo in the loopback driver
    
    This is probably a result of the changes from commit
    854d836 - [NET]: Dynamically allocate the loopback device, part 2
    
    Signed-off-by: Emil Medve <Emilian.Medve@Freescale.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 9ca20ebc263260acfea35a1a4910203b7ce6bd5a
Author: Krzysztof Helt <krzysztof.h1@wp.pl>
Date:   Thu Dec 27 09:54:04 2007 +0100

    3c509: PnP resource management fix
    
    In order to release PnP resources a card type must be set to EL3_PNP.
    Previously, it was never set hence the PnP resources were not
    released and device was left in incorrect state.
    
    Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 5dc162682d4901025a02b7045f3112d569b4bab9
Author: Dhananjay Phadke <dhananjay@netxen.com>
Date:   Mon Dec 31 10:08:57 2007 -0800

    netxen: fix byte-swapping in tx and rx
    
    Here's the reworked patch.
    
    This cleans up some unnecessary byte-swapping while setting up tx and
    interpreting rx desc. The 64 bit rx status data should be converted
    to host endian format only once and the macros just need to extract
    bitfields.
    
    This saves a spate of interrupts on pseries blades caused by buggy
    (non) processing rx status ring.
    
    Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 53a01e00f8c78bc5875e09aca7749ea54bb09798
Author: dhananjay@netxen.com <dhananjay@netxen.com>
Date:   Wed Dec 26 10:23:58 2007 -0800

    netxen: optimize tx handling
    
    netxen driver allows limited number of threads simultaneously posting
    skb's in tx ring. If transmit slot is unavailable, driver calls
    schedule() or loops in xmit_frame().
    
    This patch returns TX_BUSY and lets the stack reschedule the packet if
    transmit slot is unavailable. Also removes unnecessary check for tx
    timeout in the driver itself, the network stack does that anyway.
    
    Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 72b0a7a8a40a50cf2eab42fd6a56e04b05090434
Author: dhananjay@netxen.com <dhananjay@netxen.com>
Date:   Wed Dec 26 10:23:56 2007 -0800

    netxen: stop second phy correctly
    
    This patch fixes bug that doesn't quiesce second port when interface is
    brought down, which could lead to unwarranted interrupt during rmmod /
    ifdown.
    
    Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 001a731ecfc2e5fdbb5022ad3708705d9edf801c
Author: dhananjay@netxen.com <dhananjay@netxen.com>
Date:   Wed Dec 26 10:23:54 2007 -0800

    netxen: update driver version
    
    Bumping up driver version to 3.4.18, several fixes have gone in since
    version 3.4.2.
    
    Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit d230ce30f4eb2cec42cb501db586ce45815a8167
Author: dhananjay@netxen.com <dhananjay@netxen.com>
Date:   Wed Dec 26 10:23:53 2007 -0800

    netxen: update MAINTAINERS
    
    Changing MAINTAINERS for netxen nic driver.
    
    Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 76285ee03737ba8105db0621aa3e49222f0644f2
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Sun Dec 23 20:01:04 2007 +0000

    endianness noise in tulip_core
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 561b4fbf181926ab76e18a857593476ee76408f8
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Sun Dec 23 20:01:04 2007 +0000

    de4x5 fixes
    
    * (trivial) endianness annotations
    * don't bother with del_timer() from the inside of timer handler itself
    * disable_ast() really ought to do del_timer_sync(), not del_timer()
    * clean the timer handling in general.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 6f35d5d51619a1aa463180154c2d3c18a63e3950
Author: Al Viro <viro@ftp.linux.org.uk>
Date:   Sun Dec 23 20:01:04 2007 +0000

    xircom_cb endianness fixes
    
    * descriptors inside the rx and tx rings are l-e
    * don't cpu_to_le32() the argument of outl()
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit d0c4c9d4a2e46f052178806c4004d52cd3ae040f
Merge: 460c54b... da51716...
Author: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date:   Fri Jan 11 13:46:46 2008 -0800

    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 (7001): av7110: fix section mismatch
      V4L/DVB (6999): ivtv: stick to udelay=10 after all

commit 460c54b779fce3490ab70a84fd2ef59250ca3d57
Merge: 5d0381e... aea6ad0...
Author: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date:   Fri Jan 11 11:49:31 2008 -0800

    Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
    
    * 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6:
      [XFS] fix unaligned access in readdir

commit 5d0381e21ebf55df88e1cdca2810f4a49fe0ee62
Merge: 22fb53c... d7587b1...
Author: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date:   Fri Jan 11 11:48:59 2008 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.24
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.24:
      sh: Force __access_ok() to obey address space limit.
      sh: Fix argument page dcache flushing regression.

commit 22fb53c943b0ad4f86639bccb7ad8753be8ce435
Merge: 8dab637... e452e94...
Author: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date:   Fri Jan 11 11:48:00 2008 -0800

    Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
    
    * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
      [MIPS] Replace 40c7869b693b18412491fdcff64682215b739f9e kludge
      [MIPS] Lasat: Fix built in separate object directory.
      [MIPS] Malta: Fix software reset on big endian
      [MIPS] pnx8xxx: move to clocksource
      [MIPS] Wrong CONFIG option prevents setup of DMA zone.

commit 8dab63761219d7bc6a7d7d3b5f0fca76af5533a5
Author: Jeremy Kerr <jk@ozlabs.org>
Date:   Fri Jan 11 14:28:04 2008 +0100

    ps3fb: fix deadlock on kexec()
    
    Since the introduction of the acquire_console_sem calls in
    0333d83509c7d8496c8965b5ba9bc0c98e83c259, kexecing can cause the
    kernel to deadlock:
    
     ps3fb_shutdown()
      -> unregister_framebuffer()
      -> fb_notifier_call_chain(FB_EVENT_FB_UNBIND)
      -> fbcon_fb_unbind()
      -> unbind_con_driver()
      -> bind_con_driver()
    	[ acquires console_sem ]
      -> fbcon_deinit()
      -> fbops->fb_release(newinfo, 0)
      -> ps3fb_release()
      -> ps3fb_sync()
    	[ acquires console_sem ]
    
    This change avoids the deadlock by moving the acquire_console_sem()
    out of ps3fb_sync(), and puts it into the two other callsites, leaving
    ps3fb_release() to call ps3fb_sync() without the console semaphore.
    
    [Geert]
      - Corrected call sequence above
      - ps3fb_release() may be called with and without console_sem held. This is an
        inconsistency that should be fixed at the fb level, but for now, try to
        acquire console_sem in ps3fb_release().
    
        I think it's safer to let ps3fb_release() try to acquire console_sem and
        not refresh the screen if it fails, than to call ps3fb_sync() without
        holding console_sem, as ps3fb_par may be modified at the same time, causing
        crashes or lockups.
    
        Besides, ps3fb_release() only calls ps3fb_sync() to refresh the screen
        when display flipping is disabled, which is an uncommon case (except during
        shutdown/kexec).
    
    Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
    Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit ba21611c9c0031ca8388cae5e43b38c29c8b595d
Author: Jeremy Kerr <jk@ozlabs.org>
Date:   Fri Jan 11 14:27:10 2008 +0100

    ps3fb: prevent use after free of fb_info
    
    In ps3fb_shutdown, freeing the framebuffer will cause fb_info (in
    dev->core.driver_data) to be free()ed, which we potentially access
    from the ps3fbd kthread.
    
    This change frees the framebuffer after stopping the ps3fbd kthread.
    
    Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
    Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit b506d1b6c49a5884ff67a29bc99a1912ee20acee
Merge: 646fd12... 11a5715...
Author: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date:   Fri Jan 11 11:44:59 2008 -0800

    Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
    
    * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
      blktrace: kill the unneeded initcall
      block: fix blktrace timestamps
      loop: fix bad bio_alloc() nr_iovec request
      Don't blatt first element of prv in sg_chain()

commit 646fd12784d506180353005f40f90bcf08c84a3e
Author: Massimo Cirillo <maxcir@gmail.com>
Date:   Fri Jan 11 10:24:11 2008 +0000

    cache invalidation error for buffered write
    
    The bug causes corruptions of data read from flash.
    
    The original code performs cache invalidation from "adr" to "adr + len"
    in do_write_buffer().  Since len and adr could be updated in the code
    before invalidation - it causes improper setting of cache invalidation
    regions.
    
    Signed-off-by: Massimo Cirillo <maxcir@gmail.com>
    Signed-off-by: Giuseppe D'Eliseo <giuseppedeliseo@gmail.com>
    Acked-by: Nicolas Pitre <nico@cam.org>
    Acked-by: Jörn Engel <joern@logfs.org>
    Signed-off-by: David Woohouse <dwmw2@infradead.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 7c48c56e9b5a51263269dd419cc32531db141340
Author: Jeff Garzik <jeff@garzik.org>
Date:   Thu Jan 10 23:59:18 2008 -0500

    IDE: terminate ACPI DMI list
    
    Fix oops reported by Trond.
    
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 8df042e85c4462f97be286ef0fd82a627f27e9c8
Merge: 4562120... 5b3f0e6...
Author: Len Brown <len.brown@intel.com>
Date:   Fri Jan 11 12:28:38 2008 -0500

    Pull bugzilla-9683 into release branch

commit 456212017bf21f6bbdf972a5eafab987600956b2
Merge: 6b74c92... c04209a...
Author: Len Brown <len.brown@intel.com>
Date:   Fri Jan 11 12:28:22 2008 -0500

    Pull bugzilla-9627 into release branch

commit 6b74c92521de123b6b3b01a8be432722121d9e8e
Merge: 4e1b83a... 2c83819...
Author: Len Brown <len.brown@intel.com>
Date:   Fri Jan 11 12:27:50 2008 -0500

    Pull bugzilla-9535 into release branch

commit 4e1b83ad61b5db143281bb54e88ff420cc6b79d0
Merge: 02d5bcc... 97749cd...
Author: Len Brown <len.brown@intel.com>
Date:   Fri Jan 11 12:27:32 2008 -0500

    Pull bugzilla-9494 into release branch

commit 02d5bccf8ea3f9b8de21bfe19db77fbc50d92e04
Merge: eba6860... 9f9adec...
Author: Len Brown <len.brown@intel.com>
Date:   Fri Jan 11 12:27:13 2008 -0500

    Pull bugzilla-9194 into release branch

commit 9f9adecd2d0e4f88fa0e8cb06c6ec207748df70a
Author: Len Brown <len.brown@intel.com>
Date:   Thu Dec 13 17:38:03 2007 -0500

    PM: ACPI and APM must not be enabled at the same time
    
    ACPI and APM used "pm_active" to guarantee that
    they would not be simultaneously active.
    
    But pm_active was recently moved under CONFIG_PM_LEGACY,
    so that without CONFIG_PM_LEGACY, pm_active became a NOP --
    allowing ACPI and APM to both be simultaneously enabled.
    This caused unpredictable results, including boot hangs.
    
    Further, the code under CONFIG_PM_LEGACY is scheduled
    for removal.
    
    So replace pm_active with pm_flags.
    pm_flags depends only on CONFIG_PM,
    which is present for both CONFIG_APM and CONFIG_ACPI.
    
    http://bugzilla.kernel.org/show_bug.cgi?id=9194
    
    Signed-off-by: Len Brown <len.brown@intel.com>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

commit eba6860ac5f9578e3ba6d0f9900cfc72599c5d66
Merge: aa7f007... d1ec729...
Author: Len Brown <len.brown@intel.com>
Date:   Fri Jan 11 12:23:14 2008 -0500

    Pull bugzilla-8973 into release branch

commit aa7f00741da5e2adeca3e03103d14b9141040e49
Merge: e63501d... 014d433...
Author: Len Brown <len.brown@intel.com>
Date:   Fri Jan 11 12:22:57 2008 -0500

    Pull bugzilla-8171 into release branch

commit e63501d51d6a1a897470be2684e9c55a46d0d6d5
Merge: 88fb61e... 96c2a87...
Author: Len Brown <len.brown@intel.com>
Date:   Fri Jan 11 12:20:18 2008 -0500

    Pull bugzilla-5637 into release branch

commit e452e94e21e8f4a3c2ff045b301ca21c1f6d03bf
Author: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Date:   Tue Jan 8 00:41:13 2008 +0900

    [MIPS] Replace 40c7869b693b18412491fdcff64682215b739f9e kludge
    
    Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 778bc145feb68f365339d6b5c9e35af2a86fb233
Author: WANG Cong <xiyou.wangcong@gmail.com>
Date:   Wed Jan 2 14:21:36 2008 +0800

    [MIPS] Lasat: Fix built in separate object directory.
    
    Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
    
    [Ralf: The LDSCRIPT script needed fixing, too]
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 84c21e254205ecac98f75b01589996440c6a6db0
Author: Dmitri Vorobiev <dmitri.vorobiev@gmail.com>
Date:   Tue Jan 8 06:44:00 2008 +0300

    [MIPS] Malta: Fix software reset on big endian
    
    I noticed that the commit f197465384bf7ef1af184c2ed1a4e268911a91e3
    (MIPS Tech: Get rid of volatile in core code) broke the software
    reset functionality for MIPS Malta boards in big-endian mode.
    
    According to the MIPS Malta board user's manual, writing the magic
    32-bit GORESET value into the SOFTRES register initiates board soft
    reset. My experimentation has shown that the endianness of the GORESET
    integer should thereby be the same as the endianness, which has been
    set for the CPU itself. The writew() function used to write the magic
    value in the code introduced by the commit mentioned above, however,
    swaps bytes for big-endian kernels and transfers 16 bits instead of 32.
    
    The patch below replaces the writew() function by the __raw_writel()
    routine, which leaves the byte order intact and transfers the whole
    MIPS machine word. Trivial code cleanup (replacing spaces by a tab
    and cutting oversized lines to make checkpatch.pl happy) is also
    included.
    
    The patch was tested using a Malta evaluation board running in both
    BE and LE modes. For both modes, software reset was fully functional
    after the change.
    
    P.S. I suspect that the same commit broke the "standby" functionality
    for MIPS Atlas boards. However, I did not touch the Atlas code as I
    don't have such board at my disposal and also because the linux-mips.org
    Web site claims that Atlas support is scheduled for removal.
    
    Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev@gmail.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 1b1c5f0d96eb05cf6cd4702dabf4e003eded08c2
Author: Vitaly Wool <vitalywool@gmail.com>
Date:   Thu Jan 10 17:10:05 2008 +0300

    [MIPS] pnx8xxx: move to clocksource
    
    This patch converts PNX8XXX system timer to clocksource restoring PNX8550
    support back to live.
    
    Signed-off-by: Vitaly Wool <vitalywool@gmail.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 320167182dc3e351d2608cb7dccde12a47e3f51d
Author: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Date:   Sun Dec 30 12:45:40 2007 +0100

    [MIPS] Wrong CONFIG option prevents setup of DMA zone.
    
    Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit da517164f5b9133ecc7a020342e90452c215ec0f
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date:   Thu Jan 10 19:31:47 2008 -0300

    V4L/DVB (7001): av7110: fix section mismatch
    
    Fix driver data name to match whitelist of acceptable names that contain
    pointers init data so that section mismatch warning is placated.
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 745a4c9f0ba60a414224f2d5e4f0e8e25efd04e8
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date:   Thu Jan 10 18:33:16 2008 -0300

    V4L/DVB (6999): ivtv: stick to udelay=10 after all
    
    Using an udelay of 5 seems to result in problems for several people.
    For now abandon the udelay value of 5 and stick to 10, even though this
    will mean a longer load time of the cx2584x firmware.
    
    Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 11a57153e3377ffdf8cfca2eda9a99063f66b957
Author: Jens Axboe <jens.axboe@oracle.com>
Date:   Fri Jan 11 13:37:01 2008 +0100

    blktrace: kill the unneeded initcall
    
    It just inits the mutex, we can do that with DEFINE_MUTEX() instead.
    
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit 2997c8c4a0b179e8b834a7f30ba4323f2c60ccf4
Author: Ingo Molnar <mingo@elte.hu>
Date:   Fri Jan 11 13:35:54 2008 +0100

    block: fix blktrace timestamps
    
    David Dillow reported broken blktrace timestamps. The reason
    is cpu_clock() which is not a global time source.
    
    Fix bkltrace timestamps by using ktime_get() like the networking
    code does for packet timestamps. This also removes a whole lot
    of complexity from bkltrace.c and shrinks the code by 500 bytes:
    
       text    data     bss     dec     hex filename
       2888     124      44    3056     bf0 blktrace.o.before
       2390     116      44    2550     9f6 blktrace.o.after
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit a24eab1ed506f3e0bcbcd3f619558935549d4ace
Author: Jens Axboe <jens.axboe@oracle.com>
Date:   Fri Jan 11 10:14:40 2008 +0100

    loop: fix bad bio_alloc() nr_iovec request
    
    Don't allocate room for an iovec when it is not needed.
    
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit b801a1e7dbca3f51d0a4b22a750ae257196002cb
Author: Rusty Russell <rusty@rustcorp.com.au>
Date:   Fri Jan 11 10:12:55 2008 +0100

    Don't blatt first element of prv in sg_chain()
    
    I realize that sg chaining is a ploy to make the rest of the kernel
    devs feel the pain of the SCSI subsystem.  But this was a little
    unsubtle.
    
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Acked-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit aea6ad0ce5e215ce99fe9e3edd9268f696862d8f
Author: Christoph Hellwig <hch@infradead.org>
Date:   Thu Jan 10 16:43:26 2008 +1100

    [XFS] fix unaligned access in readdir
    
    This patch should fix the issue seen on Alpha with unaligned accesses in
    the new readdir code. By aligning each dirent to sizeof(u64) we'll avoid
    unaligned accesses. To make doubly sure we're not hitting problems also
    rearrange struct hack_dirent to avoid holes.
    
    SGI-PV: 975411
    SGI-Modid: xfs-linux-melb:xfs-kern:30302a
    
    Signed-off-by: Christoph Hellwig <hch@infradead.org>
    Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>

commit 473980a99316c0e788bca50996375a2815124ce1
Author: Michael Neuling <mikey@neuling.org>
Date:   Fri Jan 11 14:02:47 2008 +1100

    [POWERPC] Fix CPU hotplug when using the SLB shadow buffer
    
    Before we register the SLB shadow buffer, we need to invalidate the
    entries in the buffer, otherwise we can end up stale entries from when
    we previously offlined the CPU.
    
    This does this invalidate as well as unregistering the buffer with
    PHYP before we offline the cpu.  Tested and fixes crashes seen on
    970MP (thanks to tonyb) and POWER5.
    
    Signed-off-by: Michael Neuling <mikey@neuling.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit d1ec7298fcefd7e4d1ca612da402ce9e5d5e2c13
Author: Zhao Yakui <yakui.zhao@intel.com>
Date:   Fri Jan 11 00:24:55 2008 -0500

    ACPI: apply quirk_ich6_lpc_acpi to more ICH8 and ICH9
    
    It is important that these resources be reserved
    to avoid conflicts with well known ACPI registers.
    
    Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>

commit d7587b1445c0087cfcaa03ceae79b52eef4e9e4b
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Fri Jan 11 13:18:16 2008 +0900

    sh: Force __access_ok() to obey address space limit.
    
    When the thread_info->addr_limit changes were introduced, __access_ok()
    was missed in the conversion, allowing user processes to perform P1/P2
    accesses under certain conditions.
    
    This has already been corrected with the nommu refactoring in later
    kernels.
    
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 014d433f35d7f34b55dcc7b57c7635aaefc3757f
Author: Bob Moore <robert.moore@intel.com>
Date:   Thu Jan 10 23:04:10 2008 -0500

    ACPICA: fix acpi_serialize hang regression
    
    http://bugzilla.kernel.org/show_bug.cgi?id=8171
    
    Signed-off-by: Bob Moore <robert.moore@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>

commit 96c2a8766bf4fe91abac863749c11637fabcc64f
Author: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date:   Thu Jan 10 22:49:58 2008 -0500

    ACPI : Not register gsi for PCI IDE controller in legacy mode
    
    When PCI IDE controller works in legacy mode and no PRT entry is found
    in ACPI PRT table, OSPM will neither read the irq number from the IDE
    PCI configuration space nor call the function of acpi_register_gsi to
    register gsi.
    
    http://bugzilla.kernel.org/show_bug.cgi?id=5637
    
    Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
    Signed-off-by: Zhang Rui <rui.zhang@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>

commit 88fb61e4ba263685a0d5b82c7e9cd6f22a9e6a9d
Merge: d3ead3a... 490fe3f...
Author: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date:   Thu Jan 10 16:09:34 2008 -0800

    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] padlock: Fix alignment fault in aes_crypt_copy

commit d3ead3a206effab210813eafff4bfaa581295252
Merge: 318851b... 9b8e8de...
Author: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date:   Thu Jan 10 14:53:37 2008 -0800

    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 and starting/stopping ATAPI floppy devices
      sata_sil24: prevent hba lockup when pass-through ATA commands are used
      Update kernel parameter document for libata DMA mode setting knobs.
      libata: don't normalize UNKNOWN to NONE after reset
      libata-pmp: propagate timeout to host link
      libata-pmp: 4726 hates SRST
      pata_ixp4xx_cf: fix compilation introduced by ata_port_desc() conversion
      pata_pdc202xx_old: Further fixups
      libata-sff: PCI IRQ handling fix
      sata_qstor: use hardreset instead of softreset

commit 318851b08fb9d426a545f76e56f2cc049831fb40
Merge: d0dc370... 93c0b56...
Author: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date:   Thu Jan 10 14:31:16 2008 -0800

    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:
      trm290: do hook dma_host_{on,off} methods (take 2)
      ide: fix cable detection for SATA bridges
      ide: workaround suspend bug for ACPI IDE

commit 9b8e8de7e59b3a2dab3113d620b52dc8ba890fb3
Author: Ondrej Zary <linux@rainbow-software.org>
Date:   Thu Jan 10 17:13:19 2008 -0500

    libata and starting/stopping ATAPI floppy devices
    
    Prevent libata from starting/stopping non-ATA devices (like ATAPI floppy
    drives) as they don't seem to like it:
    
    sd 1:0:1:0: [sdb] Starting disk
    ata2.01: configured for PIO2
    sd 1:0:1:0: [sdb] Result: hostbyte=0x00 driverbyte=0x08
    sd 1:0:1:0: [sdb] Sense Key : 0x2 [current]
    sd 1:0:1:0: [sdb] ASC=0x3a ASCQ=0x0
    
    Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 93c0b5608086a103892aa78b7b83d7ecab60f7ab
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Thu Jan 10 23:03:42 2008 +0100

    trm290: do hook dma_host_{on,off} methods (take 2)
    
    Using default methods caused the chip's DMA PRD count registers, inadvertently
    starting DMA!  While fixing it, also do:
    
    - get rid of the 'ide_' prefixes in several functions for which the prefix in
      the method's name has been 'ide_' ectomized already;
    
    - align the code hooking the IDE DMA methods in init_hwif_trm290()...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

commit b98f8803ccfe9d156d37a6eb471a620904085c80
Author: George Kibardin <george-kibardin@yandex.ru>
Date:   Thu Jan 10 23:03:42 2008 +0100

    ide: fix cable detection for SATA bridges
    
    Signed-off-by: George Kibardin <george-kibardin@yandex.ru>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

commit 90494893b5d2bf7533fb65accbfd8cbd6b51b9c3
Author: Shaohua Li <shaohua.li@intel.com>
Date:   Thu Jan 10 23:03:42 2008 +0100

    ide: workaround suspend bug for ACPI IDE
    
    http://bugzilla.kernel.org/show_bug.cgi?id=9673
    
    ACPI _PS3 cause S4 breaks in the second attempt. The system has a _PS3
    method for IDE, which will call into SMM mode. Currently we haven't clue
    why just the second attempt fails, as it's totally in BIOS code, so
    blacklist the system so far for 2.6.24.
    
    A possible suspect is ACPI NVS isn't save/restore, we will revisit the
    bug after linux does ACPI NVS save/restore.
    
    Bart:
    - fix scripts/checkpatch.pl complaints
    - const-ify ide_acpi_dmi_table[]
    
    Signed-off-by: Shaohua Li <shaohua.li@intel.com>
    Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
    Reported-by: Mikko Vinni <mmvinni@yahoo.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

commit 13cc546be3060324de9d92ebde3bc9dbd950df23
Author: Gwendal Grignou <gwendal@google.com>
Date:   Thu Jan 10 15:47:56 2008 +0900

    sata_sil24: prevent hba lockup when pass-through ATA commands are used
    
    Fix commands timeout with Sil3124/3132 based HBA when pass-through ATA
    commands [where ATA_QCFLAG_RESULT_TF is set] are used while other
    commands are active on other devices connected to the same port with a
    Port Multiplier.  Due to a hardware bug, these commands must be sent
    alone, like ATAPI commands.
    
    Signed-off-by: Gwendal Grignou <gwendal@google.com>
    Acked-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit fcb71f6f034c6c4f6a3ab4a55404c95db6e32653
Author: FD Cami <francois.cami@free.fr>
Date:   Sun Jan 6 19:08:56 2008 +0100

    Update kernel parameter document for libata DMA mode setting knobs.
    
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 4ccd3329a2e51473a86547a55f9e5f98f8f65b33
Author: Tejun Heo <htejun@gmail.com>
Date:   Tue Jan 8 20:26:12 2008 +0900

    libata: don't normalize UNKNOWN to NONE after reset
    
    After non-classifying reset, ehc->classes[] could contain
    ATA_DEV_UNKNOWN which used to be normalized to ATA_DEV_NONE for
    consistency.  However, this causes unfortunate side effect for drivers
    which have non-classifying hardresets (e.g. sata_nv) by making
    hardreset report ATA_DEV_NONE for non-classifying resets and thus
    makes EH believe that the port is unoccupied and recovery can be
    skipped.  The end result is that after a device is swapped with
    another one, the new device isn't attached after the old one is
    detached.
    
    This patch makes ata_eh_reset() not normalize UNKNOWN to NONE after
    non-classifying resets.  This fixes the above problem.  As UNKNOWN and
    NONE are handled differently by only EH hotplug logic, this doesn't
    cause other behavior changes.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Cc: Robert Hancock <hancockr@shaw.ca>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 2695e36616c3ece5e8e30666868fc7c90dc3fc75
Author: Tejun Heo <htejun@gmail.com>
Date:   Thu Jan 10 13:41:23 2008 +0900

    libata-pmp: propagate timeout to host link
    
    Timeout on downstream command may indicate transmission problem on
    host link.  Propagate timeouts to host link.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 8048307dbc3cfc30690b131e786fb57157fbdb11
Author: Tejun Heo <htejun@gmail.com>
Date:   Thu Jan 10 13:38:46 2008 +0900

    libata-pmp: 4726 hates SRST
    
    4726 hates SRST even on non-config ports.  Don't use it.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit af183748044cefb1050ab47519e6bdcfcecec226
Author: Rod Whitby <rod@whitby.id.au>
Date:   Sun Jan 6 10:05:28 2008 +0900

    pata_ixp4xx_cf: fix compilation introduced by ata_port_desc() conversion
    
    Fixes a compilation error caused by ata_port_desc() conversion
    (cbcdd87593a1d85c5c4b259945a3a09eee12814d).
    
    Signed-off-by: Rod Whitby <rod@whitby.id.au>
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 36906d9beab941452cad406cc03f05cc78671256
Author: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date:   Fri Jan 4 00:08:49 2008 +0000

    pata_pdc202xx_old: Further fixups
    
    Turns out distros always enabled burst mode and it is pretty essential so
    do the same. Also sort out the post DMA mode restore properly.
    
    My 20263 card now seems happy but needs some four drive tests done yet
    (when I've persuaded the kernel not to hang in the edd boot code if I
    plug them in ..)
    
    Signed-off-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 277d72a37431d200727189693b14488368b7c258
Author: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date:   Thu Jan 3 17:22:28 2008 +0000

    libata-sff: PCI IRQ handling fix
    
    It is legitimate (although annoying and silly) for a PCI IDE controller
    not to be assigned an interrupt and to be polled. The libata-sff code
    should therefore not try and request IRQ 0 in this case.
    
    Signed-off-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit b14dabcdb651ddd9f85c69c9042322c139e7da84
Author: Tejun Heo <htejun@gmail.com>
Date:   Fri Jan 4 00:22:19 2008 +0900

    sata_qstor: use hardreset instead of softreset
    
    During conversion to new EH, sata_qstor was accidentaly changed to use
    softreset, which is buggy on this chip, instead of hardreset.  This
    patch updates sata_qstor such that it uses hardreset again.
    
    This fixes bugzilla bug 9631.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Cc: Mark Lord <mlord@pobox.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit d0dc3701cb46f73cf8ca393f62e325065b0bbd03
Author: Trond Myklebust <Trond.Myklebust@netapp.com>
Date:   Thu Jan 10 16:07:54 2008 -0500

    NFSv4: Give the lock stateid its own sequence queue
    
    Sharing the open sequence queue causes a deadlock when we try to take
    both a lock sequence id and and open sequence id.
    
    This fixes the regression reported by Dimitri Puzin and Jeff Garzik: See
    
    	http://bugzilla.kernel.org/show_bug.cgi?id=9712
    
    for details.
    
    Reported-and-tested-by: Dimitri Puzin <bugs@psycast.de>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Tested-by: Jeff Garzik <jgarzik@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit c5d0dc5f0dd66770232d7d360c770d2344b76d52
Author: Ivo van Doorn <ivdoorn@gmail.com>
Date:   Sun Jan 6 23:40:27 2008 +0100

    rt2x00: Put 802.11 data on 4 byte boundary
    
    Check the size of the ieee80211 header during rxdone
    and make sure the data behind the ieee80211 header
    is placed on a 4 byte boundary.
    
    Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit dd87145d2c3a7b1c8b338e1f6e174b3d2a17cd35
Author: Ivo van Doorn <ivdoorn@gmail.com>
Date:   Wed Jan 9 19:18:25 2008 +0100

    rt2x00: Corectly initialize rt2500usb MAC
    
    mac is a pointer, obviously we shouldn't use the address
    of a pointer as MAC address.
    
    Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 62bc060b8ed5fcdafd87da5ab17bdd59a39ebcc9
Author: Mattias Nissler <mattias.nissler@gmx.de>
Date:   Mon Nov 12 15:03:12 2007 +0100

    rt2x00: Allow rt61 to catch up after a missing tx report
    
    Sometimes it happens in the tx path that an entry given to the hardware isn't
    reported in the txdone handler. This ultimately led to the dreaded "non-free
    entry in the non-full queue" message and the stopping of the tx queue. Work
    around this issue by allowing the driver to also clear out previos entries in
    the txdone handler.
    
    Signed-off-by: Mattias Nissler <mattias.nissler@gmx.de>
    Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 490fe3f05be3f7c87d7932bcb6e6e53e3db2cd9c
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date:   Fri Jan 11 08:09:35 2008 +1100

    [CRYPTO] padlock: Fix alignment fault in aes_crypt_copy
    
    The previous patch fixed spurious read faults from occuring by copying
    the data if we happen to have a single block at the end of a page.  It
    appears that gcc cannot guarantee 16-byte alignment in the kernel with
    __attribute__.  The following report from Torben Viets shows a buffer
    that's only 8-byte aligned:
    
    > eneral protection fault: 0000 [#1]
    > Modules linked in: xt_TCPMSS xt_tcpmss iptable_mangle ipt_MASQUERADE
    > xt_tcpudp xt_mark xt_state iptable_nat nf_nat nf_conntrack_ipv4
    > iptable_filter ip_tables x_tables pppoe pppox af_packet ppp_generic slhc
    > aes_i586
    > CPU:    0
    > EIP:    0060:[<c035b828>]    Not tainted VLI
    > EFLAGS: 00010292   (2.6.23.12 #7)
    > EIP is at aes_crypt_copy+0x28/0x40
    > eax: f7639ff0   ebx: f6c24050   ecx: 00000001   edx: f6c24030
    > esi: f7e89dc8   edi: f7639ff0   ebp: 00010000   esp: f7e89dc8
    
    Since the hardware must have 16-byte alignment, the following patch fixes
    this by open coding the alignment adjustment.
    
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

commit 90e6b048365950416419c031f2f2d9a8afb5b70c
Author: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date:   Thu Jan 10 17:07:08 2008 +0000

    [ARM] vfp: fix fuitod/fsitod instructions
    
    These two instructions exceptionally take a single precision register
    as their operand.  This means we can't use vfp_get_dm() to read the
    register number - we need to use vfp_get_sm() instead.  Add a flag to
    indicate this exception to the general rule.
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit 6f4347c969674ed45de7d08d4b26d6326a95b959
Author: Olaf Hering <olaf@aepfle.de>
Date:   Thu Jan 10 01:06:08 2008 +1100

    [POWERPC] efika: add phy-handle property for fec_mpc52xx
    
    The new network driver fec_mpc52xx will not work on efika because the
    firmware does not provide all required properties.
    http://www.powerdeveloper.org/asset/by-id/46 has a Forth script to
    create more properties. But only the phy stuff is required to get a
    working network.
    
    This should go into the kernel because its appearently
    impossible to boot the script via tftp and then load the real boot
    binary (yaboot or zimage).
    
    Signed-off-by: Olaf Hering <olaf@aepfle.de>
    Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
    Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

commit 198a6d5a6189501e2b8abf4e3149ccb337866f65
Author: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date:   Thu Jan 10 12:33:54 2008 +0000

    [ARM] pxa: silence warnings from cpu_is_xxx() macros
    
    If only a single CPU type is selected, __cpu_is_xxx() doesn't
    use its argument.  This causes the compiler to issue a warning
    about an unused variable in the parent function.
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit 3a43e69ce50d467ded2f17f6e571e831d3677ab5
Author: FUJITA Tomonori <tomof@acm.org>
Date:   Tue Jan 8 23:07:01 2008 +0900

    [SCSI] qla1280: fix 32 bit segment code
    
    There's an error remaining in the 32 bit descriptor code after the
    conversion to dma accessors:  req_cnt is left uninitialised.
    
    qla1280_32bit_start_scsi gives the following warnings:
    
    drivers/scsi/qla1280.c: In function 'qla1280_32bit_start_scsi':
    drivers/scsi/qla1280.c:3044: warning: unused variable 'dma_handle'
    drivers/scsi/qla1280.c: In function 'qla1280_queuecommand':
    drivers/scsi/qla1280.c:3060: warning: 'req_cnt' is used uninitialized in this function
    drivers/scsi/qla1280.c:3042: note: 'req_cnt' was declared here
    
    Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

commit fd0b45dfd1858c6b49d06355a460bcf36d654c06
Merge: fcfd50a... 1c9b7aa...
Author: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date:   Wed Jan 9 08:05:12 2008 -0800

    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: (36 commits)
      [ATM]: Check IP header validity in mpc_send_packet
      [IPV6]: IPV6_MULTICAST_IF setting is ignored on link-local connect()
      [CONNECTOR]: Don't touch queue dev after decrement of ref count.
      [SOCK]: Adds a rcu_dereference() in sk_filter
      [XFRM]: xfrm_algo_clone() allocates too much memory
      [FORCEDETH]: Fix reversing the MAC address on suspend.
      [NET]: mcs7830 passes msecs instead of jiffies to usb_control_msg
      [LRO] Fix lro_mgr->features checks
      [NET]: Clone the sk_buff 'iif' field in __skb_clone()
      [IPV4] ROUTE: ip_rt_dump() is unecessary slow
      [NET]: kaweth was forgotten in msec switchover of usb_start_wait_urb
      [NET] Intel ethernet drivers: update MAINTAINERS
      [NET]: Make ->poll() breakout consistent in Intel ethernet drivers.
      [NET]: Stop polling when napi_disable() is pending.
      [NET]: Fix drivers to handle napi_disable() disabling interrupts.
      [NETXEN]: Fix ->poll() done logic.
      mac80211: return an error when SIWRATE doesn't match any rate
      ssb: Fix probing of PCI cores if PCI and PCIE core is available
      [NET]: Do not check netif_running() and carrier state in ->poll()
      [NET]: Add NAPI_STATE_DISABLE.
      ...

commit fcfd50afb6e94c8cf121ca4e7e3e7166bae7c6aa
Author: Roland McGrath <roland@redhat.com>
Date:   Wed Jan 9 00:03:23 2008 -0800

    show_task: real_parent
    
    The show_task function invoked by sysrq-t et al displays the
    pid and parent's pid of each task.  It seems more useful to
    show the actual process hierarchy here than who is using
    ptrace on each process.
    
    Signed-off-by: Roland McGrath <roland@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 1c9b7aa1eb40ab708ef3242f74b9a61487623168
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date:   Wed Jan 9 03:51:59 2008 -0800

    [ATM]: Check IP header validity in mpc_send_packet
    
    Al went through the ip_fast_csum callers and found this piece of code
    that did not validate the IP header.  While root crashing the machine
    by sending bogus packets through raw or AF_PACKET sockets isn't that
    serious, it is still nice to react gracefully.
    
    This patch ensures that the skb has enough data for an IP header and
    that the header length field is valid.
    
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 1ac4f008857487bf45b709248d71c5b3f4cae7b5
Author: Brian Haley <brian.haley@hp.com>
Date:   Tue Jan 8 23:52:21 2008 -0800

    [IPV6]: IPV6_MULTICAST_IF setting is ignored on link-local connect()
    
    Signed-off-by: Brian Haley <brian.haley@hp.com>
    Acked-by: David L Stevens <dlstevens@us.ibm.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit cf585ae8ae9ac7287a6d078425ea32f22bf7f1f7
Author: Li Zefan <lizf@cn.fujitsu.com>
Date:   Tue Jan 8 23:44:44 2008 -0800

    [CONNECTOR]: Don't touch queue dev after decrement of ref count.
    
    cn_queue_free_callback() will touch 'dev'(i.e. cbq->pdev), so it
    should be called before atomic_dec(&dev->refcnt).
    
    Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 9d3e44425e3498eb33f25d94392b4fd0d56a5176
Author: Eric Dumazet <dada1@cosmosbay.com>
Date:   Tue Jan 8 23:41:28 2008 -0800

    [SOCK]: Adds a rcu_dereference() in sk_filter
    
    It seems commit fda9ef5d679b07c9d9097aaf6ef7f069d794a8f9 introduced a RCU
    protection for sk_filter(), without a rcu_dereference()
    
    Either we need a rcu_dereference(), either a comment should explain why we
    dont need it. I vote for the former.
    
    Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
    Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 0f99be0d115a5716292c58dfdb20d2eddd0f3387
Author: Eric Dumazet <dada1@cosmosbay.com>
Date:   Tue Jan 8 23:39:06 2008 -0800

    [XFRM]: xfrm_algo_clone() allocates too much memory
    
    alg_key_len is the length in bits of the key, not in bytes.
    
    Best way to fix this is to move alg_len() function from net/xfrm/xfrm_user.c
    to include/net/xfrm.h, and to use it in xfrm_algo_clone()
    
    alg_len() is renamed to xfrm_alg_len() because of its global exposition.
    
    Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 2e3884b5b16795c03a7bf295797c1b2402885b88
Author: Bjrn Steinbrink <B.Steinbrink@gmx.de>
Date:   Mon Jan 7 23:22:53 2008 -0800

    [FORCEDETH]: Fix reversing the MAC address on suspend.
    
    For cards that initially have the MAC address stored in reverse order,
    the forcedeth driver uses a flag to signal whether the address was
    already corrected, so that it is not reversed again on a subsequent
    probe.
    
    Unfortunately this flag, which is stored in a register of the card,
    seems to get lost during suspend, resulting in the MAC address being
    reversed again. To fix that, the MAC address needs to be written back
    in reversed order before we suspend and the flag needs to be reset.
    
    The flag is still required because at least kexec will never write
    back the reversed address and thus needs to know what state the card
    is in.
    
    Signed-off-by: Bjrn Steinbrink <B.Steinbrink@gmx.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 1d39da3dcaad4231f0fa75024b1d6d710a2ced74
Author: Russ Dill <Russ.Dill@asu.edu>
Date:   Mon Jan 7 23:15:41 2008 -0800

    [NET]: mcs7830 passes msecs instead of jiffies to usb_control_msg
    
    usb_control_msg was changed long ago (2.6.12-pre) to take milliseconds
    instead of jiffies. Oddly, mcs7830 wasn't added until 2.6.19-rc3.
    
    Signed-off-by: Russ Dill <Russ.Dill@asu.edu>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 877364e60edeea06efa8ceb9d29201f195af8a47
Author: Brice Goglin <Brice.Goglin@inria.fr>
Date:   Mon Jan 7 22:09:08 2008 -0800

    [LRO] Fix lro_mgr->features checks
    
    lro_mgr->features contains a bitmask of LRO_F_* values which are
    defined as power of two, not as bit indexes.
    They must be checked with x&LRO_F_FOO, not with test_bit(LRO_F_FOO,&x).
    
    Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr>
    Acked-by: Andrew Gallatin <gallatin@myri.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 02f1c89d6e36507476f78108a3dcc78538be460b
Author: Paul Moore <paul.moore@hp.com>
Date:   Mon Jan 7 21:56:41 2008 -0800

    [NET]: Clone the sk_buff 'iif' field in __skb_clone()
    
    Both NetLabel and SELinux (other LSMs may grow to use it as well) rely
    on the 'iif' field to determine the receiving network interface of
    inbound packets.  Unfortunately, at present this field is not
    preserved across a skb clone operation which can lead to garbage
    values if the cloned skb is sent back through the network stack.  This
    patch corrects this problem by properly copying the 'iif' field in
    __skb_clone() and removing the 'iif' field assignment from
    skb_act_clone() since it is no longer needed.
    
    Also, while we are here, put the assignments in the same order as the
    offsets to reduce cacheline bounces.
    
    Signed-off-by: Paul Moore <paul.moore@hp.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit d8c9283089287341c85a0a69de32c2287a990e71
Author: Eric Dumazet <dada1@cosmosbay.com>
Date:   Mon Jan 7 21:52:14 2008 -0800

    [IPV4] ROUTE: ip_rt_dump() is unecessary slow
    
    I noticed "ip route list cache x.y.z.t" can be *very* slow.
    
    While strace-ing -T it I also noticed that first part of route cache
    is fetched quite fast :
    
    recvmsg(3, {msg_name(12)={sa_family=AF_NETLINK, pid=0, groups=00000000}, msg_iov(1)=[{"p\0\0\0\30\0\2\0\254i\202
    GXm\0\0\2  \0\376\0\0\2\0\2\0"..., 16384}], msg_controllen=0, msg_flags=0}, 0) = 3772 <0.000047>
    recvmsg(3, {msg_name(12)={sa_family=AF_NETLINK, pid=0, groups=00000000}, msg_iov(1)=[{"\234\0\0\0\30\0\2\0\254i\
    202GXm\0\0\2  \0\376\0\0\1\0\2"..., 16384}], msg_controllen=0, msg_flags=0}, 0) = 3736 <0.000042>
    recvmsg(3, {msg_name(12)={sa_family=AF_NETLINK, pid=0, groups=00000000}, msg_iov(1)=[{"\204\0\0\0\30\0\2\0\254i\
    202GXm\0\0\2  \0\376\0\0\1\0\2"..., 16384}], msg_controllen=0, msg_flags=0}, 0) = 3740 <0.000055>
    recvmsg(3, {msg_name(12)={sa_family=AF_NETLINK, pid=0, groups=00000000}, msg_iov(1)=[{"\234\0\0\0\30\0\2\0\254i\
    202GXm\0\0\2  \0\376\0\0\1\0\2"..., 16384}], msg_controllen=0, msg_flags=0}, 0) = 3712 <0.000043>
    recvmsg(3, {msg_name(12)={sa_family=AF_NETLINK, pid=0, groups=00000000}, msg_iov(1)=[{"\204\0\0\0\30\0\2\0\254i\
    202GXm\0\0\2  \0\376\0\0\1\0\2"..., 16384}], msg_controllen=0, msg_flags=0}, 0) = 3732 <0.000053>
    recvmsg(3, {msg_name(12)={sa_family=AF_NETLINK, pid=0, groups=00000000}, msg_iov(1)=[{"p\0\0\0\30\0\2\0\254i\202
    GXm\0\0\2  \0\376\0\0\2\0\2\0"..., 16384}], msg_controllen=0, msg_flags=0}, 0) = 3708 <0.000052>
    recvmsg(3, {msg_name(12)={sa_family=AF_NETLINK, pid=0, groups=00000000}, msg_iov(1)=[{"p\0\0\0\30\0\2\0\254i\202
    GXm\0\0\2  \0\376\0\0\2\0\2\0"..., 16384}], msg_controllen=0, msg_flags=0}, 0) = 3680 <0.000041>
    
    while the part at the end of the table is more expensive:
    
    recvmsg(3, {msg_name(12)={sa_family=AF_NETLINK, pid=0, groups=00000000}, msg_iov(1)=[{"\204\0\0\0\30\0\2\0\254i\202GXm\0\0\2  \0\376\0\0\1\0\2"..., 16384}], msg_controllen=0, msg_flags=0}, 0) = 3656 <0.003857>
    recvmsg(3, {msg_name(12)={sa_family=AF_NETLINK, pid=0, groups=00000000}, msg_iov(1)=[{"\204\0\0\0\30\0\2\0\254i\202GXm\0\0\2  \0\376\0\0\1\0\2"..., 16384}], msg_controllen=0, msg_flags=0}, 0) = 3772 <0.003891>
    recvmsg(3, {msg_name(12)={sa_family=AF_NETLINK, pid=0, groups=00000000}, msg_iov(1)=[{"p\0\0\0\30\0\2\0\254i\202GXm\0\0\2  \0\376\0\0\2\0\2\0"..., 16384}], msg_controllen=0, msg_flags=0}, 0) = 3712 <0.003765>
    recvmsg(3, {msg_name(12)={sa_family=AF_NETLINK, pid=0, groups=00000000}, msg_iov(1)=[{"p\0\0\0\30\0\2\0\254i\202GXm\0\0\2  \0\376\0\0\2\0\2\0"..., 16384}], msg_controllen=0, msg_flags=0}, 0) = 3700 <0.003879>
    recvmsg(3, {msg_name(12)={sa_family=AF_NETLINK, pid=0, groups=00000000}, msg_iov(1)=[{"p\0\0\0\30\0\2\0\254i\202GXm\0\0\2  \0\376\0\0\2\0\2\0"..., 16384}], msg_controllen=0, msg_flags=0}, 0) = 3676 <0.003797>
    recvmsg(3, {msg_name(12)={sa_family=AF_NETLINK, pid=0, groups=00000000}, msg_iov(1)=[{"p\0\0\0\30\0\2\0\254i\202GXm\0\0\2  \0\376\0\0\2\0\2\0"..., 16384}], msg_controllen=0, msg_flags=0}, 0) = 3724 <0.003856>
    recvmsg(3, {msg_name(12)={sa_family=AF_NETLINK, pid=0, groups=00000000}, msg_iov(1)=[{"\234\0\0\0\30\0\2\0\254i\202GXm\0\0\2  \0\376\0\0\1\0\2"..., 16384}], msg_controllen=0, msg_flags=0}, 0) = 3736 <0.003848>
    
    The following patch corrects this performance/latency problem,
    removing quadratic behavior.
    
    Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 2b2b2e35b71e5be8bc06cc0ff38df15dfedda19b
Author: Russ Dill <Russ.Dill@asu.edu>
Date:   Mon Jan 7 21:48:12 2008 -0800

    [NET]: kaweth was forgotten in msec switchover of usb_start_wait_urb
    
    Back in 2.6.12-pre, usb_start_wait_urb was switched over to take
    milliseconds instead of jiffies. kaweth.c was never updated to match.
    
    Signed-off-by: Russ Dill <Russ.Dill@asu.edu>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 204246596b8b51c0ba44420e60f60561101b2b31
Author: Auke Kok <auke-jan.h.kok@intel.com>
Date:   Mon Jan 7 21:47:25 2008 -0800

    [NET] Intel ethernet drivers: update MAINTAINERS
    
    Unfortunately Jeb decided to move away from our group. We wish Jeb
    good luck with his new group!
    
    Reordered people a bit so most active team members are on top.
    
    Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 53e52c729cc169db82a6105fac7a166e10c2ec36
Author: David S. Miller <davem@davemloft.net>
Date:   Mon Jan 7 21:06:12 2008 -0800

    [NET]: Make ->poll() breakout consistent in Intel ethernet drivers.
    
    This makes the ->poll() routines of the E100, E1000, E1000E, IXGB, and
    IXGBE drivers complete ->poll() consistently.
    
    Now they will all break out when the amount of RX work done is less
    than 'budget'.
    
    At a later time, we may want put back code to include the TX work as
    well (as at least one other NAPI driver does, but by in large NAPI
    drivers do not do this).  But if so, it should be done consistently
    across the board to all of these drivers.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Acked-by: Auke Kok <auke-jan.h.kok@intel.com>

commit fed17f3094b960d3a54b10f17abbe4b57e976eec
Author: David S. Miller <davem@davemloft.net>
Date:   Mon Jan 7 21:00:40 2008 -0800

    [NET]: Stop polling when napi_disable() is pending.
    
    This finally adds the code in net_rx_action() to break out of the
    ->poll()'ing loop when a napi_disable() is found to be pending.
    
    Now, even if a device is being flooded with packets it can be cleanly
    brought down.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit d1d08d1265810ef1f165864850416dcbc9725ee7
Author: David S. Miller <davem@davemloft.net>
Date:   Mon Jan 7 20:53:33 2008 -0800

    [NET]: Fix drivers to handle napi_disable() disabling interrupts.
    
    When we add the generic napi_disable_pending() breakout
    logic to net_rx_action() it means that napi_disable()
    can cause NAPI poll interrupt events to be disabled.
    
    And this is exactly what we want.  If a napi_disable()
    is pending, and we are looping in the ->poll(), we want
    ->poll() event interrupts to stay disabled and we want
    to complete the NAPI poll ASAP.
    
    When ->poll() break out during device down was being handled on a
    per-driver basis, often these drivers would turn interrupts back on
    when '!netif_running()' was detected.
    
    And this would just cause a reschedule of the NAPI ->poll() in the
    interrupt handler before the napi_disable() could get in there and
    grab the NAPI_STATE_SCHED bit.
    
    The vast majority of drivers don't care if napi_disable() might have
    the side effect of disabling NAPI ->poll() event interrupts.  In all
    such cases, when a napi_disable() is performed, the driver just
    disabled interrupts or is about to.
    
    However there were three exceptions to this in PCNET32, R8169, and
    SKY2.  To fix those cases, at the subsequent napi_enable() points, I
    added code to ensure that the ->poll() interrupt events are enabled in
    the hardware.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Acked-by:  Don Fry <pcnet32@verizon.net>

commit 1706287f6eb58726a9a0e5cbbde87f49757615e3
Author: David S. Miller <davem@davemloft.net>
Date:   Mon Jan 7 20:51:29 2008 -0800

    [NETXEN]: Fix ->poll() done logic.
    
    If work_done >= budget we should always elide the NAPI
    completion.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 5cdfed54e7200dde2e846e2ef153d1694ce44875
Author: Andrew Lutomirski <andy@luto.us>
Date:   Thu Jan 3 21:03:19 2008 -0800

    mac80211: return an error when SIWRATE doesn't match any rate
    
    Currently mac80211 fails silently when trying to set a nonexistent
    rate.  Return an error instead.
    
    Signed-Off-By: Andy Lutomirski <luto@myrealbox.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 87c4ac841c1d524416ab36c19689550bf302dab1
Author: Michael Buesch <mb@bu3sch.de>
Date:   Thu Jan 3 18:59:25 2008 +0100

    ssb: Fix probing of PCI cores if PCI and PCIE core is available
    
    This will make sure that always the correct core is selected, even if
    there are both a PCI and PCI-E core on a PCI or PCI-E card.
    
    Signed-off-by: Michael Buesch <mb@bu3sch.de>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 4ec2411980d0fd2995e8dea8a06fe57aa47523cb
Author: David S. Miller <davem@davemloft.net>
Date:   Mon Jan 7 20:48:21 2008 -0800

    [NET]: Do not check netif_running() and carrier state in ->poll()
    
    Drivers do this to try to break out of the ->poll()'ing loop
    when the device is being brought administratively down.
    
    Now that we have a napi_disable() "pending" state we are going
    to solve that problem generically.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit a0a46196cd98af5cc015842bba757571f02a8c30
Author: David S. Miller <davem@davemloft.net>
Date:   Mon Jan 7 20:35:07 2008 -0800

    [NET]: Add NAPI_STATE_DISABLE.
    
    Create a bit to signal that a napi_disable() is in progress.
    
    This sets up infrastructure such that net_rx_action() can generically
    break out of the ->poll() loop on a NAPI context that has a pending
    napi_disable() yet is being bombed with packets (and thus would
    otherwise poll endlessly and not allow the napi_disable() to finish).
    
    Now, what napi_disable() does is first set the NAPI_STATE_DISABLE bit
    (to indicate that a disable is pending), then it polls for the
    NAPI_STATE_SCHED bit, and once the NAPI_STATE_SCHED bit is acquired
    the NAPI_STATE_DISABLE bit is cleared.  Here, the test_and_set_bit()
    provides the necessary memory barrier between the various bitops.
    
    napi_schedule_prep() now tests for a pending disable as it's first
    action and won't try to obtain the NAPI_STATE_SCHED bit if a disable
    is pending.
    
    As a result, we can remove the netif_running() check in
    netif_rx_schedule_prep() because the NAPI disable pending state serves
    this purpose.  And, it does so in a NAPI centric manner which is what
    we really want.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit bdb95b1792664f25eb2a4d13a587d2020aa93002
Author: David S. Miller <davem@davemloft.net>
Date:   Mon Jan 7 20:26:59 2008 -0800

    [NET]: Do not grab device reference when scheduling a NAPI poll.
    
    It is pointless, because everything that can make a device go away
    will do a napi_disable() first.
    
    The main impetus behind this is that now we can legally do a NAPI
    completion in generic code like net_rx_action() which a following
    changeset needs to do.  net_rx_action() can only perform actions
    in NAPI centric ways, because there may be a one to many mapping
    between NAPI contexts and network devices (SKY2 is one example).
    
    We also want to get rid of this because it's an extra atomic in the
    NAPI paths, and also because it is one of the last instances where the
    NAPI interfaces care about net devices.
    
    The one remaining netdev detail the NAPI stuff cares about is the
    netif_running() check which will be killed off in a subsequent
    changeset.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit d987160b710c98997015832422a05e18d9f0f925
Author: Michael Buesch <mb@bu3sch.de>
Date:   Wed Jan 2 18:55:53 2008 +0100

    b43: Fix rxheader channel parsing
    
    This patch fixes the parsing of the RX data header channel field.
    
    The current code parses the header incorrectly and passes a wrong
    channel number and frequency for each frame to mac80211.
    The FIXMEs added by this patch don't matter for now as the code
    where they live won't get executed anyway. They will be fixed later.
    
    Signed-off-by: Michael Buesch <mb@bu3sch.de>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 9e8d6f8959c356d8294d45f11231331c3e1bcae6
Author: maximilian attems <max@stro.at>
Date:   Mon Jan 7 00:30:57 2008 -0800

    [IRDA]: irda_create() nuke user triggable printk
    
    easy to trigger as user with sfuzz.
    
    irda_create() is quiet on unknown sock->type,
    match this behaviour for SOCK_DGRAM unknown protocol
    
    Signed-off-by: maximilian attems <max@stro.at>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 036b579b1146f52c51398f1ab663cf659094107d
Author: Vlad Yasevich <vladislav.yasevich@hp.com>
Date:   Mon Jan 7 00:28:16 2008 -0800

    [SCTP]: Add back the code that accounted for FORWARD_TSN parameter in INIT.
    
    Some recent changes completely removed accounting for the FORWARD_TSN
    parameter length in the INIT and INIT-ACK chunk.  This is wrong and
    should be restored.
    
    Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 6df9cfc1ad45839e2a11330ab354330c6128cb73
Author: Vlad Yasevich <vladislav.yasevich@hp.com>
Date:   Mon Jan 7 00:27:45 2008 -0800

    [SCTP]: Correctly handle AUTH parameters in unexpected INIT
    
    When processing an unexpected INIT chunk, we do not need to
    do any preservation of the old AUTH parameters.  In fact,
    doing such preservations will nullify AUTH and allow connection
    stealing.
    
    Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit f691724c4d3b150bfa9cc8a969ea2020e20dfb12
Author: Vlad Yasevich <vladislav.yasevich@hp.com>
Date:   Mon Jan 7 00:27:16 2008 -0800

    [SCTP]: Fix the name of the authentication event.
    
    The even should be called SCTP_AUTHENTICATION_INDICATION.
    
    Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 52961955aa180959158faeb9fd6b4f8a591450f5
Author: Chas Williams <chas@cmf.nrl.navy.mil>
Date:   Mon Jan 7 00:26:22 2008 -0800

    [ATM]: [nicstar] delay irq setup until card is configured
    
    Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit c6a1b62de9d043f274ec3ae2e207908c6d5feff3
Author: Stephen Hemminger <shemminger@linux-foundation.org>
Date:   Mon Jan 7 00:23:04 2008 -0800

    [TULIP]: NAPI full quantum bug.
    
    This should fix the kernel warn/oops reported while routing.
    
    The tulip driver has a fencepost bug with new NAPI in 2.6.24
    It has an off by one bug if a full quantum is reached.
    
    Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit edba2a1fefc6296bc527754dee1c72a625bb675a
Author: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Date:   Sun Jan 6 00:21:47 2008 -0800

    [METH]: Fix MAC address handling.
    
    meth didn't set a valid mac address during probing, but later during
    open. Newer kernel refuse to open device with 00:00:00:00:00:00 as mac
    address -> dead ethernet. This patch sets the mac address in the probe
    function and uses only the mac address from the netdevice struct when
    setting up the hardware.
    
    Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 9a262d5c24c63d2b7bea05e41d9b3bfbef63e903
Author: Adrian Bunk <adrian.bunk@movial.fi>
Date:   Sat Jan 5 23:55:13 2008 -0800

    [NET]: Fix netx-eth.c compilation.
    
    This was missed when commit e2ac455a18806b31c2d0da0a51d8740af5010b7a
    fixed the compile errors in drivers/net/netx-eth.c caused by
    commit 09f75cd7bf13720738e6a196cc0107ce9a5bd5a0.
    
    Signed-off-by: Adrian Bunk <adrian.bunk@movial.fi>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 92ffb85dd33d62ac1dad8b44da62365f2aad413d
Author: Amos Waterland <apw@us.ibm.com>
Date:   Sat Jan 5 23:23:06 2008 -0800

    [IPV4] ipconfig: Fix regression in ip command line processing
    
    The recent changes for ip command line processing fixed some problems
    but unfortunately broke some common usage scenarios.  In current
    2.6.24-rc6 the following command line results in no IP address
    assignment, which is surely a regression:
    
     ip=10.0.2.15::10.0.2.2:255.255.255.0::eth0:off
    
    Please find below a patch that works for all cases I can find.
    
    Signed-off-by: Amos Waterland <apw@us.ibm.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit f844c74fe07321953e2dd227fe35280075f18f60
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date:   Sat Jan 5 23:14:44 2008 -0800

    [IPV4] raw: Strengthen check on validity of iph->ihl
    
    We currently check that iph->ihl is bounded by the real length and that
    the real length is greater than the minimum IP header length.  However,
    we did not check the caes where iph->ihl is less than the minimum IP
    header length.
    
    This breaks because some ip_fast_csum implementations assume that which
    is quite reasonable.
    
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit cb77df3ec88f07c6141924dfe6fd96a2f541cc09
Author: David S. Miller <davem@davemloft.net>
Date:   Sat Jan 5 00:02:59 2008 -0800

    [NIU]: Update driver version and release date.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 3ebebccf89b1b6e4fec4de05b245d6c459f27ce8
Author: David S. Miller <davem@davemloft.net>
Date:   Fri Jan 4 23:54:06 2008 -0800

    [NIU]: Fix potentially stuck TCP socket send queues.
    
    It is possible for the TX ring to have packets sit in it for unbounded
    amounts of time.
    
    The only way to defer TX interrupts in the chip is to periodically set
    "mark" bits, when processing of a TX descriptor with the mark bit set
    is complete it triggers the interrupt for the TX queue's LDG.
    
    A consequence of this kind of scheme is that if packet flow suddenly
    stops, the remaining TX packets will just sit there.
    
    If this happens, since those packets could be charged to TCP socket
    send queues, such sockets could get stuck.
    
    The simplest solution is to divorce the socket ownership of the packet
    once the device takes the SKB, by using skb_orphan() in
    niu_start_xmit().
    
    In hindsight, it would have been much nicer if the chip provided two
    interrupt sources for TX (like basically every other ethernet chip
    does).  Namely, keep the "mark" bit, but also signal the LDG when the
    TX queue becomes completely empty.  That way there is no need to have
    a deadlock breaker like this.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 792dd90f114a48c210c566f3642b26f699702cb7
Author: David S. Miller <davem@davemloft.net>
Date:   Fri Jan 4 23:52:06 2008 -0800

    [NIU]: Missing ->last_rx update.
    
    Noticed by Paul Lodridge.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 406f353c857e4b2dbddb7cd20c67941d829b8b15
Author: Matheos Worku <Matheos.Worku@Sun.COM>
Date:   Fri Jan 4 23:48:26 2008 -0800

    [NIU]: Fix slowpath interrupt handling.
    
    niu_slowpath_interrupt() expects values to be setup in lp->{v0,v1,v2}
    but they aren't.  That's only done by niu_schedule_napi() which is
    done later in the interrupt path.
    
    If niu_rx_error() returns zero, and v0 is clear, hit the
    RX_DMA_CTL_STATE register with a RX_DMA_CTL_STAT_MEX.
    
    Only emit verbose RX error logs if a fatal channel or port error is
    signalled.  Other cases will be recorded into statistics by
    niu_log_rxchan_errors().
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit cdf71a10c7b6432d9b48e292cca2c62a0b9fa6cf
Author: Thomas Gleixner <tglx@linutronix.de>
Date:   Tue Jan 8 19:47:38 2008 +0100

    futex: Prevent stale futex owner when interrupted/timeout
    
    Roland Westrelin did a great analysis of a long standing thinko in the
    return path of futex_lock_pi.
    
    While we fixed the lock steal case long ago, which was easy to trigger,
    we never had a test case which exposed this problem and stupidly never
    thought about the reverse lock stealing scenario and the return to user
    space with a stale state.
    
    When a blocked tasks returns from rt_mutex_timed_locked without holding
    the rt_mutex (due to a signal or timeout) and at the same time the task
    holding the futex is releasing the futex and assigning the ownership of
    the futex to the returning task, then it might happen that a third task
    acquires the rt_mutex before the final rt_mutex_trylock() of the
    returning task happens under the futex hash bucket lock. The returning
    task returns to user space with ETIMEOUT or EINTR, but the user space
    futex value is assigned to this task. The task which acquired the
    rt_mutex fixes the user space futex value right after the hash bucket
    lock has been released by the returning task, but for a short period of
    time the user space value is wrong.
    
    Detailed description is available at:
    
       https://bugzilla.redhat.com/show_bug.cgi?id=400541
    
    The fix for this is the same as we do when the rt_mutex was acquired by
    a higher priority task via lock stealing from the designated new owner.
    In that case we already fix the user space value and the internal
    pi_state up before we return. This mechanism can be used to fixup the
    above corner case as well. When the returning task, which failed to
    acquire the rt_mutex, notices that it is the designated owner of the
    futex, then it fixes up the stale user space value and the pi_state,
    before returning to user space. This happens with the futex hash bucket
    lock held, so the task which acquired the rt_mutex is guaranteed to be
    blocked on the hash bucket lock. We can access the rt_mutex owner, which
    gives us the pid of the new owner, safely here as the owner is not able
    to modify (release) it while waiting on the hash bucket lock.
    
    Rename the "curr" argument of fixup_pi_state_owner() to "newowner" to
    avoid confusion with current and add the check for the stale state into
    the failure path of rt_mutex_trylock() in the return path of
    unlock_futex_pi(). If the situation is detected use
    fixup_pi_state_owner() to assign everything to the owner of the
    rt_mutex.
    
    Pointed-out-and-tested-by: Roland Westrelin <roland.westrelin@sun.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit bf5e5834bffc62b50cd4a201804506eb11ef1af8
Author: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date:   Tue Jan 8 14:55:51 2008 +0000

    pl2303: Fix mode switching regression
    
    Cleaning out all the incorrect 'no change made' checks for termios
    settings showed up a problem with the PL2303. The hardware here seems to
    lose sync and bits if you tell it to make no changes. This shows up with
    a real world application.
    
    To fix this the driver check for meaningful hardware changes is restored
    but doing the tests correctly and as a tty layer function so it doesn't
    get duplicated wrongly everywhere if other drivers turn out to need it.
    
    Signed-off-by: Alan Cox <alan@redhat.com>
    Tested-by: Mirko Parthey <mirko.parthey@informatik.tu-chemnitz.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit cf0594625083111ae522496dc1c256f7476939c2
Author: Eric Sandeen <sandeen@redhat.com>
Date:   Tue Jan 8 15:33:20 2008 -0800

    hfs: handle more on-disk corruptions without oopsing
    
    hfs seems prone to bad things when it encounters on disk corruption.  Many
    values are read from disk, and used as lengths to memcpy, as an example.
    This patch fixes up several of these problematic cases.
    
    o sanity check the on-disk maximum key lengths on mount
      (these are set to a defined value at mkfs time and shouldn't differ)
    o check on-disk node keylens against the maximum key length for each tree
    o fix hfs_btree_open so that going out via free_tree: doesn't wind
      up in hfs_releasepage, which wants to follow the very pointer
      we were trying to set up:
    	HFS_SB(sb)->cat_tree = hfs_btree_open()
    		...
    		failure gets to hfs_releasepage and tries
    		to follow HFS_SB(sb)->cat_tree
    
    Tested with the fsfuzzer; it survives more than it used to.
    
    Signed-off-by: Eric Sandeen <sandeen@redhat.com>
    Cc: Roman Zippel <zippel@linux-m68k.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 467bc461d2845f6a04b124bca1ae6ecc554e1ee5
Author: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Date:   Tue Jan 8 15:33:11 2008 -0800

    Fix crash with FLAT_MEMORY and ARCH_PFN_OFFSET != 0
    
    When using FLAT_MEMORY and ARCH_PFN_OFFSET is not 0, the kernel crashes in
    memmap_init_zone().  This bug got introduced by commit
    c713216deebd95d2b0ab38fef8bb2361c0180c2d
    
    Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
    Acked-by: Mel Gorman <mel@csn.ul.ie>
    Cc: Bob Picco <bob.picco@hp.com>
    Cc: Dave Hansen <haveblue@us.ibm.com>
    Cc: Andy Whitcroft <apw@shadowen.org>
    Cc: Andi Kleen <ak@muc.de>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: "Keith Mannthey" <kmannth@gmail.com>
    Cc: "Luck, Tony" <tony.luck@intel.com>
    Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Cc: Yasunori Goto <y-goto@jp.fujitsu.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 22a860a9e22fa077300e1e72170afb82bf695617
Author: Jean Delvare <khali@linux-fr.org>
Date:   Tue Jan 8 15:33:10 2008 -0800

    snd_mixer_oss_build_input(): fix for __you_cannot_kmalloc_that_much failure with gcc-3.2
    
    Rework this functions so that gcc-3.2 can successfully perform
    constant-folding.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: Jaroslav Kysela <perex@suse.cz>
    Cc: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit ce8c628abadaf16a44953301c68b9f54cf6898cc
Author: Jean Delvare <khali@linux-fr.org>
Date:   Tue Jan 8 15:33:08 2008 -0800

    dmi-id: fix for __you_cannot_kmalloc_that_much failure
    
    gcc 3.2 has a hard time coping with the code in dmi_id_init():
    
    drivers/built-in.o(.init.text+0x789e): In function `dmi_id_init':
    : undefined reference to `__you_cannot_kmalloc_that_much'
    make: *** [.tmp_vmlinux1] Error 1
    
    Moving half of the code to a separate function seems to help.  This is a
    no-op for gcc 4.1 which will successfully inline the code anyway.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: Dave Airlie <airlied@linux.ie>
    Tested-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 83a08e7c6ed533a47631794e7f618a98094b4129
Author: Ken'ichi Ohmichi <oomichi@mxs.nes.nec.co.jp>
Date:   Tue Jan 8 15:33:05 2008 -0800

    vmcoreinfo: add the array length of "free_list" for filtering free pages
    
    This patch adds the array length of "free_area.free_list" to the vmcoreinfo
    data so that makedumpfile (dump filtering command) can exclude all free pages
    in linux-2.6.24.
    
    makedumpfile creates a small dumpfile by excluding unnecessary pages for the
    analysis. To distinguish unnecessary pages, makedumpfile gets the vmcoreinfo
    data which has the minimum debugging information only for dump filtering.
    
    In 2.6.24-rc1 or later, the free_area.free_list is an array which has one list
    for each migrate types instead of a single list. makedumpfile needs the array
    length of "free_area.free_list" and the vmcoreinfo data should contain it.
    
    Signed-off-by: Huang Ying <ying.huang@intel.com>
    Tested-by: Ken'ichi Ohmichi <oomichi@mxs.nes.nec.co.jp>
    Acked-by: Simon Horman <horms@verge.net.au>
    Cc: David Rientjes <rientjes@google.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit caeeeecfdaeada2998eb3c29c3ebd59afb79ef06
Author: Michael Halcrow <mhalcrow@us.ibm.com>
Date:   Tue Jan 8 15:33:02 2008 -0800

    eCryptfs: fix dentry handling on create error, unlink, and inode destroy
    
    This patch corrects some erroneous dentry handling in eCryptfs.
    
    If there is a problem creating the lower file, then there is nothing that
    the persistent lower file can do to really help us.  This patch makes a
    vfs_create() failure in the lower filesystem always lead to an
    unconditional do_create failure in eCryptfs.
    
    Under certain sequences of operations, the eCryptfs dentry can remain in
    the dcache after an unlink.  This patch calls d_drop() on the eCryptfs
    dentry to correct this.
    
    eCryptfs has no business calling d_delete() directly on a lower
    filesystem's dentry.  This patch removes the call to d_delete() on the
    lower persistent file's dentry in ecryptfs_destroy_inode().
    
    (Thanks to David Kleikamp, Eric Sandeen, and Jeff Moyer for helping
    identify and resolve this issue)
    
    Signed-off-by: Michael Halcrow <mhalcrow@us.ibm.com>
    Cc: Dave Kleikamp <shaggy@austin.ibm.com>
    Cc: Eric Sandeen <sandeen@redhat.com>
    Cc: Jeff Moyer <jmoyer@redhat.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit c51b1a160b63304720d49479986915e4c475a2cf
Author: Akinobu Mita <akinobu.mita@gmail.com>
Date:   Tue Jan 8 15:32:57 2008 -0800

    xip: fix get_zeroed_page with __GFP_HIGHMEM
    
    The use of get_zeroed_page() with __GFP_HIGHMEM is invalid.  Use
    alloc_page() with __GFP_ZERO instead of invalid get_zeroed_page().
    
    (This patch is only compile tested)
    
    Cc: Carsten Otte <cotte@de.ibm.com>
    Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
    Acked-by: Hugh Dickins <hugh@veritas.com>
    Acked-by: Carsten Otte <cotte@de.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 0f94e87cdeaaac9f0f9a28a5dd2a5070b87cd3e8
Author: Dan Williams <dan.j.williams@intel.com>
Date:   Tue Jan 8 15:32:53 2008 -0800

    md: fix data corruption when a degraded raid5 array is reshaped
    
    We currently do not wait for the block from the missing device to be
    computed from parity before copying data to the new stripe layout.
    
    The change in the raid6 code is not techincally needed as we don't delay
    data block recovery in the same way for raid6 yet.  But making the change
    now is safer long-term.
    
    This bug exists in 2.6.23 and 2.6.24-rc
    
    Cc: <stable@kernel.org>
    Signed-off-by: Dan Williams <dan.j.williams@intel.com>
    Acked-by: Neil Brown <neilb@suse.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 5b7741b3325d0d94c88b2ad46657a536890aaa2f
Author: Sebastian Siewior <sebastian@breakpoint.cc>
Date:   Tue Jan 8 15:32:47 2008 -0800

    KEYS: fix macro
    
    Commit 664cceb0093b755739e56572b836a99104ee8a75 changed the parameters of
    the function make_key_ref().  The macros that are used in case CONFIG_KEY
    is not defined did not change.
    
    Cc: David Howells <dhowells@redhat.com>
    Signed-off-by: Sebastian Siewior <sebastian@breakpoint.cc>
    Acked-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 9f966be8996f2829406324c68e4c67c2d64d864b
Author: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Date:   Tue Jan 8 15:32:41 2008 -0800

    fat: optimize fat_count_free_clusters()
    
    On large partition, scanning the free clusters is very slow if users
    doesn't use "usefree" option.
    
    For optimizing it, this patch uses sb_breadahead() to read of FAT
    sectors. On some user's 15GB partition, this patch improved it very
    much (1min => 600ms).
    
    The following is the result of 2GB partition on my machine.
    
    without patch:
    	root@devron (/)# time df -h > /dev/null
    
    	real    0m1.202s
    	user    0m0.000s
    	sys     0m0.440s
    
    with patch:
    	root@devron (/)# time df -h > /dev/null
    
    	real    0m0.378s
    	user    0m0.012s
    	sys     0m0.168s
    
    Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit d52df2e2ea2d881b1439bbdec7f67c27e0f47941
Author: David Brownell <dbrownell@users.sourceforge.net>
Date:   Tue Jan 8 15:32:40 2008 -0800

    spi_bitbang: always grab lock with irqs blocked
    
    Fix a glitch reported by lockdep in the spi_bitbang code: it needs to
    consistently block IRQs when holding that spinlock.
    
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit a2b484a29cc9f565b013c0e7f1e0cc22dec12456
Author: Thomas Gleixner <tglx@linutronix.de>
Date:   Wed Jan 9 00:18:28 2008 +0100

    x86: fix do_fork_idle section mismatch
    
    With CPU_HOTPLUG=n:
    
    WARNING: vmlinux.o(.text+0x104f8): Section mismatch: reference to .init.text:fork_idle (between
    'do_fork_idle' and 'lapic_timer_broadcast')
    
    do_fork_idle() needs to be __cpuinit. It can be static as well.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 165e4694dade7224f23785f9c3a89f3e9c3a9c14
Merge: d238998... ad69698...
Author: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date:   Tue Jan 8 12:29:52 2008 -0800

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
      IB/srp: Release transport before removing host
      IB/mlx4: Fix value of pkey_index in QP1 completions
      MAINTAINERS: Update Sean Hefty's email address

commit ad696989b4a2fce8494964814376aef41da3ff55
Author: Dave Dillow <dillowda@ornl.gov>
Date:   Thu Jan 3 22:35:41 2008 -0500

    IB/srp: Release transport before removing host
    
    The documented call sequence for removing a host is to call the
    transport xxx_remove_host() prior to scsi_remove_host(). The SRP
    transport used to crash when that order was followed, but as it is now
    fixed, use the documented order.
    
    Signed-off-by: David Dillow <dillowda@ornl.gov>
    Acked-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>

commit e1bb7843e4c25e6e331890a2ca512581e844bbaa
Author: Dotan Barak <dotanb@dev.mellanox.co.il>
Date:   Mon Jan 7 09:01:25 2008 +0200

    IB/mlx4: Fix value of pkey_index in QP1 completions
    
    Fix the value of pkey_index in completions to get a valid value for
    GSI QPs.  Without this fix, incoming GSI packets on port 2 get an
    invalid P_Key index in the completion, which prevents the MAD layer
    from sending back a response, which can make the second port of
    ConnectX HCAs completely useless.
    
    Signed-off-by: Dotan Barak <dotanb@dev.mellanox.co.il>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>

commit d238998fbfa49f30b02f0a5de5294ca53c58348c
Author: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date:   Tue Jan 8 11:46:37 2008 -0800

    Revert "hda_intel suspend latency: shorten codec read"
    
    This reverts commit 57a04513cb35086d54bcb2cb92e6627fc8fa0fae.
    
    Harald Dunkel reports that it broke sound for him:
      "Alsa stopped working for me.  I still can access /dev/dsp, change the
       volume and so on, but the speakers are quiet."
    
    Reverting it fixed things for him.
    
    Reported-and-tested-by: Harald Dunkel <harald.dunkel@t-online.de>
    Acked-by: Takashi Iwai <tiwai@suse.de>
    Acked-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit ed96f2470bf5d315770dc199f0250c1b8d3c2f3c
Author: Sean Hefty <sean.hefty@intel.com>
Date:   Wed Jan 2 12:00:24 2008 -0800

    MAINTAINERS: Update Sean Hefty's email address
    
    My Unix email account is being discontinued at end of Q1 '08.
    
    Signed-off-by: Sean Hefty <sean.hefty@intel.com>
    Signed-off-by: Roland Dreier <rolandd@cisco.com>

commit b59f8197c5ddd0d5d74b663650be5449dacd34aa
Author: Roland McGrath <roland@redhat.com>
Date:   Mon Jan 7 14:23:34 2008 -0800

    acct: real_parent ppid
    
    The ac_ppid field reported in process accounting records
    should match what getppid() would have returned to that
    process, regardless of whether a debugger is attached.
    
    Signed-off-by: Roland McGrath <roland@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 45626bb26a6ecd163e5eeddd14a6137052ec4495
Author: Roland McGrath <roland@redhat.com>
Date:   Mon Jan 7 14:22:44 2008 -0800

    core dump: real_parent ppid
    
    The pr_ppid field reported in core dumps should match what
    getppid() would have returned to that process, regardless of
    whether a debugger is attached.
    
    Signed-off-by: Roland McGrath <roland@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 5b3f0e6c1c9638b11a1063bf93c60a0766550b02
Author: Venki Pallipadi <venkatesh.pallipadi@intel.com>
Date:   Mon Jan 7 17:50:10 2008 -0500

    ACPI: Reintroduce run time configurable max_cstate for !CPU_IDLE case
    
    This was writeable in 2.6.23 but the cpuidle merge made it read-only.  But
    some people's scripts (ie: Mark's) were writing to it.
    
    As an unhappy compromise, make max_cstate writeable again if the kernel was
    configured without CONFIG_CPU_IDLE.
    
    http://bugzilla.kernel.org/show_bug.cgi?id=9683
    
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Cc: Mark Lord <lkml@rtr.ca>
    Cc: Arjan van de Ven <arjan@infradead.org>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Len Brown <len.brown@intel.com>

commit e4c6d3c6b14bd20fb8087acd51b29ee54a66ef77
Merge: 89a30a8... ba820c5...
Author: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date:   Mon Jan 7 13:31:03 2008 -0800

    Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
    
    * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
      [MIPS] Fix CONFIG_BOOT_RAW.
      [MIPS] Assume R4000/R4400 newer than 3.0 don't have the mfc0 count bug
      [MIPS] Fix IP32 breakage
      [MIPS] Alchemy: Fix use of __init code bug exposed by modpost warning
      [MIPS] Move inclusing of kernel/time/Kconfig menu to appropriate place

commit 89a30a8388c9592579f237bc06988808f2c454d4
Merge: 2b300d2... 89dab35...
Author: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date:   Mon Jan 7 13:29:39 2008 -0800

    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 (6916): ivtv: udelay has to be changed *after* the eeprom was read, not before
      V4L/DVB (6944a): Fix Regression VIDIOCGMBUF ioctl hangs on bttv driver

commit ba820c5c51296343be202c9afb072b7b943099cb
Author: Ralf Baechle <ralf@linux-mips.org>
Date:   Mon Jan 7 15:09:50 2008 +0000

    [MIPS] Fix CONFIG_BOOT_RAW.
    
    This was broken by 017e3a492683b32d17dcd1b13b279745cc656073 (lmo) /
    396a2ae08e5080b140330645743ab2567f6bc426 (kernel.org).
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit ce202cbb9e0b623671e8ecb3d53afdd42b8e458f
Author: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Date:   Fri Jan 4 23:38:31 2008 +0100

    [MIPS] Assume R4000/R4400 newer than 3.0 don't have the mfc0 count bug
    
    This seems as reasonable assumption and gets some SNI machines to work
    which currently must rely on the cp0 counter as clocksource.
    
    Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit c990081bf87bf5afcd6d39d8bfce9c6d60b1f2eb
Author: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Date:   Sat Jan 5 12:13:11 2008 +0100

    [MIPS] Fix IP32 breakage
    
    - suppress master aborts during config read
    - set io_map_base
    - only fixup end of iomem resource to avoid failing request_resource
      in serial driver
    - killed useless setting of crime_int bit, which caused wrong interrupts
    - use physcial address for serial port platform device and let 8250
      driver do the ioremap
    
    Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 9cfacb790f581000a7ec8455785d131aca923ded
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Tue Dec 25 21:00:45 2007 +0300

    [MIPS] Alchemy: Fix use of __init code bug exposed by modpost warning
    
    WARNING: vmlinux.o(.text+0x1ca608): Section mismatch: reference to
    .init.text: add_wired_entry (between 'config_access' and 'config_read')
    
    by refactoring the code calling add_wired_entry() from config_access() to
    a separate function which is called from aau1x_pci_setup(). While at it:
    
    - make some unnecassarily global variables 'static';
    
    - fix the letter case, whitespace, etc. in the comments...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit c4eee283e004751143fb81dbf4f8cfe7b8dcc970
Author: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Date:   Mon Nov 12 01:05:16 2007 +0900

    [MIPS] Move inclusing of kernel/time/Kconfig menu to appropriate place
    
    CONFIG_NO_HZ, CONFIG_HIGH_RES_TIMERS should be selected in "Kernel
    type" menu, not in "CPU selection" menu.
    
    Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 89dab3573aa1d95fd222ee4551f964bfa4c16823
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date:   Mon Jan 7 06:46:26 2008 -0200

    V4L/DVB (6916): ivtv: udelay has to be changed *after* the eeprom was read, not before
    
    The eeprom decides which Hauppauge model it is, so the decision whether to
    use an udelay of 5 or 10 needs to be taken after reading the eeprom, not
    before.
    
    Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit d9030f573031244dcffee026cc5e7e2f96f972ce
Author: Gregor Jasny <gjasny@web.de>
Date:   Sun Jan 6 11:15:54 2008 -0300

    V4L/DVB (6944a): Fix Regression VIDIOCGMBUF ioctl hangs on bttv driver
    
    Fix bttv VIDIOCGMBUF locking like done in commit
    820eacd84cff23b76693f4be1e28feb672f4488f.
    
    Signed-off-by: Gregor Jasny <gjasny@web.de>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

commit 844b43adba74d97f15e56b103c97bfcccaa01aa6
Author: Carmelo Amoroso <carmelo73@gmail.com>
Date:   Mon Jan 7 13:50:18 2008 +0900

    sh: Fix argument page dcache flushing regression.
    
    In the do_execve() path, argument page handling used to explicitly call
    flush_dcache_page() for each page, this has since been reworked and
    uses flush_kernel_dcache_page() instead, which is presently a nop.
    
    Doing a simple modprobe/rmmod in a loop under busybox consistently
    manages to crash without providing a sane flush_kernel_dcache_page()
    implementation, so, plug in a simple implementation.
    
    Signed-off-by: Carmelo Amoroso <carmelo73@gmail.com>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>

commit 2b300d204738a70fa62c38583905a6989b3cedcd
Merge: 3ce5445... 430cb43...
Author: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date:   Sun Jan 6 14:35:19 2008 -0800

    Merge master.kernel.org:/home/rmk/linux-2.6-arm
    
    * master.kernel.org:/home/rmk/linux-2.6-arm:
      [ARM] 4691/1: add missing i2c_board_info struct for at91rm9200
      [ARM] 4735/1: Unbreak pxa25x suspend/resume

commit 430cb436103ce1b58cb80e7c3d44f4d4a8110caa
Author: Jan Altenberg <jan.altenberg@linutronix.de>
Date:   Mon Dec 10 10:06:40 2007 +0100

    [ARM] 4691/1: add missing i2c_board_info struct for at91rm9200
    
    - Add missing i2c_board_info struct for at91rm9200
    
    Signed-off-by: Jan Altenberg <jan.altenberg@linutronix.de>
    Acked-by: Andrew Victor <avictor.za@gmail.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit 56b11288cb92104d3589930efdc7d0f50b8f4328
Author: Richard Purdie <rpurdie@rpsys.net>
Date:   Wed Jan 2 00:54:49 2008 +0100

    [ARM] 4735/1: Unbreak pxa25x suspend/resume
    
    Suspend/resume on the pxa25x was fairly obviously broken in revision
    711be5ccfe9a02ba560aa918a008c31ea4760163.
    
    This patch fixes the damage by adding back the missing code.
    
    Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
    Acked-by: Eric Miao <eric.y.miao@gmail.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit ed2fa4dd41adcac0b82dea029bfb7d856a899258
Author: Richard Purdie <rpurdie@rpsys.net>
Date:   Thu Jan 3 10:46:21 2008 -0500

    Input: pass EV_PWR events to event handlers
    
    input_handle_event() used to pass EV_PWR events to event handlers
    but no longer does so in 2.6.23. Modules to trigger power management
    events based on input power events exist but rely on the EV_PWR events
    being passed to the input event handlers.
    
    Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit 9fe4f2aadc3067e36f211f9d8a01634bbc4f7eb4
Author: Richard Purdie <rpurdie@rpsys.net>
Date:   Thu Jan 3 10:46:13 2008 -0500

    Input: spitzkbd - fix suspend key handling
    
    The spitz keyboard driver reports KEY_SUSPEND events but doesn't
    register its use of this event in the keybit bitfield, breaking
    input events for this key. This patch fixes that by registering
    the key in the keybit bitfield.
    
    Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit f5ad58675149077b2046905d54fb831873288058
Author: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Date:   Thu Jan 3 10:46:03 2008 -0500

    gameport: don't export functions that are static inline
    
    This does not make sense and moreover causes build failures
    on alpha.
    
    Signed-off-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit 97749cd9adbb2985e4b2aee1a59d6b970fe9c3a7
Author: Alexey Starikovskiy <astarikovskiy@suse.de>
Date:   Tue Jan 1 14:27:24 2008 -0500

    ACPI: Make sysfs interface in ACPI power optional.
    
    Reference: http://bugzilla.kernel.org/show_bug.cgi?id=9494
    
    Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
    Signed-off-by: Len Brown <len.brown@intel.com>

commit c04209a7948b95e8c52084e8595e74e9428653d3
Author: Alexey Starikovskiy <astarikovskiy@suse.de>
Date:   Tue Jan 1 14:12:55 2008 -0500

    ACPI: EC: Enable boot EC before bus_scan
    
    Some _STA methods called during bus_scan() might require EC region handler,
    which might be enabled later in the scan.
    Enable it explicitly before scan to avoid errors.
    
    Reference: http://bugzilla.kernel.org/show_bug.cgi?id=9627
    
    Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
    Signed-off-by: Len Brown <len.brown@intel.com>

commit 2c838197751db19d08a00e633e33dce23a69fb0c
Author: Len Brown <len.brown@intel.com>
Date:   Thu Dec 27 23:55:13 2007 -0500

    increase PNP_MAX_PORT to 40 from 24
    
    a7839e960675b549f06209d18283d5cee2ce9261
    (PNP: increase the maximum number of resources)
    increased PNP_MAX_PORT to 24 from 8.
    It also added a test and a complaint when a
    machine exceeded the limit, causing:
    
    pnpacpi: exceeded the max number of IO resources: 24
    
    http://bugzilla.kernel.org/show_bug.cgi?id=9535
    
    We should have been squawking about this all along,
    as this is a potentially serious issue.
    
    For now, simply burn some dynamic bytes and
    increase the limit by another 16 to 40.
    There is no guarantee that this will satisfy
    every system on Earth.  It probably will not,
    but it should be an improvement.
    
    In the future, PNPACPI should allocate resource
    structures as needed, rather than max-sized arrays.
    
    Signed-off-by: Len Brown <len.brown@intel.com>

commit 4c64681effcbf349cf9137b8a120badc72340dd4
Author: Kristoffer Ericson <kristoffer.ericson@gmail.com>
Date:   Fri Dec 14 01:21:14 2007 -0500

    Input: jornada680_kbd - fix default keymap
    
    This patch fixes the HP Jornada 6xx keyboard default keymap which had some
    bad keymap values. This resulted in wrong key being returned when pressed
    (for example, key 'y' returned 'r').
    
    Also, while we are at it lets arrange the include files in alphabetical order.
    
    Signed-off-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

commit 22d1c398e852e7f0ace3482e662886386ef15725
Author: Dmitry Baryshkov <dbaryshkov@gmail.com>
Date:   Fri Dec 14 01:21:03 2007 -0500

    Input: Handle EV_PWR type of input caps in input_set_capability.
    
    Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>