commit 67963132638e67ad3c5aa16765e6f3f2f3cdd85c 
tree 799409dacd6f604d6500bac693da5cb3fafb71cb 
parent cbf0ec6ee001ab89471397ac84105b2e3b2fd986 
author Maneesh Soni <maneesh@in.ibm.com> Tue, 14 Mar 2006 15:03:14 +0530 
committer Linus Torvalds <torvalds@g5.osdl.org> Tue, 14 Mar 2006 08:26:44 -0800 

    [PATCH] Plug kdump shutdown race window
    
    lapic_shutdown() re-enables interrupts which is un-desirable for panic
    case, so use local_irq_save() and local_irq_restore() to keep the irqs
    disabled for kexec on panic case, and close a possible race window while
    kdump shutdown as shown in this stack trace
    
    -- BUG: spinlock lockup on CPU#1, bash/4396, c52781a0
    [<c01c1870>] _raw_spin_lock+0xb7/0xd2
    [<c029e148>] _spin_lock+0x6/0x8
    [<c011b33f>] scheduler_tick+0xe7/0x328
    [<c0128a7c>] update_process_times+0x51/0x5d
    [<c0114592>] smp_apic_timer_interrupt+0x4f/0x58
    [<c01141ff>] lapic_shutdown+0x76/0x7e
    [<c0104d7c>] apic_timer_interrupt+0x1c/0x30
    [<c01141ff>] lapic_shutdown+0x76/0x7e
    [<c0116659>] machine_crash_shutdown+0x83/0xaa
    [<c013cc36>] crash_kexec+0xc1/0xe3
    [<c029e148>] _spin_lock+0x6/0x8
    [<c013cc22>] crash_kexec+0xad/0xe3
    [<c0215280>] __handle_sysrq+0x84/0xfd
    [<c018d937>] write_sysrq_trigger+0x2c/0x35
    [<c015e47b>] vfs_write+0xa2/0x13b
    [<c015ea73>] sys_write+0x3b/0x64
    [<c0103c69>] syscall_call+0x7/0xb
    
    Signed-off-by: Maneesh Soni <maneesh@in.ibm.com>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit cbf0ec6ee001ab89471397ac84105b2e3b2fd986 
tree c5962763cc47cc36b4c1ff1c4c56b96b256a4657 
parent ceb2ca9cb0bfd885127fa9a2c27127b3fe1c8f28 
author Linus Torvalds <torvalds@g5.osdl.org> Tue, 14 Mar 2006 08:01:47 -0800 
committer Linus Torvalds <torvalds@g5.osdl.org> Tue, 14 Mar 2006 08:01:47 -0800 

    Revert "[PATCH] x86-64: Fix up handling of non canonical user RIPs"
    
    This reverts commit c33d4568aca9028a22857f94f5e0850012b6444b.
    
    Andrew Clayton and Hugh Dickins report that it's broken for them and
    causes strange page table and slab corruption, and spontaneous reboots.
    
    Let's get it right next time.
    
    Cc: Andrew Clayton <andrew@rootshell.co.uk>
    Cc: Hugh Dickins <hugh@veritas.com>
    Cc: Andi Kleen <ak@suse.de>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit ceb2ca9cb0bfd885127fa9a2c27127b3fe1c8f28 
tree 3538a1d7f63c2ce8549958c95683e1e2922db7e3 
parent 30f4e20a0d3492668f5065af582b5af2d1e4256b 
author Dave Peterson <dsp@llnl.gov> Mon, 13 Mar 2006 21:20:50 -0800 
committer Linus Torvalds <torvalds@g5.osdl.org> Tue, 14 Mar 2006 07:57:18 -0800 

    [PATCH] EDAC: disable sysfs interface
    
    - Disable the EDAC sysfs code.  The sysfs interface that EDAC presents to
    user space needs more thought, and is likely to change substantially.
    Therefore disable it for now so users don't start depending on it in its
    current form.
    
    - Disable the default behavior of calling panic() when an uncorrectible
    error is detected (since for now, there is no sysfs interface that allows
    the user to configure this behavior).
    
    Signed-off-by: David S. Peterson <dsp@llnl.gov>
    Cc: Greg KH <greg@kroah.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 30f4e20a0d3492668f5065af582b5af2d1e4256b 
