commit a3dd15444baa9c7522c8457ab564c41219dfb44c
Merge: 7004405... 1ada144...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Dec 15 16:31:05 2008 -0800

    Merge master.kernel.org:/home/rmk/linux-2.6-arm
    
    * master.kernel.org:/home/rmk/linux-2.6-arm:
      [ARM] 5348/1: fix documentation wrt location of the alignment trap interface
      [ARM] Ensure linux/hardirqs.h is included where required
      [ARM] fix kernel-doc syntax
      [ARM] arch/arm/common/sa1111.c: Correct error handling code
      [ARM] 5341/2: there is no copy_page on nommu ARM

commit 7004405cb85cdc10074740705963d9ce3e887f47
Merge: d2ff911... 4798a2b...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Dec 15 16:30:22 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:
      Phonet: keep TX queue disabled when the device is off
      SCHED: netem: Correct documentation comment in code.
      netfilter: update rwlock initialization for nat_table
      netlabel: Compiler warning and NULL pointer dereference fix
      e1000e: fix double release of mutex
      IA64: HP_SIMETH needs to depend upon NET
      netpoll: fix race on poll_list resulting in garbage entry
      ipv6: silence log messages for locally generated multicast
      sungem: improve ethtool output with internal pcs and serdes
      tcp: tcp_vegas cong avoid fix
      sungem: Make PCS PHY support partially work again.

commit d2ff911882b6bc693d86ca9566daac70aacbb2b3
Author: Rusty Russell <rusty@rustcorp.com.au>
Date:   Mon Dec 15 19:04:35 2008 +1030

    Define smp_call_function_many for UP
    
    Otherwise those using it in transition patches (eg. kvm) can't compile
    with CONFIG_SMP=n:
    
    arch/x86/kvm/../../../virt/kvm/kvm_main.c: In function 'make_all_cpus_request':
    arch/x86/kvm/../../../virt/kvm/kvm_main.c:380: error: implicit declaration of function 'smp_call_function_many'
    
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 307257cf475aac25db30b669987f13d90c934e3a
Author: Paul Menage <menage@google.com>
Date:   Mon Dec 15 13:54:22 2008 -0800

    cgroups: fix a race between rmdir and remount
    
    When a cgroup is removed, it's unlinked from its parent's children list,
    but not actually freed until the last dentry on it is released (at which
    point cgrp->root->number_of_cgroups is decremented).
    
    Currently rebind_subsystems checks for the top cgroup's child list being
    empty in order to rebind subsystems into or out of a hierarchy - this can
    result in the set of subsystems bound to a hierarchy being
    removed-but-not-freed cgroup.
    
    The simplest fix for this is to forbid remounts that change the set of
    subsystems on a hierarchy that has removed-but-not-freed cgroups.  This
    bug can be reproduced via:
    
    mkdir /mnt/cg
    mount -t cgroup -o ns,freezer cgroup /mnt/cg
    mkdir /mnt/cg/foo
    sleep 1h < /mnt/cg/foo &
    rmdir /mnt/cg/foo
    mount -t cgroup -o remount,ns,devices,freezer cgroup /mnt/cg
    kill $!
    
    Though the above will cause oops in -mm only but not mainline, but the bug
    can cause memory leak in mainline (and even oops)
    
    Signed-off-by: Paul Menage <menage@google.com>
    Reviewed-by: Li Zefan <lizf@cn.fujitsu.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 38aefbc585c5d86df101e7644bff2c47112783d4
