From f289e3165742c95a0b21138047747dc189f5d1a1 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 12 Dec 2005 14:44:51 -0800 Subject: [PATCH] refresh the 2.6.13 queue --- queue-2.6.13/br-fix-race-on-bridge-del-if.patch | 9 ++++----- queue-2.6.13/sparc64-build-fix.patch | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) 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 index 559bde98629..3f3a6968077 100644 --- 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 @@ -16,14 +16,13 @@ This should also fix the XEN test problems. If there is another Signed-off-by: Stephen Hemminger Signed-off-by: Chris Wright +Signed-off-by: Greg Kroah-Hartman --- net/bridge/br_if.c | 2 +- - 1 files changed, 1 insertion(+), 1 deletion(-) + 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-2.6.13.y/net/bridge/br_if.c -=================================================================== ---- linux-2.6.13.y.orig/net/bridge/br_if.c -+++ linux-2.6.13.y/net/bridge/br_if.c +--- 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; diff --git a/queue-2.6.13/sparc64-build-fix.patch b/queue-2.6.13/sparc64-build-fix.patch index ffc7a5baca5..df473209090 100644 --- a/queue-2.6.13/sparc64-build-fix.patch +++ b/queue-2.6.13/sparc64-build-fix.patch @@ -13,14 +13,13 @@ 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 files changed, 1 insertion(+) + 1 file changed, 1 insertion(+) -Index: linux-2.6.13.y/arch/sparc64/kernel/irq.c -=================================================================== ---- linux-2.6.13.y.orig/arch/sparc64/kernel/irq.c -+++ linux-2.6.13.y/arch/sparc64/kernel/irq.c +--- 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 -- 2.47.3