tree 518b47635c091814b35caf128f7be361c595aab1 
parent e6d83d55698b73b4d5d55d3d7715a4c26030d577 
author Trond Myklebust <Trond.Myklebust@netapp.com> Mon, 13 Mar 2006 21:20:49 -0800 
committer Linus Torvalds <torvalds@g5.osdl.org> Tue, 14 Mar 2006 07:57:18 -0800 

    [PATCH] NLM: Ensure we do not Oops in the case of an unlock
    
    In theory, NLM specs assure us that the server will only reply LCK_GRANTED or
    LCK_DENIED_GRACE_PERIOD to our NLM_UNLOCK request.
    
    In practice, we should not assume this to be the case, and the code will
    currently Oops if we do.
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit e6d83d55698b73b4d5d55d3d7715a4c26030d577 
tree b2c0e3a799444d9c25c00cf34975b456e0c9ef9d 
parent c12e87f4652b1ba3be168b4f63a440399b941928 
author Trond Myklebust <Trond.Myklebust@netapp.com> Mon, 13 Mar 2006 21:20:48 -0800 
committer Linus Torvalds <torvalds@g5.osdl.org> Tue, 14 Mar 2006 07:57:18 -0800 

    [PATCH] SUNRPC: Fix potential deadlock in RPC code
    
    In rpc_wake_up() and rpc_wake_up_status(), it is possible for the call to
    __rpc_wake_up_task() to fail if another thread happens to be calling
    rpc_wake_up_task() on the same rpc_task.
    
    Problem noticed by Bruno Faccini.
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit c12e87f4652b1ba3be168b4f63a440399b941928 
tree aa8c0ca6a6ea60042975d1ec9437620269df0182 
parent 712917d1c002f820b177683f4fd491289bde3c32 
author Trond Myklebust <Trond.Myklebust@netapp.com> Mon, 13 Mar 2006 21:20:47 -0800 
committer Linus Torvalds <torvalds@g5.osdl.org> Tue, 14 Mar 2006 07:57:18 -0800 

    [PATCH] NFSv4: fix mount segfault on errors returned that are < -1000
    
    It turns out that nfs4_proc_get_root() may return raw NFSv4 errors instead of
    mapping them to kernel errors.  Problem spotted by Neil Horman
    <nhorman@tuxdriver.com>
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 712917d1c002f820b177683f4fd491289bde3c32 
tree 059c7a9871803d8d5b4673d92bf21a9ae7738c8b 
parent 143f412eb4c7cc48b9eb4381f9133b7d36c68075 
author Adrian Bunk <bunk@stusta.de> Mon, 13 Mar 2006 21:20:47 -0800 
committer Linus Torvalds <torvalds@g5.osdl.org> Tue, 14 Mar 2006 07:57:17 -0800 

    [PATCH] SUNRPC: fix a NULL pointer dereference in net/sunrpc/clnt.c
    
    The Coverity checker spotted this possible NULL pointer dereference in
    rpc_new_client().
    
    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 143f412eb4c7cc48b9eb4381f9133b7d36c68075 
