]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
move 2.6.13 patches to "review" state
authorGreg Kroah-Hartman <gregkh@suse.de>
Mon, 12 Dec 2005 22:54:47 +0000 (14:54 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 12 Dec 2005 22:54:47 +0000 (14:54 -0800)
queue-2.6.13/br-fix-race-on-bridge-del-if.patch [deleted file]
queue-2.6.13/series [deleted file]
queue-2.6.13/sparc64-build-fix.patch [deleted file]

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 (file)
index 3f3a696..0000000
+++ /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 <shemminger@osdl.org>
-To: Ryan Harper <ryanh@us.ibm.com>, "David S. Miller" <davem@davemloft.net>
-Cc: netdev@oss.sgi.com, Chris Wright <chrisw@osdl.org>, Greg KH <greg@kroah.com>
-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 <shemminger@osdl.org>
-Signed-off-by: Chris Wright <chrisw@osdl.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
----
- 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 (file)
index 79f1710..0000000
+++ /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 (file)
index df47320..0000000
+++ /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" <davem@davemloft.net>
-Cc: 
-Subject: [SPARC64]: Fix compile error in irq.c
-
-From: Sven Hartge <hartge@ds9.argh.org>
-
-irq.c is missing the inclusion of asm/io.h, which causes
-readb() and writeb() the be undefined.
-
-Signed-off-by: Sven Hartge <hartge@ds9.argh.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>
----
- 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 <asm/atomic.h>
- #include <asm/system.h>
- #include <asm/irq.h>
-+#include <asm/io.h>
- #include <asm/sbus.h>
- #include <asm/iommu.h>
- #include <asm/upa.h>