Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Index: 2.6.11.11-net/net/bridge/br_input.c
===================================================================
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- ./drivers/media/video/bttv-cards.c.orig 2005-04-24 23:39:41.000000000 +0100
+++ ./drivers/media/video/bttv-cards.c 2005-04-25 19:59:27.000000000 +0100
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff -rupX /home/jack/.kerndiffexclude linux-2.6.12-rc5/fs/jbd/checkpoint.c linux-2.6.12-rc5-1-checkretry/fs/jbd/checkpoint.c
--- linux-2.6.12-rc5/fs/jbd/checkpoint.c 2005-03-03 18:58:29.000000000 +0100
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Colin Leroy <colin@colino.net>
Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
fs/hfs/mdb.c | 5 +++++
fs/hfs/super.c | 8 +++-----
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Index: 2.6.11.11-net/net/sched/sch_netem.c
===================================================================
Date: Mon, 30 May 2005 15:38:14 -0700 (PDT)
Message-Id: <20050530.153814.112623060.davem@davemloft.net>
To: stable@kernel.org
-From: "David S. Miller" <davem@davemloft.net>
-Cc:
-Subject: [PATCH] Netfilter deadlock bug fix
-
-Please add this netfilter deadlock fix from Harald
-Welte to the 2.6.x stable patch queue.
-
-Thanks a lot.
-
-[NETFILTER]: Fix deadlock with ip_queue and tcp local input path.
+From: Harald Welte <laforge@netfilter.org>
+Subject: [NETFILTER]: Fix deadlock with ip_queue and tcp local input path.
When we have ip_queue being used from LOCAL_IN, then we end up with a
situation where the verdicts coming back from userspace traverse the TCP
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- 1/net/ipv4/netfilter/ip_queue.c 2005-05-27 09:44:32.000000000 +0200
+++ 2/net/ipv4/netfilter/ip_queue.c 2005-05-27 09:47:13.000000000 +0200
Date: Tue, 31 May 2005 16:08:47 +0200
From: Andi Kleen <ak@suse.de>
To: stable@kernel.org
-ubject: [PATCH] x86_64: avoid SMP boot up race
+ubject: [PATCH] x86_64: avoid SMP boot up race
Keep interrupts disabled during smp bootup
Signed-off-by: ak@suse.de
Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff -u linux/arch/x86_64/kernel/apic.c-o linux/arch/x86_64/kernel/apic.c
--- linux/arch/x86_64/kernel/apic.c-o 2005-05-31 16:40:01.000000000 +0200
Don't allow accesses below register frame in ptrace
-There was a "off by one quad word" error in there.
+There was a "off by one quad word" error in there.
Found and fixed by John Blackwood
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
arch/x86_64/kernel/ptrace.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)