tree 383c140bf7879c77781d4aa113e517a92f16991d 
parent f9a3879abf2f1a27c39915e6074b8ff15a24cb55 
author Trond Myklebust <Trond.Myklebust@netapp.com> Mon, 13 Mar 2006 21:20:46 -0800 
committer Linus Torvalds <torvalds@g5.osdl.org> Tue, 14 Mar 2006 07:57:17 -0800 

    [PATCH] NFS: Fix a potential panic in O_DIRECT
    
    Based on an original patch by Mike O'Connor and Greg Banks of SGI.
    
    Mike states:
    
    A normal user can panic an NFS client and cause a local DoS with
    'judicious'(?) use of O_DIRECT.  Any O_DIRECT write to an NFS file where the
    user buffer starts with a valid mapped page and contains an unmapped page,
    will crash in this way.  I haven't followed the code, but O_DIRECT reads with
    similar user buffers will probably also crash albeit in different ways.
    
    Details: when nfs_get_user_pages() calls get_user_pages(), it detects and
    correctly handles get_user_pages() returning an error, which happens if the
    first page covered by the user buffer's address range is unmapped.  However,
    if the first page is mapped but some subsequent page isn't, get_user_pages()
    will return a positive number which is less than the number of pages requested
    (this behaviour is sort of analagous to a short write() call and appears to be
    intentional).  nfs_get_user_pages() doesn't detect this and hands off the
    array of pages (whose last few elements are random rubbish from the newly
    allocated array memory) to it's caller, whence they go to
    nfs_direct_write_seg(), which then totally ignores the nr_pages it's given,
    and calculates its own idea of how many pages are in the array from the user
    buffer length.  Needless to say, when it comes to transmit those uninitialised
    page* pointers, we see a crash in the network stack.
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit f9a3879abf2f1a27c39915e6074b8ff15a24cb55 
tree 67a133c1957e992ee10f8d33e312616f494d7b07 
parent 63e1fd41c7127650d355e7db7dd92890edf5523b 
author GOTO Masanori <gotom@sanori.org> Mon, 13 Mar 2006 21:20:44 -0800 
committer Linus Torvalds <torvalds@g5.osdl.org> Tue, 14 Mar 2006 07:57:17 -0800 

    [PATCH] Fix sigaltstack corruption among cloned threads
    
    This patch fixes alternate signal stack corruption among cloned threads
    with CLONE_SIGHAND (and CLONE_VM) for linux-2.6.16-rc6.
    
    The value of alternate signal stack is currently inherited after a call of
    clone(...  CLONE_SIGHAND | CLONE_VM).  But if sigaltstack is set by a
    parent thread, and then if multiple cloned child threads (+ parent threads)
    call signal handler at the same time, some threads may be conflicted -
    because they share to use the same alternative signal stack region.
    Finally they get sigsegv.  It's an undesirable race condition.  Note that
    child threads created from NPTL pthread_create() also hit this conflict
    when the parent thread uses sigaltstack, without my patch.
    
    To fix this problem, this patch clears the child threads' sigaltstack
    information like exec().  This behavior follows the SUSv3 specification.
    In SUSv3, pthread_create() says "The alternate stack shall not be inherited
    (when new threads are initialized)".  It means that sigaltstack should be
    cleared when sigaltstack memory space is shared by cloned threads with
    CLONE_SIGHAND.
    
    Note that I chose "if (clone_flags & CLONE_SIGHAND)" line because:
    - If clone_flags line is not existed, fork() does not inherit sigaltstack.
    - CLONE_VM is another choice, but vfork() does not inherit sigaltstack.
    - CLONE_SIGHAND implies CLONE_VM, and it looks suitable.
    - CLONE_THREAD is another candidate, and includes CLONE_SIGHAND + CLONE_VM,
    but this flag has a bit different semantics.
    I decided to use CLONE_SIGHAND.
    
    [ Changed to test for CLONE_VM && !CLONE_VFORK after discussion --Linus ]
    
    Signed-off-by: GOTO Masanori <gotom@sanori.org>
    Cc: Roland McGrath <roland@redhat.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    Acked-by: Linus Torvalds <torvalds@osdl.org>
    Cc: Ulrich Drepper <drepper@redhat.com>
    Cc: Jakub Jelinek <jakub@redhat.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 63e1fd41c7127650d355e7db7dd92890edf5523b 
