From: Greg KH Date: Thu, 9 Jun 2005 05:34:07 +0000 (-0700) Subject: add a signed-off-by: from me to the patches in the queue. X-Git-Tag: v2.6.11.12~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=42a0d060b7a2a6bfb86f53f700be60f671db5a1c;p=thirdparty%2Fkernel%2Fstable-queue.git add a signed-off-by: from me to the patches in the queue. --- diff --git a/queue/bridge-fdb-postfilter.patch b/queue/bridge-fdb-postfilter.patch index a70f639cafc..08264b73409 100644 --- a/queue/bridge-fdb-postfilter.patch +++ b/queue/bridge-fdb-postfilter.patch @@ -11,6 +11,7 @@ risk. Signed-off-by: Stephen Hemminger Signed-off-by: Chris Wright +Signed-off-by: Greg Kroah-Hartman Index: 2.6.11.11-net/net/bridge/br_input.c =================================================================== diff --git a/queue/bttv-vc100.patch b/queue/bttv-vc100.patch index af79a1cbcf2..e6c843faad6 100644 --- a/queue/bttv-vc100.patch +++ b/queue/bttv-vc100.patch @@ -16,6 +16,7 @@ Acked-by: Gerd Knorr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Chris Wright +Signed-off-by: Greg Kroah-Hartman --- ./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 diff --git a/queue/fix-log_do_checkpoint-assertion-failure.patch b/queue/fix-log_do_checkpoint-assertion-failure.patch index e581f42969e..39eaae85c4e 100644 --- a/queue/fix-log_do_checkpoint-assertion-failure.patch +++ b/queue/fix-log_do_checkpoint-assertion-failure.patch @@ -16,6 +16,7 @@ Otherwise we can fail to detect our progress. Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Chris Wright +Signed-off-by: Greg Kroah-Hartman 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 diff --git a/queue/hfsplus-oops-hfs-leak-fix.patch b/queue/hfsplus-oops-hfs-leak-fix.patch index 254272dcdf8..dd8699bf3dc 100644 --- a/queue/hfsplus-oops-hfs-leak-fix.patch +++ b/queue/hfsplus-oops-hfs-leak-fix.patch @@ -17,6 +17,7 @@ http://www.kernel.org/git/gitweb.cgi?p=linux/kernel/git/torvalds/linux-2.6.git;a Signed-off-by: Roman Zippel Signed-off-by: Colin Leroy Signed-off-by: Chris Wright +Signed-off-by: Greg Kroah-Hartman fs/hfs/mdb.c | 5 +++++ fs/hfs/super.c | 8 +++----- diff --git a/queue/netem-duplication-fix.patch b/queue/netem-duplication-fix.patch index fb9787da347..53e55814033 100644 --- a/queue/netem-duplication-fix.patch +++ b/queue/netem-duplication-fix.patch @@ -9,6 +9,7 @@ because the qlen of the parent qdisc is not affected by the duplication. Signed-off-by: Stephen Hemminger Signed-off-by: Chris Wright +Signed-off-by: Greg Kroah-Hartman Index: 2.6.11.11-net/net/sched/sch_netem.c =================================================================== diff --git a/queue/netfilter-ip_queue-deadlock-fix.patch b/queue/netfilter-ip_queue-deadlock-fix.patch index 4219f9d4797..3eb497bcb8a 100644 --- a/queue/netfilter-ip_queue-deadlock-fix.patch +++ b/queue/netfilter-ip_queue-deadlock-fix.patch @@ -2,16 +2,8 @@ From stable-bounces@linux.kernel.org Mon May 30 15:38:33 2005 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" -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 +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 @@ -29,6 +21,7 @@ simply use local_bh_{en,dis}able(). Signed-off-by: Harald Welte Signed-off-by: David S. Miller Signed-off-by: Chris Wright +Signed-off-by: Greg Kroah-Hartman --- 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 diff --git a/queue/x86_64-avoid-SMP-bootup-race.patch b/queue/x86_64-avoid-SMP-bootup-race.patch index f3849f418ae..9fd7cd54756 100644 --- a/queue/x86_64-avoid-SMP-bootup-race.patch +++ b/queue/x86_64-avoid-SMP-bootup-race.patch @@ -2,7 +2,7 @@ From stable-bounces@linux.kernel.org Tue May 31 07:08:57 2005 Date: Tue, 31 May 2005 16:08:47 +0200 From: Andi Kleen 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 @@ -20,6 +20,7 @@ directly. Signed-off-by: ak@suse.de Signed-off-by: Chris Wright +Signed-off-by: Greg Kroah-Hartman 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 diff --git a/queue/x86_64-fix-ptrace-boundary-check.patch b/queue/x86_64-fix-ptrace-boundary-check.patch index 9578c6bf7d8..4ff616946cc 100644 --- a/queue/x86_64-fix-ptrace-boundary-check.patch +++ b/queue/x86_64-fix-ptrace-boundary-check.patch @@ -6,12 +6,13 @@ Subject: [PATCH] x86_64: Fix ptrace boundary check 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 Signed-off-by: Chris Wright +Signed-off-by: Greg Kroah-Hartman arch/x86_64/kernel/ptrace.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)