From 759cd51a7a91c586773187bfd8187bc31c521e65 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 12 Dec 2005 14:54:47 -0800 Subject: [PATCH] move 2.6.13 patches to "review" state --- .../br-fix-race-on-bridge-del-if.patch | 41 ------------------- queue-2.6.13/series | 2 - queue-2.6.13/sparc64-build-fix.patch | 30 -------------- 3 files changed, 73 deletions(-) delete mode 100644 queue-2.6.13/br-fix-race-on-bridge-del-if.patch delete mode 100644 queue-2.6.13/series delete mode 100644 queue-2.6.13/sparc64-build-fix.patch diff --git a/queue-2.6.13/br-fix-race-on-bridge-del-if.patch b/queue-2.6.13/br-fix-race-on-bridge-del-if.patch deleted file mode 100644 index 3f3a6968077..00000000000 --- a/queue-2.6.13/br-fix-race-on-bridge-del-if.patch +++ /dev/null @@ -1,41 +0,0 @@ -From shemminger@osdl.org Tue Oct 11 13:37:00 2005 -Date: Tue, 11 Oct 2005 13:33:28 -0700 -From: Stephen Hemminger -To: Ryan Harper , "David S. Miller" -Cc: netdev@oss.sgi.com, Chris Wright , Greg KH -Subject: [PATCH] br: fix race on bridge del if - -This fixes the RCU race on bridge delete interface. Basically, -the network device has to be detached from the bridge in the first -step (pre-RCU), rather than later. At that point, no more bridge traffic -will come in, and the other code will not think that network device -is part of a bridge. - -This should also fix the XEN test problems. If there is another -2.6.13-stable, add it as well. - -Signed-off-by: Stephen Hemminger -Signed-off-by: Chris Wright -Signed-off-by: Greg Kroah-Hartman ---- - net/bridge/br_if.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- linux-2.6.13.4.orig/net/bridge/br_if.c -+++ linux-2.6.13.4/net/bridge/br_if.c -@@ -79,7 +79,6 @@ static void destroy_nbp(struct net_bridg - { - struct net_device *dev = p->dev; - -- dev->br_port = NULL; - p->br = NULL; - p->dev = NULL; - dev_put(dev); -@@ -100,6 +99,7 @@ static void del_nbp(struct net_bridge_po - struct net_bridge *br = p->br; - struct net_device *dev = p->dev; - -+ dev->br_port = NULL; - dev_set_promiscuity(dev, -1); - - spin_lock_bh(&br->lock); diff --git a/queue-2.6.13/series b/queue-2.6.13/series deleted file mode 100644 index 79f17108d92..00000000000 --- a/queue-2.6.13/series +++ /dev/null @@ -1,2 +0,0 @@ -sparc64-build-fix.patch -br-fix-race-on-bridge-del-if.patch diff --git a/queue-2.6.13/sparc64-build-fix.patch b/queue-2.6.13/sparc64-build-fix.patch deleted file mode 100644 index df473209090..00000000000 --- a/queue-2.6.13/sparc64-build-fix.patch +++ /dev/null @@ -1,30 +0,0 @@ -From stable-bounces@linux.kernel.org Sat Oct 8 21:14:33 2005 -Date: Sat, 08 Oct 2005 21:14:34 -0700 (PDT) -To: stable@kernel.org -From: "David S. Miller" -Cc: -Subject: [SPARC64]: Fix compile error in irq.c - -From: Sven Hartge - -irq.c is missing the inclusion of asm/io.h, which causes -readb() and writeb() the be undefined. - -Signed-off-by: Sven Hartge -Signed-off-by: David S. Miller -Signed-off-by: Chris Wright -Signed-off-by: Greg Kroah-Hartman ---- - arch/sparc64/kernel/irq.c | 1 + - 1 file changed, 1 insertion(+) - ---- linux-2.6.13.4.orig/arch/sparc64/kernel/irq.c -+++ linux-2.6.13.4/arch/sparc64/kernel/irq.c -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - #include - #include -- 2.47.3