tree 7830390fb26a1b2e69b4e98eddc5f73683decd1d 
parent 6acaba8e22bb355409e06d9e7ce4e7bef1bcaa04 
author Benjamin Herrenschmidt <benh@kernel.crashing.org> Mon, 13 Mar 2006 21:20:42 -0800 
committer Linus Torvalds <torvalds@g5.osdl.org> Tue, 14 Mar 2006 07:57:17 -0800 

    [PATCH] macintosh: correct AC Power info in /proc/pmu/info
    
    Report AC Power present in /proc/pmu/info if there is no battery.
    
    Signed-off-by: Olaf Hering <olh@suse.de>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
    Cc: Paul Mackerras <paulus@samba.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 6acaba8e22bb355409e06d9e7ce4e7bef1bcaa04 
tree c5c4aaafb6bf8fe51f0dd060dc9ce5fd7c779892 
parent 3cb4f09fc2e98bbf26f8c900a94bf3910cd4d823 
author Michael Hunold <hunold@linuxtv.org> Mon, 13 Mar 2006 21:20:41 -0800 
committer Linus Torvalds <torvalds@g5.osdl.org> Tue, 14 Mar 2006 07:57:17 -0800 

    [PATCH] Restore tuning capabilities in V4L2 MXB driver
    
    The behaviour of the all-in-one Video4Linux tuner driver apparently
    changed.  It now wants to know the tv standard, otherwise it refuses to
    tune.
    
    Restore tuning functionality in my driver for the "Multimedia eXtension
    Board".  The all-in-one tuner driver apparently changed its behaviour.
    
    Signed-off-by: Michael Hunold <hunold@linuxtv.org>
    Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
    Cc: Johannes Stezenbach <js@linuxtv.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 3cb4f09fc2e98bbf26f8c900a94bf3910cd4d823 
tree 3b0c652fedc40b673bf533f452dee83169655073 
parent 3759fa9c55923f719ae944a3f8fbb029b36f759d 
author David Brownell <david-b@pacbell.net> Mon, 13 Mar 2006 21:20:40 -0800 
committer Linus Torvalds <torvalds@g5.osdl.org> Tue, 14 Mar 2006 07:57:17 -0800 

    [PATCH] mtd_dataflash, fix block vs page erase
    
    Fix a bug in the block-erase optimization for Dataflash; it was using block
    erase even for smaller segments that need page erase.
    
    That wouldn't matter for JFFS2, which never erases less than one block
    (sometimes several blocks), but for other callers it might.
    
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Acked-by: David Woodhouse <dwmw2@infradead.org>
    Acked-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 3759fa9c55923f719ae944a3f8fbb029b36f759d 
tree ca48147798cd6a02edf64290dcf14c7681ab88cc 
parent c33d4568aca9028a22857f94f5e0850012b6444b 
author Herbert Xu <herbert@gondor.apana.org.au> Mon, 13 Mar 2006 14:26:12 -0800 
committer David S. Miller <davem@davemloft.net> Mon, 13 Mar 2006 14:26:12 -0800 

    [TCP]: Fix zero port problem in IPv6
    
    When we link a socket into the hash table, we need to make sure that we
    set the num/port fields so that it shows us with a non-zero port value
    in proc/netlink and on the wire.  This code and comment is copied over
    from the IPv4 stack as is.
    
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

commit c33d4568aca9028a22857f94f5e0850012b6444b 
tree 7a33d918e4d35b0444820595cb2aaaae1f1f5bfa 
parent 31fe4d331729e9687db84521c3ceb8e43390efcf 
author Andi Kleen <ak@suse.de> Sun, 12 Mar 2006 23:52:59 +0100 
committer Linus Torvalds <torvalds@g5.osdl.org> Sun, 12 Mar 2006 22:56:29 -0800 

    [PATCH] x86-64: Fix up handling of non canonical user RIPs
    
    EM64T CPUs have somewhat weird error reporting for non canonical RIPs in
    SYSRET.
    
    We can't handle any exceptions there because the exception handler would
    end up running on the user stack which is unsafe.
    
    To avoid problems any code that might end up with a user touched pt_regs
    should return using int_ret_from_syscall.  int_ret_from_syscall ends up
    using IRET, which allows safe exceptions.
    
    Cc: Ernie Petrides <petrides@redhat.com>
    Signed-off-by: Andi Kleen <ak@suse.de>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 31fe4d331729e9687db84521c3ceb8e43390efcf 
