From: Greg KH Date: Fri, 7 Oct 2005 23:32:59 +0000 (-0700) Subject: clean up the patches, running them through quilt X-Git-Tag: v2.6.13.4~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e71f44560a471e11b66973a85398ce3c0281d9e2;p=thirdparty%2Fkernel%2Fstable-queue.git clean up the patches, running them through quilt --- diff --git a/queue/drm-module_param-permissions-fix.patch b/queue/drm-module_param-permissions-fix.patch index 992612b4248..ffba6cbdf9e 100644 --- a/queue/drm-module_param-permissions-fix.patch +++ b/queue/drm-module_param-permissions-fix.patch @@ -16,12 +16,9 @@ http://bugs.gentoo.org/show_bug.cgi?id=107893 Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman --- - drivers/char/drm/drm_stub.c | 2 +- - 1 files changed, 1 insertion(+), 1 deletion(-) + 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-2.6.13.y/drivers/char/drm/drm_stub.c -=================================================================== --- linux-2.6.13.y.orig/drivers/char/drm/drm_stub.c +++ linux-2.6.13.y/drivers/char/drm/drm_stub.c @@ -47,7 +47,7 @@ MODULE_PARM_DESC(cards_limit, "Maximum n diff --git a/queue/fix-sparc64-fpu-register-corruption.patch b/queue/fix-sparc64-fpu-register-corruption.patch index 6b7c0084385..ecfc49602bc 100644 --- a/queue/fix-sparc64-fpu-register-corruption.patch +++ b/queue/fix-sparc64-fpu-register-corruption.patch @@ -18,8 +18,6 @@ Signed-off-by: Greg Kroah-Hartman arch/sparc64/lib/VISsave.S | 8 +++++--- 3 files changed, 30 insertions(+), 24 deletions(-) -Index: linux-2.6.13.y/arch/sparc64/kernel/entry.S -=================================================================== --- linux-2.6.13.y.orig/arch/sparc64/kernel/entry.S +++ linux-2.6.13.y/arch/sparc64/kernel/entry.S @@ -186,7 +186,7 @@ vmalloc_addr: @@ -112,8 +110,6 @@ Index: linux-2.6.13.y/arch/sparc64/kernel/entry.S ldda [%g1 + %g2] ASI_BLK_S, %f16 add %g1, 0x80, %g1 ldda [%g1] ASI_BLK_S, %f32 -Index: linux-2.6.13.y/arch/sparc64/kernel/rtrap.S -=================================================================== --- linux-2.6.13.y.orig/arch/sparc64/kernel/rtrap.S +++ linux-2.6.13.y/arch/sparc64/kernel/rtrap.S @@ -310,32 +310,33 @@ kern_fpucheck: ldub [%g6 + TI_FPDEPTH] @@ -153,8 +149,6 @@ Index: linux-2.6.13.y/arch/sparc64/kernel/rtrap.S ldda [%o3 + %o2] ASI_BLK_P, %f32 ldda [%o4 + %o2] ASI_BLK_P, %f48 membar #Sync -Index: linux-2.6.13.y/arch/sparc64/lib/VISsave.S -=================================================================== --- linux-2.6.13.y.orig/arch/sparc64/lib/VISsave.S +++ linux-2.6.13.y/arch/sparc64/lib/VISsave.S @@ -59,15 +59,17 @@ vis1: ldub [%g6 + TI_FPSAVED], %g3 diff --git a/queue/ieee1394-sbp2-fixes-for-hot-unplug-and-module-unloading.patch b/queue/ieee1394-sbp2-fixes-for-hot-unplug-and-module-unloading.patch index 1d99be38018..e22a31bca1a 100644 --- a/queue/ieee1394-sbp2-fixes-for-hot-unplug-and-module-unloading.patch +++ b/queue/ieee1394-sbp2-fixes-for-hot-unplug-and-module-unloading.patch @@ -23,12 +23,9 @@ Cc: Ben Collins Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman --- - drivers/ieee1394/sbp2.c | 38 +++++++++++++++++++++++++++++++++++--- - 1 files changed, 35 insertions(+), 3 deletions(-) + 1 file changed, 35 insertions(+), 3 deletions(-) -Index: linux-2.6.13.y/drivers/ieee1394/sbp2.c -=================================================================== --- linux-2.6.13.y.orig/drivers/ieee1394/sbp2.c +++ linux-2.6.13.y/drivers/ieee1394/sbp2.c @@ -596,6 +596,11 @@ static void sbp2util_mark_command_comple diff --git a/queue/key-rka-memleak.patch b/queue/key-rka-memleak.patch index eb1efbd29dd..8da900a899f 100644 --- a/queue/key-rka-memleak.patch +++ b/queue/key-rka-memleak.patch @@ -13,10 +13,8 @@ Signed-Off-By: David Howells Signed-off-by: Greg Kroah-Hartman --- security/keys/request_key_auth.c | 1 + - 1 files changed, 1 insertion(+) + 1 file changed, 1 insertion(+) -Index: linux-2.6.13.y/security/keys/request_key_auth.c -=================================================================== --- linux-2.6.13.y.orig/security/keys/request_key_auth.c +++ linux-2.6.13.y/security/keys/request_key_auth.c @@ -96,6 +96,7 @@ static void request_key_auth_destroy(str diff --git a/queue/orinoco-info-leak.patch b/queue/orinoco-info-leak.patch index d8ec50693c8..443c327688b 100644 --- a/queue/orinoco-info-leak.patch +++ b/queue/orinoco-info-leak.patch @@ -15,12 +15,9 @@ Signed-off-by: Pavel Roskin Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman --- - drivers/net/wireless/orinoco.c | 14 +++++++++----- - 1 files changed, 9 insertions(+), 5 deletions(-) + 1 file changed, 9 insertions(+), 5 deletions(-) -Index: linux-2.6.13.y/drivers/net/wireless/orinoco.c -=================================================================== --- linux-2.6.13.y.orig/drivers/net/wireless/orinoco.c +++ linux-2.6.13.y/drivers/net/wireless/orinoco.c @@ -502,9 +502,14 @@ static int orinoco_xmit(struct sk_buff * diff --git a/queue/plug-names_cache-memleak.patch b/queue/plug-names_cache-memleak.patch index cd9a1359e72..252c0aa5837 100644 --- a/queue/plug-names_cache-memleak.patch +++ b/queue/plug-names_cache-memleak.patch @@ -21,10 +21,8 @@ Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman --- fs/namei.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) -Index: linux-2.6.13.y/fs/namei.c -=================================================================== --- linux-2.6.13.y.orig/fs/namei.c +++ linux-2.6.13.y/fs/namei.c @@ -1557,19 +1557,19 @@ do_link: diff --git a/queue/tcp-congestion-control-bug.patch b/queue/tcp-congestion-control-bug.patch index e88f510b7fa..a3433a20758 100644 --- a/queue/tcp-congestion-control-bug.patch +++ b/queue/tcp-congestion-control-bug.patch @@ -21,12 +21,9 @@ Signed-off-by: David S. Miller Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman --- - net/ipv4/tcp_bic.c | 2 +- - 1 files changed, 1 insertion(+), 1 deletion(-) + 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-2.6.13.y/net/ipv4/tcp_bic.c -=================================================================== --- linux-2.6.13.y.orig/net/ipv4/tcp_bic.c +++ linux-2.6.13.y/net/ipv4/tcp_bic.c @@ -136,7 +136,7 @@ static inline void bictcp_update(struct