Author: Frederik Deweerdt <frederik.deweerdt@xprog.eu>
Date:   Mon Dec 15 13:54:19 2008 -0800

    ACPI toshiba: only register rfkill if bt is enabled
    
    Part of the rfkill initialization was done whenever BT was on or not.  The
    following patch checks for BT presence before registering the rfkill to
    the input layer.  Some minor cleanups (> 80 char lines) were also added in
    the process.
    
    On Tue, Oct 28, 2008 at 10:10:37PM +0300, Andrey Borzenkov wrote:
    [...]
    > [   66.633036] toshiba_acpi: Toshiba Laptop ACPI Extras version 0.19
    > [   66.633054] toshiba_acpi:     HCI method: \_SB_.VALD.GHCI
    > [   66.637764] input: Toshiba RFKill Switch as /devices/virtual/input/input3
    [...]
    > [  113.920753] ------------[ cut here ]------------
    > [  113.920828] kernel BUG at /home/bor/src/linux-git/net/rfkill/rfkill.c:347!
    > [  113.920845] invalid opcode: 0000 [#1]
    > [  113.920877] last sysfs file: /sys/devices/pci0000:00/0000:00:04.0/host0/target0:0:0/0:0:0:0/block/sda/size
    > [  113.920900] Dumping ftrace buffer:
    > [  113.920919]    (ftrace buffer empty)
    > [  113.920933] Modules linked in: af_packet irnet ppp_generic slhc ircomm_tty ircomm binfmt_misc loop dm_mirror dm_region_hash dm_log dm_round_robin dm_multipath dm_mod alim15x3 ide_core nvram toshiba cryptomgr aead crypto_blkcipher michael_mic crypto_algapi orinoco_cs orinoco hermes_dld hermes pcmcia firmware_class snd_ali5451 snd_ac97_codec ac97_bus snd_seq_dummy snd_seq_oss snd_seq_midi_event snd_seq snd_seq_device smsc_ircc2 snd_pcm_oss snd_pcm rtc_cmos irda snd_timer snd_mixer_oss rtc_core snd crc_ccitt yenta_socket rtc_lib rsrc_nonstatic i2c_ali1535 pcmcia_core pcspkr psmouse soundcore i2c_core evdev sr_mod snd_page_alloc alim1535_wdt cdrom fan sg video output toshiba_acpi rfkill thermal backlight ali_agp processor ac button input_polldev battery agpgart ohci_hcd usbcore reiserfs pata_ali libata sd_mod scsi_mod [last unloaded: scsi_wait_scan]
    > [  113.921765]
    > [  113.921785] Pid: 3272, comm: ipolldevd Not tainted (2.6.28-rc2-1avb #3) PORTEGE 4000
    > [  113.921801] EIP: 0060:[<dfaa4683>] EFLAGS: 00010246 CPU: 0
    > [  113.921854] EIP is at rfkill_force_state+0x53/0x90 [rfkill]
    > [  113.921870] EAX: 00000000 EBX: 00000000 ECX: 00000003 EDX: 00000000
    > [  113.921885] ESI: 00000000 EDI: ddd50300 EBP: d8d7af40 ESP: d8d7af24
    > [  113.921900]  DS: 007b ES: 007b FS: 0000 GS: 0000 SS: 0068
    > [  113.921918] Process ipolldevd (pid: 3272, ti=d8d7a000 task=d8d93c90 task.ti=d8d7a000)
    > [  113.921933] Stack:
    > [  113.921945]  d8d7af38 00000246 dfb029d8 dfb029c0 dfb029d8 dfb029c0 ddd50300 d8d7af5c
    > [  113.922014]  dfb018e2 01000246 01000000 ddd50300 ddd50314 ddabb8a0 d8d7af68 dfb381c1
    > [  113.922098]  00000000 d8d7afa4 c012ec0a 00000000 00000002 00000000 c012eba8 ddabb8c0
    > [  113.922240] Call Trace:
    > [  113.922240]  [<dfb018e2>] ? bt_poll_rfkill+0x5c/0x82 [toshiba_acpi]
    > [  113.922240]  [<dfb381c1>] ? input_polled_device_work+0x11/0x40 [input_polldev]
    > [  113.922240]  [<c012ec0a>] ? run_workqueue+0xea/0x1f0
    > [  113.922240]  [<c012eba8>] ? run_workqueue+0x88/0x1f0
    > [  113.922240]  [<dfb381b0>] ? input_polled_device_work+0x0/0x40 [input_polldev]
    > [  113.922240]  [<c012f047>] ? worker_thread+0x87/0xf0
    > [  113.922240]  [<c0132b00>] ? autoremove_wake_function+0x0/0x50
    > [  113.922240]  [<c012efc0>] ? worker_thread+0x0/0xf0
    > [  113.922240]  [<c013280f>] ? kthread+0x3f/0x80
    > [  113.922240]  [<c01327d0>] ? kthread+0x0/0x80
    > [  113.922240]  [<c01040d7>] ? kernel_thread_helper+0x7/0x10
    > [  113.922240] Code: 43 54 89 73 54 39 c6 74 11 89 d9 ba 01 00 00 00 b8 40 68 aa df e8 3e 35 69 e0 89 f8 e8 77 fd 85 e0 31 c0 83 c4 10 5b 5e 5f 5d c3 <0f> 0b eb fe 89 f6 8d bc 27 00 00 00 00 be f4 4d aa df bb 5f 01
    > [  113.922240] EIP: [<dfaa4683>] rfkill_force_state+0x53/0x90 [rfkill] SS:ESP 0068:d8d7af24
    > [  113.924700] ---[ end trace 0e404eb40cadd5f0 ]---
    
    Signed-off-by: Frederik Deweerdt <frederik.deweerdt@gmail.com>
    Tested-by: Andrey Borzenkov <arvidjaar@mail.ru>
    Acked-by: Len Brown <len.brown@intel.com>
    Cc: Richard Purdie <rpurdie@rpsys.net>
    Acked-by: Philip Langdale <philipl@overt.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 6dc7516eba9ccbd78af0036d391b831cda5c7dc7
Author: Michael Halcrow <mhalcrow@us.ibm.com>
Date:   Mon Dec 15 13:54:17 2008 -0800

    eCryptfs: Update maintainers
    
    Tyler Hicks and Dustin Kirkland are now the primary contact points for
    eCryptfs issues that may arise from this point forward.
    
    Signed-off-by: Michael Halcrow <mhalcrow@us.ibm.com>
    Acked-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
    Acked-by: Dustin Kirkland <kirkland@canonical.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 5e18e2b8b3d453e68accc3e295643fe4b5bbc295
Author: Catalin Marinas <catalin.marinas@arm.com>
Date:   Mon Dec 15 13:54:16 2008 -0800

    slob: do not pass the SLAB flags as GFP in kmem_cache_create()
    
    The kmem_cache_create() function in the slob allocator passes the SLAB
    flags as GFP flags to the slob_alloc() function.  The patch changes this
    call to pass GFP_KERNEL as the other allocators seem to do.
    
    Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
    Acked-by: Matt Mackall <mpm@selenic.com>
    Cc: Cyrill Gorcunov <gorcunov@gmail.com>
    Cc: Christoph Lameter <cl@linux-foundation.org>
    Cc: Pekka Enberg <penberg@cs.helsinki.fi>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 35024c384ba4faaeac361a1ffee05a1475f9a9ed
Author: Mike Frysinger <vapier.adi@gmail.com>
Date:   Mon Dec 15 13:54:14 2008 -0800

    pcmcia: blackfin: fix bug - add missing ; to MODULE macro
    
    Cc: Michael Hennerich <michael.hennerich@analog.com>
    Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>
    Cc: Dominik Brodowski <linux@dominikbrodowski.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 1ada1441e73a0f51296bfae527acbeae61ff0d52
Author: Nicolas Pitre <nico@cam.org>
Date:   Mon Dec 15 03:09:15 2008 +0100

    [ARM] 5348/1: fix documentation wrt location of the alignment trap interface
    
    Signed-off-by: Nicolas Pitre <nico@marvell.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit 67306da610a3e4824192e92888634d3d8700bfc1
Author: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date:   Sun Dec 14 18:01:44 2008 +0000

    [ARM] Ensure linux/hardirqs.h is included where required
    
    ... for the removal of it from asm-generic/local.h
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit 4798a2b84ea5a98e4f36a815a646cb48ff521684
Author: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Date:   Mon Dec 15 00:53:57 2008 -0800

    Phonet: keep TX queue disabled when the device is off
    
    Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit eb9b851b980e20ba5f6bdfd6ec24f4bc77623ce6
Author: Jesper Dangaard Brouer <hawk@comx.dk>
Date:   Mon Dec 15 00:39:17 2008 -0800

    SCHED: netem: Correct documentation comment in code.
    
    The netem simulator is no longer limited by Linux timer resolution HZ.
    Not since Patrick McHardy changed the QoS system to use hrtimer.
    
    Signed-off-by: Jesper Dangaard Brouer <hawk@comx.dk>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit be70ed189bc0d16e1609a1c6c04ec9418b4dd11a
Author: Steven Rostedt <srostedt@redhat.com>
Date:   Mon Dec 15 00:19:14 2008 -0800

    netfilter: update rwlock initialization for nat_table
    
    The commit e099a173573ce1ba171092aee7bb3c72ea686e59
    (netfilter: netns nat: per-netns NAT table) renamed the
    nat_table from __nat_table to nat_table without updating the
    __RW_LOCK_UNLOCKED(__nat_table.lock).
    
    Signed-off-by: Steven Rostedt <srostedt@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit cefb3d02cad6fae49369cdde24526c4c4806b20f
Merge: ae8d04e... e5e774d...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun Dec 14 16:25:19 2008 -0800

    Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc:
      powerpc/fsl-booke: Fix problem with _tlbil_va being interrupted

commit ae8d04e2ecbb233926860e9ce145eac19c7835dc
Author: Zachary Amsden <zach@vmware.com>
Date:   Sat Dec 13 12:36:58 2008 -0800

    x86 Fix VMI crash on boot in 2.6.28-rc8
    
    VMI initialiation can relocate the fixmap, causing early_ioremap to
    malfunction if it is initialized before the relocation.  To fix this,
    VMI activation is split into two phases; the detection, which must
    happen before setting up ioremap, and the activation, which must happen
    after parsing early boot parameters.
    
    This fixes a crash on boot when VMI is enabled under VMware.
    
    Signed-off-by: Zachary Amsden <zach@vmware.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit ca7e716c7833aeaeb8fedd6d004c5f5d5e14d325
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun Dec 14 15:46:01 2008 -0800

    Revert "sched_clock: prevent scd->clock from moving backwards"
    
    This reverts commit 5b7dba4ff834259a5623e03a565748704a8fe449, which
    caused a regression in hibernate, reported by and bisected by Fabio
    Comolli.
    
    This revert fixes
    
     http://bugzilla.kernel.org/show_bug.cgi?id=12155
     http://bugzilla.kernel.org/show_bug.cgi?id=12149
    
    Bisected-by: Fabio Comolli <fabio.comolli@gmail.com>
    Requested-by: Rafael J. Wysocki <rjw@sisk.pl>
    Acked-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 3909845e26439148a484d1ac30bb65e5e0ff63ec
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date:   Mon Dec 1 14:15:37 2008 -0800

    [ARM] fix kernel-doc syntax
    
    Fix kernel-doc notation to use correct syntax.  Even though this should be
    moved to where the function is actually implemented...
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit 442a902262e1dfc3f1298ceea5f3120fe2043904
Author: Julia Lawall <julia@diku.dk>
Date:   Sat Dec 13 16:37:59 2008 +0100

    [ARM] arch/arm/common/sa1111.c: Correct error handling code
    
    If it is reasonable to apply PTR_ERR to the result of calling clk_get, then
    that result should first be tested with IS_ERR, not with !.
    
    The semantic patch that makes this change is as follows:
    (http://www.emn.fr/x-info/coccinelle/)
    
    // <smpl>
    @@
    expression E,E1;
    @@
    
    if (
    -   E == NULL
    +   IS_ERR(E)
       ) { <+... when != E = E1
            PTR_ERR(E)
           ...+> }
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit e5e774d8833de1a0037be2384efccadf16935675
Author: Kumar Gala <galak@kernel.crashing.org>
Date:   Sat Dec 13 17:01:37 2008 -0600

    powerpc/fsl-booke: Fix problem with _tlbil_va being interrupted
    
    An example calling sequence which we did see:
    
    copy_user_highpage -> kmap_atomic -> flush_tlb_page -> _tlbil_va
    
    We got interrupted after setting up the MAS registers before the
    tlbwe and the interrupt handler that caused the interrupt also did
    a kmap_atomic (ide code) and thus on returning from the interrupt
    the MAS registers no longer contained the proper values.
    
    Since we dont save/restore MAS registers for normal interrupts we
    need to disable interrupts in _tlbil_va to ensure atomicity.
    
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

commit 5279585ff2bedc8180da5bdf8aa3ff1736466de2
Merge: 68b32d4... 9f3eefc...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sat Dec 13 11:32:24 2008 -0800

    Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx:
      powerpc/40x: Add proper BOOTCFLAGS for cuboot-acadia

commit 68b32d4499fd910b85b263c3afe92687d18abc3f
Merge: 8d9c02e... 2b895c3...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sat Dec 13 11:32:04 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-highlander: Trivial endian casting fixes
      i2c-pmcmsp: Fix endianness misannotation

commit 8d9c02ec76f228a8fed745725ad92d7bb3167859
Merge: fae1aa4... febd7a5...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sat Dec 13 11:28:13 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:
      Commands needing to be retried require a complete re-initialization.

commit fae1aa4a0bcfdd35735a38949650216aee964474
Merge: 1c55f18... 6d8a52d...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sat Dec 13 11:26:34 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: IP32: Update defconfig
      MIPS: Add missing calls to plat_unmap_dma_mem.
      MIPS: Kconfig: Fix the arch-specific header path
      MIPS: Use EI/DI for MIPS R2.

commit 1c55f18717304100a5f624c923f7cb6511b4116d
Author: Ingo Brueckl <ib@wupperonline.de>
Date:   Wed Dec 10 23:35:00 2008 +0100

    console ASCII glyph 1:1 mapping
    
    For the console, there is a 1:1 mapping of glyphs which cannot be found
    in the current font.  This seems to be meant as a kind of 'emergency
    fallback' for fonts without unicode mapping which otherwise would
    display nothing readable on the screen.
    
    At the moment it affects all chars for which no substitution character
    is defined.  In particular this means that for all chars (>= 128) where
    there is no iso88591-1/unicode character (e.g.  control character area)
    you'll get the very strange 1:1 mapping of the (cp437) graphics card
    glyphs.
    
    I'm pretty sure that the 1:1 mapping should only affect strict ASCII
    code characters, i.e.  chars < 128.
    
    The patch limits the mapping as it probably was meant anyway.
    
    Signed-off-by: Ingo Brueckl <ib@wupperonline.de>
    Acked-by: H. Peter Anvin <hpa@zytor.com>
    Cc: Egmont Koblinger <egmont@uhulinux.hu>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit f75bc06e5d00a827d3ec5d57bbb5b73a4adec855
Author: Ingo Brueckl <ib@wupperonline.de>
Date:   Wed Dec 10 23:34:00 2008 +0100

    unicode table for cp437
    
    There is a major bug in the cp437 to unicode translation table.  Char
    0x7c is mapped to U+00a5 which is the Yen sign and wrong.  The right
    mapping is U+00a6 (broken bar).
    
    Furthermore, a mapping for U+00b4 (a widely used character) is missing
    even though easily possible.
    
    The patch fixes these, as well as it provides a few other useful
    mappings.
    
    The changes are as follows:
    
      0x0f (enhancement) enables a sort of currency symbol
      0x27 (bug) enables a sort of acute accent which is a widely used character
      0x44 (enhancement) enables a sort of icelandic capital letter eth
      0x7c (major bug) corrects mapping
      0xeb (enhancement) enables a sort of icelandic small letter eth
      0xee (enhancement) enables a sort of math 'element of'
    
    Signed-off-by: Ingo Brueckl <ib@wupperonline.de>
    Acked-by: H. Peter Anvin <hpa@zytor.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 6d8a52d7f09babf6cff1df32fe0b8ea47cf753f3
Author: David Daney <ddaney@caviumnetworks.com>
Date:   Wed Dec 10 15:27:13 2008 -0800

    MIPS: IP32: Update defconfig
    
    Signed-off-by: David Daney <ddaney@caviumnetworks.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 11531ac2d3f24c3dc4df3861d72d1e8b9b8b6317
Author: David Daney <ddaney@caviumnetworks.com>
Date:   Wed Dec 10 18:14:45 2008 -0800

    MIPS: Add missing calls to plat_unmap_dma_mem.
    
    dma_free_noncoherent() and dma_free_coherent() are missing calls to
    plat_unmap_dma_mem().  This patch adds them.
    
    Signed-off-by: David Daney <ddaney@caviumnetworks.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 00ace207164cb414efba406830256721f45c1c62
Author: Dmitri Vorobiev <dmitri.vorobiev@movial.fi>
Date:   Wed Dec 10 22:38:36 2008 +0200

    MIPS: Kconfig: Fix the arch-specific header path
    
    The header path in the help text for the RUNTIME_DEBUG config option is
    obsolete and needs to be updated to match the new location of
    architecture-specific header files. While at it, fix the spelling mistake.
    
    Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev@movial.fi>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit b6354db5bbbc538bf009cae6c019810b4a3ef21d
Author: David Daney <ddaney@caviumnetworks.com>
Date:   Wed Dec 10 08:37:25 2008 -0800

    MIPS: Use EI/DI for MIPS R2.
    
    For MIPS R2, use the EI and DI instructions to enable and disable
    interrupts.
    
    Signed-off-by: Tomaso Paoletti <tpaoletti@caviumnetworks.com>
    Signed-off-by: David Daney <ddaney@caviumnetworks.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit febd7a5c131433ea128b54dd5712e260c79eb3ab
Author: Alan D. Brunelle <Alan.Brunelle@hp.com>
Date:   Tue Dec 9 15:52:15 2008 +0100

    Commands needing to be retried require a complete re-initialization.
    
    The test-unit-ready portion of this patch was causing boots to fail on
    my test machine (as in http://lkml.org/lkml/2008/12/5/161). With this
    patch in place, the system is booting reliably.
    
    Mike Anderson found the same problem in the hp_hw_start_stop code,
    and I applied the same solution in cdrom_read_cdda_bpc.
    
    Signed-off-by: Alan D. Brunelle <alan.brunelle@hp.com>
    Cc: Mike Anderson <andmike@linux.vnet.ibm.com>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit ec8f2375d7584969501918651241f91eca2a6ad3
Author: Paul Moore <paul.moore@hp.com>
Date:   Thu Dec 11 21:31:50 2008 -0800

    netlabel: Compiler warning and NULL pointer dereference fix
    
    Fix the two compiler warnings show below.  Thanks to Geert Uytterhoeven for
    finding and reporting the problem.
    
     net/netlabel/netlabel_unlabeled.c:567: warning: 'entry' may be used
       uninitialized in this function
     net/netlabel/netlabel_unlabeled.c:629: warning: 'entry' may be used
       uninitialized in this function
    
    Signed-off-by: Paul Moore <paul.moore@hp.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 30bb0e0dce78427f3e5cb728d6b5ea73acbefffa
Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date:   Thu Dec 11 21:28:11 2008 -0800

    e1000e: fix double release of mutex
    
    During a reset, releasing the swflag after it failed to be acquired would
    cause a double unlock of the mutex.  Instead, test whether acquisition of
    the swflag was successful and if not, do not release the swflag.  The reset
    must still be done to bring the device to a quiescent state.
    
    This resolves [BUG 12200] BUG: bad unlock balance detected! e1000e
    http://bugzilla.kernel.org/show_bug.cgi?id=12200
    
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 9f3eefc4f9b02404e89d624a6cd40e7b468b5fd5
Author: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Date:   Tue Nov 25 06:33:35 2008 +0000

    powerpc/40x: Add proper BOOTCFLAGS for cuboot-acadia
    
    The cuboot-acadia.c wrapper can cause assembler errors on some
    toolchains due to the lack of the proper BOOTCFLAGS.  This adds
    the proper flags for the file.
    
    Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>

commit 2b895c3f35d3ead0e9409b59da94094c7873f96d
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Thu Dec 11 12:11:21 2008 +0100

    i2c-highlander: Trivial endian casting fixes
    
    Fixes sparse warnings:
    drivers/i2c/busses/i2c-highlander.c:95:26: warning: incorrect type in argument 1 (different base types)
    drivers/i2c/busses/i2c-highlander.c:95:26:    expected restricted __be16 const [usertype] *p
    drivers/i2c/busses/i2c-highlander.c:95:26:    got unsigned short [usertype] *<noident>
    drivers/i2c/busses/i2c-highlander.c:106:15: warning: incorrect type in assignment (different base types)
    drivers/i2c/busses/i2c-highlander.c:106:15:    expected unsigned short [unsigned] [short] [usertype] <noident>
    drivers/i2c/busses/i2c-highlander.c:106:15:    got restricted __be16
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Cc: Ben Dooks <ben-linux@fluff.org>
    Acked-by: Paul Mundt <lethal@linux-sh.org>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>

commit d9d38ca07d5187b3082074934e73f014f5d31409
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Thu Dec 11 12:11:20 2008 +0100

    i2c-pmcmsp: Fix endianness misannotation
    
    tmp is used as host-endian and is loaded from a be64, fix the cast and the
    endian accessor used.
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Cc: Ben Dooks <ben-linux@fluff.org>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>

commit 674a0a6939a954ab92fdd9833943e2277550bb0a
Author: Nicolas Pitre <nico@cam.org>
Date:   Tue Dec 9 03:13:39 2008 +0100

    [ARM] 5341/2: there is no copy_page on nommu ARM
    
    ... as it is defined with memcpy, therefore no copy_page symbol to
    export.
    
    Signed-off-by: Nicolas Pitre <nico@cam.org>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit 6c34bc2976b30dc8b56392c020e25bae1f363cab
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Dec 10 09:26:17 2008 -0800

    Revert "radeonfb: accelerate imageblit and other improvements"
    
    This reverts commit b1ee26bab14886350ba12a5c10cbc0696ac679bf, along with
    the "fixes" for it that all just caused problems:
    
     - c4c6fa9891f3d1bcaae4f39fb751d5302965b566 "radeonfb: fix problem with
       color expansion & alignment"
    
     - f3179748a157c21d44d929fd3779421ebfbeaa93 "radeonfb: Disable new color
       expand acceleration unless explicitely enabled"
    
    because even when disabled, it breaks for people. See
    
    	http://bugzilla.kernel.org/show_bug.cgi?id=12191
    
    for the latest example.
    
    Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Acked-by: David S. Miller <davem@davemloft.net>
    Cc: Krzysztof Halasa <khc@pm.waw.pl>
    Cc: James Cloos <cloos@jhcloos.com>
    Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
    Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
    Cc: Jean-Luc Coulon <jean.luc.coulon@gmail.com>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit bb49eed4221092fde4e2337534ae51d8f28a2fbe
Author: Alexander Beregalov <a.beregalov@gmail.com>
Date:   Wed Dec 10 15:24:50 2008 -0800

    IA64: HP_SIMETH needs to depend upon NET
    
    From: Alexander Beregalov <a.beregalov@gmail.com>
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 7b363e440021a1cf9ed76944b2685f48dacefb3e
Author: Neil Horman <nhorman@tuxdriver.com>
Date:   Tue Dec 9 23:22:26 2008 -0800

    netpoll: fix race on poll_list resulting in garbage entry
    
    	A few months back a race was discused between the netpoll napi service
    path, and the fast path through net_rx_action:
    http://kerneltrap.org/mailarchive/linux-netdev/2007/10/16/345470
    
    A patch was submitted for that bug, but I think we missed a case.
    
    Consider the following scenario:
    
    INITIAL STATE
    CPU0 has one napi_struct A on its poll_list
    CPU1 is calling netpoll_send_skb and needs to call poll_napi on the same
    napi_struct A that CPU0 has on its list
    
    
    
    CPU0						CPU1
    net_rx_action					poll_napi
    !list_empty (returns true)			locks poll_lock for A
    						 poll_one_napi
    						  napi->poll
    						   netif_rx_complete
    						    __napi_complete
    						    (removes A from poll_list)
    list_entry(list->next)
    
    
    In the above scenario, net_rx_action assumes that the per-cpu poll_list is
    exclusive to that cpu.  netpoll of course violates that, and because the netpoll
    path can dequeue from the poll list, its possible for CPU0 to detect a non-empty
    list at the top of the while loop in net_rx_action, but have it become empty by
    the time it calls list_entry.  Since the poll_list isn't surrounded by any other
    structure, the returned data from that list_entry call in this situation is
    garbage, and any number of crashes can result based on what exactly that garbage
    is.
    
    Given that its not fasible for performance reasons to place exclusive locks
    arround each cpus poll list to provide that mutal exclusion, I think the best
    solution is modify the netpoll path in such a way that we continue to guarantee
    that the poll_list for a cpu is in fact exclusive to that cpu.  To do this I've
    implemented the patch below.  It adds an additional bit to the state field in
    the napi_struct.  When executing napi->poll from the netpoll_path, this bit will
    be set. When a driver calls netif_rx_complete, if that bit is set, it will not
    remove the napi_struct from the poll_list.  That work will be saved for the next
    iteration of net_rx_action.
    
    I've tested this and it seems to work well.  About the biggest drawback I can
    see to it is the fact that it might result in an extra loop through
    net_rx_action in the event that the device is actually contended for (i.e. the
    netpoll path actually preforms all the needed work no the device, and the call
    to net_rx_action winds up doing nothing, except removing the napi_struct from
    the poll_list.  However I think this is probably a small price to pay, given
    that the alternative is a crash.
    
    Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 24fc7b86dc0470616803be2f921c8cd5c459175d
Author: Jan Sembera <jsembera@suse.cz>
Date:   Tue Dec 9 15:48:32 2008 -0800

    ipv6: silence log messages for locally generated multicast
    
    This patch fixes minor annoyance during transmission of unsolicited
    neighbor advertisements from userspace to multicast addresses (as
    far as I can see in RFC, this is allowed and the similar functionality
    for IPv4 has been in arping for a long time).
    
    Outgoing multicast packets get reinserted into local processing as if they
    are received from the network. The machine thus sees its own NA and fills
    the logs with error messages. This patch removes the message if NA has been
    generated locally.
    
    Signed-off-by: Jan Sembera <jsembera@suse.cz>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit fbf0229e946deb9e6c711f9eaa5c8d670c3a28fd
Author: Hermann Lauer <Hermann.Lauer@iwr.uni-heidelberg.de>
Date:   Tue Dec 9 15:39:14 2008 -0800

    sungem: improve ethtool output with internal pcs and serdes
    
    From: Hermann Lauer <Hermann.Lauer@iwr.uni-heidelberg.de>
    
    Attached is a patch which improves the output of ethtool (see below)
    to some sensefull values with a sungem fibre card which uses the
    sungem interal pcs connected to a serdes chip. The seriallink case in
    the driver is untouched.
    
    Most values are hardcoded, because gigabit fibre autoneg is anyways
    limited and the driver don't really support much at the moment with
    that hardware.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 8d3a564da34e5844aca4f991b73f8ca512246b23
Author: Doug Leith <doug.leith@nuim.ie>
Date:   Tue Dec 9 00:13:04 2008 -0800

    tcp: tcp_vegas cong avoid fix
    
    This patch addresses a book-keeping issue in tcp_vegas.c.  At present
    tcp_vegas does separate book-keeping of cwnd based on packet sequence
    numbers.  A mismatch can develop between this book-keeping and
    tp->snd_cwnd due, for example, to delayed acks acking multiple
    packets.  When vegas transitions to reno operation (e.g. following
    loss), then this mismatch leads to incorrect behaviour (akin to a cwnd
    backoff).  This seems mostly to affect operation at low cwnds where
    delayed acking can lead to a significant fraction of cwnd being
    covered by a single ack, leading to the book-keeping mismatch.  This
    patch modifies the congestion avoidance update to avoid the need for
    separate book-keeping while leaving vegas congestion avoidance
    functionally unchanged.  A secondary advantage of this modification is
    that the use of fixed-point (via V_PARAM_SHIFT) and 64 bit arithmetic
    is no longer necessary, simplifying the code.
    
    Some example test measurements with the patched code (confirming no functional
    change in the congestion avoidance algorithm) can be seen at:
    
    http://www.hamilton.ie/doug/vegaspatch/
    
    Signed-off-by: Doug Leith <doug.leith@nuim.ie>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 8c83f80b2d335176f72d8729fe1dfe19c5812cb1
Author: David S. Miller <davem@davemloft.net>
Date:   Tue Dec 9 00:10:11 2008 -0800

    sungem: Make PCS PHY support partially work again.
    
    As reported by Hermann Lauer, PCS PHY support in the sungem
    driver simply doesn't work.
    
    When the chip is reset due to open, or some other similar operation,
    the PCS is reset too but we don't program it back into a running
    state.  The result is no link when the device is brought up.
    
    This partially rectifies the situation for the moment, by kicking
    the PCS after a sungem chip reset so that it will renegotiate and
    be re-enabled again.
    
    The behavior is still a little bit dodgy as the added renegotiate
    make the link take some time after bringing the interface up,
    but this is a significant improvement in that things actually work
    now :-)
    
    Based almost entirely upon an initial patch by Hermann.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>