tree 3db1ef1a3daaf10d01ab18dbcc0f107857919eac 
parent baa829d8926f02ab04be6ec37780810d221c5b4b 
author Patrick McHardy <kaber@trash.net> Sun, 12 Mar 2006 20:40:43 -0800 
committer David S. Miller <davem@davemloft.net> Sun, 12 Mar 2006 20:40:43 -0800 

    [NETFILTER]: arp_tables: fix NULL pointer dereference
    
    The check is wrong and lets NULL-ptrs slip through since !IS_ERR(NULL)
    is true.
    
    Coverity #190
    
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit baa829d8926f02ab04be6ec37780810d221c5b4b 
tree 8c2236eba68bb65aa535ab78e58777ff51de6746 
parent 4a1ff6e2bde56cdf176bd54d557b2e15e819f810 
author Patrick McHardy <kaber@trash.net> Sun, 12 Mar 2006 20:35:12 -0800 
committer David S. Miller <davem@sunset.davemloft.net> Sun, 12 Mar 2006 20:39:40 -0800 

    [IPV4/6]: Fix UFO error propagation
    
    When ufo_append_data fails err is uninitialized, but returned back.
    Strangely gcc doesn't notice it.
    
    Coverity #901 and #902
    
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 4a1ff6e2bde56cdf176bd54d557b2e15e819f810 
tree c831cb72a76e69b3e781f070c510a59b06e39cb9 
parent cc9a06cd8d6fbb69b4d3c46760c132cfe312fb85 
author Patrick McHardy <kaber@trash.net> Sun, 12 Mar 2006 20:34:53 -0800 
committer David S. Miller <davem@sunset.davemloft.net> Sun, 12 Mar 2006 20:39:39 -0800 

    [TCP]: tcp_highspeed: fix AIMD table out-of-bounds access
    
    Covertiy #547
    
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit cc9a06cd8d6fbb69b4d3c46760c132cfe312fb85 
tree c6dce78c5e845d9cd4d5baab7c8b29306fa77541 
parent f8dc01f543f28253abeef649987249210d8db3cc 
author Patrick McHardy <kaber@trash.net> Sun, 12 Mar 2006 20:34:27 -0800 
committer David S. Miller <davem@sunset.davemloft.net> Sun, 12 Mar 2006 20:39:38 -0800 

    [NETLINK]: Fix use-after-free in netlink_recvmsg
    
    The skb given to netlink_cmsg_recv_pktinfo is already freed, move it up
    a few lines.
    
    Coverity #948
    
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit f8dc01f543f28253abeef649987249210d8db3cc 
tree fc7d4a013cb2e2cc2e12354c29c23e695de69862 
parent f6e57464df7ba0e91a23b0854adb56852dcd58a7 
author Patrick McHardy <kaber@trash.net> Sun, 12 Mar 2006 20:33:49 -0800 
committer David S. Miller <davem@sunset.davemloft.net> Sun, 12 Mar 2006 20:39:37 -0800 

    [XFRM]: Fix leak in ah6_input
    
    tmp_hdr is not freed when ipv6_clear_mutable_options fails.
    
    Coverity #650
    
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit f6e57464df7ba0e91a23b0854adb56852dcd58a7 
tree 9dfee36ee4e5150a3af876b44bca7516554aa5ec 
parent 406dbfc9ae0e6b7eb4da4a52c0a6556a0d7e6a2f 
author Patrick McHardy <kaber@trash.net> Sun, 12 Mar 2006 20:33:22 -0800 
committer David S. Miller <davem@sunset.davemloft.net> Sun, 12 Mar 2006 20:39:36 -0800 

    [NET_SCHED]: act_api: fix skb leak in error path
    
    The skb is allocated by the function, so it needs to be freed instead
    of trimmed on overrun.
    
    Coverity #614
    
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 406dbfc9ae0e6b7eb4da4a52c0a6556a0d7e6a2f 
tree 208366b1977eca0f2abad59e1c608fbf50fcbb21 
parent 57ddd5c1803859d977c5a31a267d2c805ffe6e11 
author Patrick McHardy <kaber@trash.net> Sun, 12 Mar 2006 20:32:47 -0800 
committer David S. Miller <davem@sunset.davemloft.net> Sun, 12 Mar 2006 20:39:35 -0800 

    [NETFILTER]: nfnetlink_queue: fix possible NULL-ptr dereference
    
    Fix NULL-ptr dereference when a config message for a non-existant
    queue containing only an NFQA_CFG_PARAMS attribute is received.
    
    Coverity #433
    
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 57ddd5c1803859d977c5a31a267d2c805ffe6e11 
tree bbc3e2a406f5ab2ddeb0ba0273867bee95b41612 
parent 7cafae52381395d24b83996eca7a7b53ab6a8827 
parent ed071adc97a69785686a37fb88e100f41b482b94 
author Linus Torvalds <torvalds@g5.osdl.org> Sun, 12 Mar 2006 16:41:27 -0800 
committer Linus Torvalds <torvalds@g5.osdl.org> Sun, 12 Mar 2006 16:41:27 -0800 

    Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
    
    * 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
    [PATCH] ahci: fix NULL pointer dereference detected by Coverity

commit 7cafae52381395d24b83996eca7a7b53ab6a8827 
tree 05b3cfb71c7131aaabe3b78b6f0278e91cba5147 
parent ba244fe9005323452428fee4b4b7d0c70a06b627 
parent cdaabbd74b15296acf09215355a7f3b07b92b83e 
author Linus Torvalds <torvalds@g5.osdl.org> Sun, 12 Mar 2006 14:56:02 -0800 
committer Linus Torvalds <torvalds@g5.osdl.org> Sun, 12 Mar 2006 14:56:02 -0800 

    Merge master.kernel.org:/home/rmk/linux-2.6-arm
    
    * master.kernel.org:/home/rmk/linux-2.6-arm:
    [ARM] iwmmxt thread state alignment
    [ARM] 3350/1: Enable 1-wire on ARM
    [ARM] 3356/1: Workaround for the ARM1136 I-cache invalidation problem
    [ARM] 3355/1: NSLU2: remove propmt depends
    [ARM] 3354/1: NAS100d: fix power led handling
    [ARM] Fix muldi3.S

commit cdaabbd74b15296acf09215355a7f3b07b92b83e 
tree da2e2ce07a31eb10cb3649005479a9588ba22809 
parent 04916c0ef482335cb0ae575dbc5a1d97619840cd 
author Russell King <rmk@dyn-67.arm.linux.org.uk> Sun, 12 Mar 2006 22:36:06 +0000 
committer Russell King <rmk+kernel@arm.linux.org.uk> Sun, 12 Mar 2006 22:36:06 +0000 

    [ARM] iwmmxt thread state alignment
    
    This patch removes the reliance of iwmmxt on hand coded alignments.
    Since thread_info is always 8K aligned, specifying that fpstate is
    8-byte aligned achieves the same effect without needing to resort
    to hand coded alignments.
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit ba244fe9005323452428fee4b4b7d0c70a06b627 
tree a2f64703eeb1cae57ea3d4b5d2dd481614ae82d1 
parent c12743764129e40dc8461afc1096cf175c7c25f2 
author David S. Miller <davem@davemloft.net> Sat, 11 Mar 2006 18:51:49 -0800 
committer David S. Miller <davem@davemloft.net> Sat, 11 Mar 2006 18:51:49 -0800 

    [TCP]: Fix tcp_tso_should_defer() when limit>=65536
    
    That's >= a full sized TSO frame, so we should always
    return 0 in that case.
    
    Based upon a report and initial patch from Lachlan
    Andrew, final patch suggested by Herbert Xu.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit c12743764129e40dc8461afc1096cf175c7c25f2 
tree 080df077769b53cfae033849ab87cbd95f39c4b7 
parent 0d27b42739ee432a66104793e51a23807b372928 
author Gregor Maier <gregor@net.in.tum.de> Sat, 11 Mar 2006 18:51:25 -0800 
committer David S. Miller <davem@davemloft.net> Sat, 11 Mar 2006 18:51:25 -0800 

    [NETFILTER]: Fix wrong option spelling in Makefile for CONFIG_BRIDGE_EBT_ULOG
    
    Signed-off-by: Gregor Maier <gregor@net.in.tum.de>
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 0d27b42739ee432a66104793e51a23807b372928 
tree d23986eff26122d06f6493029428a8748ff90040 
parent 0ade309be739eceedc4812798da09d698a59867d 
author Brian Haley <brian.haley@hp.com> Sat, 11 Mar 2006 18:50:14 -0800 
committer David S. Miller <davem@davemloft.net> Sat, 11 Mar 2006 18:50:14 -0800 

    [IPV6]: fix ipv6_saddr_score struct element
    
    The scope element in the ipv6_saddr_score struct used in
    ipv6_dev_get_saddr() is an unsigned integer, but __ipv6_addr_src_scope()
    returns a signed integer (and can return -1).
    
    Signed-off-by: Brian Haley <brian.haley@hp.com>
    Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 0ade309be739eceedc4812798da09d698a59867d 
tree 3d16e848a4f7202fbd8999117571706caccef8b7 
parent 8f22757ee84da64d4f662f1dd03dae95358a1efe 
author Adrian Bunk <bunk@stusta.de> Sat, 11 Mar 2006 18:49:38 -0800 
committer David S. Miller <davem@davemloft.net> Sat, 11 Mar 2006 18:49:38 -0800 

    [TG3] tg3_bus_string(): remove dead code
    
    The Coverity checker spotted this dead code (note that (clock_ctrl == 7)
    is already handled above).
    
    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 8f22757ee84da64d4f662f1dd03dae95358a1efe 
tree ebbf96d3c733c5cad9ab002740f1d4b829e07a4e 
parent 535744878e34d01a53f946f26dfbca37186f2cf8 
author Dave Jones <davej@redhat.com> Sat, 11 Mar 2006 18:49:13 -0800 
committer David S. Miller <davem@davemloft.net> Sat, 11 Mar 2006 18:49:13 -0800 

    [TUN]: Fix leak in tun_get_user()
    
    We're leaking an skb in a failure path in this function.
    
    Coverity #632
    Signed-off-by: Dave Jones <davej@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit ed071adc97a69785686a37fb88e100f41b482b94 
tree 75be27a48365aab9cfe6531f7d1f5516e6602307 
parent 6971ed1fbbc80cae54e082aae153d5b063885d0a 
parent 535744878e34d01a53f946f26dfbca37186f2cf8 
author Jeff Garzik <jeff@garzik.org> Sat, 11 Mar 2006 19:55:26 -0500 
committer Jeff Garzik <jeff@garzik.org> Sat, 11 Mar 2006 19:55:26 -0500 

    Merge branch 'master'

commit 6971ed1fbbc80cae54e082aae153d5b063885d0a 
tree 164d950b587badb59dc2e2415ab74c2210accff7 
parent ed62178589929d248a0aaf4018ca3867e2f96d9d 
author Tejun Heo <htejun@gmail.com> Sat, 11 Mar 2006 12:47:54 +0900 
committer Jeff Garzik <jeff@garzik.org> Sat, 11 Mar 2006 19:06:02 -0500 

    [PATCH] ahci: fix NULL pointer dereference detected by Coverity
    
    Fix NULL pointer dereference detected by the Coverity checker.  Kill
    dev -> pdev -> dev conversion while at it.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Cc: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 04916c0ef482335cb0ae575dbc5a1d97619840cd 
tree e311fe75fd072232380eb1f4ed5e675442409d7a 
parent 141fa40cff90881ac4d81f6afa27bc283fe7acca 
author Alessandro Zummo <a.zummo@towertech.it> Fri, 10 Mar 2006 22:30:01 +0000 
committer Russell King <rmk+kernel@arm.linux.org.uk> Fri, 10 Mar 2006 22:30:01 +0000 

    [ARM] 3350/1: Enable 1-wire on ARM
    
    Patch from Alessandro Zummo
    
    This patches add the 1-wire drivers
    to the ARM Kconfig.
    
    Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit 141fa40cff90881ac4d81f6afa27bc283fe7acca 
tree 7991b0f3910dafb58e1ef92044153e5383b01850 
parent e7fcdb79ecaa01e2eba06e3fb64e10455bdb5aa7 
author Catalin Marinas <catalin.marinas@arm.com> Fri, 10 Mar 2006 22:26:47 +0000 
committer Russell King <rmk+kernel@arm.linux.org.uk> Fri, 10 Mar 2006 22:26:47 +0000 

    [ARM] 3356/1: Workaround for the ARM1136 I-cache invalidation problem
    
    Patch from Catalin Marinas
    
    ARM1136 erratum 371025 (category 2) specifies that, under rare
    conditions, an invalidate I-cache by MVA (line or range) operation can
    fail to invalidate a cache line. The recommended workaround is to
    either invalidate the entire I-cache or invalidate the range by
    set/way rather than MVA.
    
    Note that for a 16K cache size, invalidating a 4K page by set/way is
    equivalent to invalidating the entire I-cache.
    
    Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit e7fcdb79ecaa01e2eba06e3fb64e10455bdb5aa7 
tree d0ce941930b18115c9a5ef91680fbfb6e298d5d6 
parent dcc8fa50ebc251a1394a2c8561eee7d79cc5f437 
author Alessandro Zummo <a.zummo@towertech.it> Wed, 08 Mar 2006 23:45:12 +0000 
committer Russell King <rmk+kernel@arm.linux.org.uk> Wed, 08 Mar 2006 23:45:12 +0000 

    [ARM] 3355/1: NSLU2: remove propmt depends
    
    Patch from Alessandro Zummo
    
    The patch that would have made the NSLU2
    kernel non compatible with other ixp4xx machs
    never entered the kernel. So it is actually
    safe to remove the prompt dependencies.
    
    Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit dcc8fa50ebc251a1394a2c8561eee7d79cc5f437 
tree 6830942f3721060f61227e7058fdfe1b4ab972d0 
parent 3c8fdae78cf5d73c6739912a1ff087c0f23b2a47 
author Alessandro Zummo <a.zummo@towertech.it> Wed, 08 Mar 2006 23:45:10 +0000 
committer Russell King <rmk+kernel@arm.linux.org.uk> Wed, 08 Mar 2006 23:45:10 +0000 

    [ARM] 3354/1: NAS100d: fix power led handling
    
    Patch from Alessandro Zummo
    
    Disable GPIO clocks to allow
    the power led to work properly.
    
    Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

commit 3c8fdae78cf5d73c6739912a1ff087c0f23b2a47 
tree 85203dba56f72d897ffa073aa53fb03b011f4e52 
parent 7986824e4e31d6c66f39d2f11ab93fcfed21f593 
author Russell King <rmk@dyn-67.arm.linux.org.uk> Wed, 08 Mar 2006 17:25:33 +0000 
committer Russell King <rmk+kernel@arm.linux.org.uk> Wed, 08 Mar 2006 17:25:33 +0000 

    [ARM] Fix muldi3.S
    
    When shifting the low-parts of signed numbers, a logical shift
    should be used to avoid sign-extending a bit which isn't a sign
    bit.
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>