From: Chris Wright Date: Wed, 8 Feb 2006 02:34:48 +0000 (-0800) Subject: refresh patches X-Git-Tag: v2.6.15.5~48 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4e4d5d146fe5659e5951d015dbf497c612d159ea;p=thirdparty%2Fkernel%2Fstable-queue.git refresh patches --- diff --git a/queue/d_instantiate_unique-nfs-inode-leakage.patch b/queue/d_instantiate_unique-nfs-inode-leakage.patch index 6a9e213c903..013b9f42ce7 100644 --- a/queue/d_instantiate_unique-nfs-inode-leakage.patch +++ b/queue/d_instantiate_unique-nfs-inode-leakage.patch @@ -22,10 +22,10 @@ Signed-off-by: Chris Wright fs/dcache.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletion(-) -Index: linux-2.6.15.2/fs/dcache.c +Index: linux-2.6.15.3/fs/dcache.c =================================================================== ---- linux-2.6.15.2.orig/fs/dcache.c -+++ linux-2.6.15.2/fs/dcache.c +--- linux-2.6.15.3.orig/fs/dcache.c ++++ linux-2.6.15.3/fs/dcache.c @@ -808,10 +808,14 @@ void d_instantiate(struct dentry *entry, * * Fill in inode information in the entry. On success, it returns NULL. diff --git a/queue/dm-crypt-zero-key-before-freeing-it.patch b/queue/dm-crypt-zero-key-before-freeing-it.patch index 8393067b3ce..48f85f8720d 100644 --- a/queue/dm-crypt-zero-key-before-freeing-it.patch +++ b/queue/dm-crypt-zero-key-before-freeing-it.patch @@ -21,10 +21,10 @@ Signed-off-by: Chris Wright drivers/md/dm-crypt.c | 5 +++++ 1 files changed, 5 insertions(+) -Index: linux-2.6.15.2/drivers/md/dm-crypt.c +Index: linux-2.6.15.3/drivers/md/dm-crypt.c =================================================================== ---- linux-2.6.15.2.orig/drivers/md/dm-crypt.c -+++ linux-2.6.15.2/drivers/md/dm-crypt.c +--- linux-2.6.15.3.orig/drivers/md/dm-crypt.c ++++ linux-2.6.15.3/drivers/md/dm-crypt.c @@ -690,6 +690,8 @@ bad3: bad2: crypto_free_tfm(tfm); diff --git a/queue/fix-keyctl-usage-of-strnlen_user.patch b/queue/fix-keyctl-usage-of-strnlen_user.patch index 7df3372242e..d3c3135b3d6 100644 --- a/queue/fix-keyctl-usage-of-strnlen_user.patch +++ b/queue/fix-keyctl-usage-of-strnlen_user.patch @@ -20,10 +20,10 @@ Signed-off-by: Chris Wright security/keys/keyctl.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) -Index: linux-2.6.15.2/security/keys/keyctl.c +Index: linux-2.6.15.3/security/keys/keyctl.c =================================================================== ---- linux-2.6.15.2.orig/security/keys/keyctl.c -+++ linux-2.6.15.2/security/keys/keyctl.c +--- linux-2.6.15.3.orig/security/keys/keyctl.c ++++ linux-2.6.15.3/security/keys/keyctl.c @@ -66,9 +66,10 @@ asmlinkage long sys_add_key(const char _ description = kmalloc(dlen + 1, GFP_KERNEL); if (!description) diff --git a/queue/fix-regression-in-xfs_buf_rele.patch b/queue/fix-regression-in-xfs_buf_rele.patch index 6e73e023556..6a8647bb2f0 100644 --- a/queue/fix-regression-in-xfs_buf_rele.patch +++ b/queue/fix-regression-in-xfs_buf_rele.patch @@ -15,10 +15,10 @@ Signed-off-by: Chris Wright fs/xfs/linux-2.6/xfs_buf.c | 7 +++++++ 1 files changed, 7 insertions(+) -Index: linux-2.6.15.2/fs/xfs/linux-2.6/xfs_buf.c +Index: linux-2.6.15.3/fs/xfs/linux-2.6/xfs_buf.c =================================================================== ---- linux-2.6.15.2.orig/fs/xfs/linux-2.6/xfs_buf.c -+++ linux-2.6.15.2/fs/xfs/linux-2.6/xfs_buf.c +--- linux-2.6.15.3.orig/fs/xfs/linux-2.6/xfs_buf.c ++++ linux-2.6.15.3/fs/xfs/linux-2.6/xfs_buf.c @@ -830,6 +830,13 @@ pagebuf_rele( PB_TRACE(pb, "rele", pb->pb_relse); diff --git a/queue/fixed-hardware-rx-checksum-handling.patch b/queue/fixed-hardware-rx-checksum-handling.patch index ae1352af532..43d9b5725ab 100644 --- a/queue/fixed-hardware-rx-checksum-handling.patch +++ b/queue/fixed-hardware-rx-checksum-handling.patch @@ -23,10 +23,10 @@ Signed-off-by: Chris Wright drivers/net/ppp_generic.c | 3 +++ 1 files changed, 3 insertions(+) -Index: linux-2.6.15.2/drivers/net/ppp_generic.c +Index: linux-2.6.15.3/drivers/net/ppp_generic.c =================================================================== ---- linux-2.6.15.2.orig/drivers/net/ppp_generic.c -+++ linux-2.6.15.2/drivers/net/ppp_generic.c +--- linux-2.6.15.3.orig/drivers/net/ppp_generic.c ++++ linux-2.6.15.3/drivers/net/ppp_generic.c @@ -1610,6 +1610,8 @@ ppp_receive_nonmp_frame(struct ppp *ppp, } else if (!pskb_may_pull(skb, skb->len)) diff --git a/queue/grip-fix-crash-when-accessing-device.patch b/queue/grip-fix-crash-when-accessing-device.patch index 1d6847c1708..10631e7e65b 100644 --- a/queue/grip-fix-crash-when-accessing-device.patch +++ b/queue/grip-fix-crash-when-accessing-device.patch @@ -12,10 +12,10 @@ Signed-off-by: Chris Wright drivers/input/joystick/grip.c | 3 +++ 1 files changed, 3 insertions(+) -Index: linux-2.6.15.2/drivers/input/joystick/grip.c +Index: linux-2.6.15.3/drivers/input/joystick/grip.c =================================================================== ---- linux-2.6.15.2.orig/drivers/input/joystick/grip.c -+++ linux-2.6.15.2/drivers/input/joystick/grip.c +--- linux-2.6.15.3.orig/drivers/input/joystick/grip.c ++++ linux-2.6.15.3/drivers/input/joystick/grip.c @@ -192,6 +192,9 @@ static void grip_poll(struct gameport *g for (i = 0; i < 2; i++) { diff --git a/queue/input-db9-fix-possible-crash-with-saturn-gamepads.patch b/queue/input-db9-fix-possible-crash-with-saturn-gamepads.patch index c0523e6a6ee..8f2a36e345a 100644 --- a/queue/input-db9-fix-possible-crash-with-saturn-gamepads.patch +++ b/queue/input-db9-fix-possible-crash-with-saturn-gamepads.patch @@ -14,10 +14,10 @@ Signed-off-by: Chris Wright drivers/input/joystick/db9.c | 70 ++++++++++++++++++++++--------------------- 1 files changed, 36 insertions(+), 34 deletions(-) -Index: linux-2.6.15.2/drivers/input/joystick/db9.c +Index: linux-2.6.15.3/drivers/input/joystick/db9.c =================================================================== ---- linux-2.6.15.2.orig/drivers/input/joystick/db9.c -+++ linux-2.6.15.2/drivers/input/joystick/db9.c +--- linux-2.6.15.3.orig/drivers/input/joystick/db9.c ++++ linux-2.6.15.3/drivers/input/joystick/db9.c @@ -275,68 +275,70 @@ static unsigned char db9_saturn_read_pac /* * db9_saturn_report() analyzes packet and reports. diff --git a/queue/input-iforce-do-not-return-enomem-upon-successful-allocation.patch b/queue/input-iforce-do-not-return-enomem-upon-successful-allocation.patch index dcaef389153..5b79f9c740e 100644 --- a/queue/input-iforce-do-not-return-enomem-upon-successful-allocation.patch +++ b/queue/input-iforce-do-not-return-enomem-upon-successful-allocation.patch @@ -15,10 +15,10 @@ Signed-off-by: Chris Wright drivers/input/joystick/iforce/iforce-main.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) -Index: linux-2.6.15.2/drivers/input/joystick/iforce/iforce-main.c +Index: linux-2.6.15.3/drivers/input/joystick/iforce/iforce-main.c =================================================================== ---- linux-2.6.15.2.orig/drivers/input/joystick/iforce/iforce-main.c -+++ linux-2.6.15.2/drivers/input/joystick/iforce/iforce-main.c +--- linux-2.6.15.3.orig/drivers/input/joystick/iforce/iforce-main.c ++++ linux-2.6.15.3/drivers/input/joystick/iforce/iforce-main.c @@ -345,7 +345,7 @@ int iforce_init_device(struct iforce *if int i; diff --git a/queue/input-iforce-fix-detection-of-usb-devices.patch b/queue/input-iforce-fix-detection-of-usb-devices.patch index 25290cb25bd..d49721e0a46 100644 --- a/queue/input-iforce-fix-detection-of-usb-devices.patch +++ b/queue/input-iforce-fix-detection-of-usb-devices.patch @@ -17,10 +17,10 @@ Signed-off-by: Chris Wright drivers/input/joystick/iforce/iforce-usb.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) -Index: linux-2.6.15.2/drivers/input/joystick/iforce/iforce-packets.c +Index: linux-2.6.15.3/drivers/input/joystick/iforce/iforce-packets.c =================================================================== ---- linux-2.6.15.2.orig/drivers/input/joystick/iforce/iforce-packets.c -+++ linux-2.6.15.2/drivers/input/joystick/iforce/iforce-packets.c +--- linux-2.6.15.3.orig/drivers/input/joystick/iforce/iforce-packets.c ++++ linux-2.6.15.3/drivers/input/joystick/iforce/iforce-packets.c @@ -167,9 +167,9 @@ void iforce_process_packet(struct iforce iforce->expect_packet = 0; iforce->ecmd = cmd; @@ -41,10 +41,10 @@ Index: linux-2.6.15.2/drivers/input/joystick/iforce/iforce-packets.c usb_unlink_urb(iforce->ctrl); return -1; } -Index: linux-2.6.15.2/drivers/input/joystick/iforce/iforce-usb.c +Index: linux-2.6.15.3/drivers/input/joystick/iforce/iforce-usb.c =================================================================== ---- linux-2.6.15.2.orig/drivers/input/joystick/iforce/iforce-usb.c -+++ linux-2.6.15.2/drivers/input/joystick/iforce/iforce-usb.c +--- linux-2.6.15.3.orig/drivers/input/joystick/iforce/iforce-usb.c ++++ linux-2.6.15.3/drivers/input/joystick/iforce/iforce-usb.c @@ -95,7 +95,6 @@ static void iforce_usb_irq(struct urb *u goto exit; } diff --git a/queue/input-sidewinder-fix-an-oops.patch b/queue/input-sidewinder-fix-an-oops.patch index d204ad5d0d6..901df8f2dd3 100644 --- a/queue/input-sidewinder-fix-an-oops.patch +++ b/queue/input-sidewinder-fix-an-oops.patch @@ -17,10 +17,10 @@ Signed-off-by: Chris Wright drivers/input/joystick/sidewinder.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) -Index: linux-2.6.15.2/drivers/input/joystick/sidewinder.c +Index: linux-2.6.15.3/drivers/input/joystick/sidewinder.c =================================================================== ---- linux-2.6.15.2.orig/drivers/input/joystick/sidewinder.c -+++ linux-2.6.15.2/drivers/input/joystick/sidewinder.c +--- linux-2.6.15.3.orig/drivers/input/joystick/sidewinder.c ++++ linux-2.6.15.3/drivers/input/joystick/sidewinder.c @@ -736,7 +736,7 @@ static int sw_connect(struct gameport *g sprintf(sw->name, "Microsoft SideWinder %s", sw_name[sw->type]); sprintf(sw->phys[i], "%s/input%d", gameport->phys, i); diff --git a/queue/kill-compat_sys_clock_settime-sign-extension-stub.patch b/queue/kill-compat_sys_clock_settime-sign-extension-stub.patch index cafe840cacc..cd7a6322d6e 100644 --- a/queue/kill-compat_sys_clock_settime-sign-extension-stub.patch +++ b/queue/kill-compat_sys_clock_settime-sign-extension-stub.patch @@ -15,10 +15,10 @@ Signed-off-by: Chris Wright arch/sparc64/kernel/systbls.S | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) -Index: linux-2.6.15.2/arch/sparc64/kernel/sys32.S +Index: linux-2.6.15.3/arch/sparc64/kernel/sys32.S =================================================================== ---- linux-2.6.15.2.orig/arch/sparc64/kernel/sys32.S -+++ linux-2.6.15.2/arch/sparc64/kernel/sys32.S +--- linux-2.6.15.3.orig/arch/sparc64/kernel/sys32.S ++++ linux-2.6.15.3/arch/sparc64/kernel/sys32.S @@ -84,7 +84,6 @@ SIGN2(sys32_fadvise64_64, compat_sys_fad SIGN2(sys32_bdflush, sys_bdflush, %o0, %o1) SIGN1(sys32_mlockall, sys_mlockall, %o0) @@ -27,10 +27,10 @@ Index: linux-2.6.15.2/arch/sparc64/kernel/sys32.S SIGN1(sys32_clock_nanosleep, compat_sys_clock_nanosleep, %o1) SIGN1(sys32_timer_settime, compat_sys_timer_settime, %o1) SIGN1(sys32_io_submit, compat_sys_io_submit, %o1) -Index: linux-2.6.15.2/arch/sparc64/kernel/systbls.S +Index: linux-2.6.15.3/arch/sparc64/kernel/systbls.S =================================================================== ---- linux-2.6.15.2.orig/arch/sparc64/kernel/systbls.S -+++ linux-2.6.15.2/arch/sparc64/kernel/systbls.S +--- linux-2.6.15.3.orig/arch/sparc64/kernel/systbls.S ++++ linux-2.6.15.3/arch/sparc64/kernel/systbls.S @@ -71,7 +71,7 @@ sys_call_table32: /*240*/ .word sys_munlockall, sys32_sched_setparam, sys32_sched_getparam, sys32_sched_setscheduler, sys32_sched_getscheduler .word sys_sched_yield, sys32_sched_get_priority_max, sys32_sched_get_priority_min, sys32_sched_rr_get_interval, compat_sys_nanosleep diff --git a/queue/mousedev-fix-memory-leak.patch b/queue/mousedev-fix-memory-leak.patch index 34d5ec32da8..08dac05309f 100644 --- a/queue/mousedev-fix-memory-leak.patch +++ b/queue/mousedev-fix-memory-leak.patch @@ -21,10 +21,10 @@ Signed-off-by: Chris Wright drivers/input/mousedev.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) -Index: linux-2.6.15.2/drivers/input/mousedev.c +Index: linux-2.6.15.3/drivers/input/mousedev.c =================================================================== ---- linux-2.6.15.2.orig/drivers/input/mousedev.c -+++ linux-2.6.15.2/drivers/input/mousedev.c +--- linux-2.6.15.3.orig/drivers/input/mousedev.c ++++ linux-2.6.15.3/drivers/input/mousedev.c @@ -356,7 +356,7 @@ static void mousedev_free(struct mousede kfree(mousedev); } diff --git a/queue/pcmcia-m-hostap_cs-y-is-not-a-legal-configuration.patch b/queue/pcmcia-m-hostap_cs-y-is-not-a-legal-configuration.patch index 5156bd3f6aa..f7c817f8837 100644 --- a/queue/pcmcia-m-hostap_cs-y-is-not-a-legal-configuration.patch +++ b/queue/pcmcia-m-hostap_cs-y-is-not-a-legal-configuration.patch @@ -18,10 +18,10 @@ Signed-off-by: Chris Wright drivers/net/wireless/hostap/Kconfig | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) -Index: linux-2.6.15.2/drivers/net/wireless/hostap/Kconfig +Index: linux-2.6.15.3/drivers/net/wireless/hostap/Kconfig =================================================================== ---- linux-2.6.15.2.orig/drivers/net/wireless/hostap/Kconfig -+++ linux-2.6.15.2/drivers/net/wireless/hostap/Kconfig +--- linux-2.6.15.3.orig/drivers/net/wireless/hostap/Kconfig ++++ linux-2.6.15.3/drivers/net/wireless/hostap/Kconfig @@ -61,7 +61,7 @@ config HOSTAP_PCI config HOSTAP_CS diff --git a/queue/scsi-turn-off-ordered-flush-barriers.patch b/queue/scsi-turn-off-ordered-flush-barriers.patch index 7f3785eb95d..4d2137983a1 100644 --- a/queue/scsi-turn-off-ordered-flush-barriers.patch +++ b/queue/scsi-turn-off-ordered-flush-barriers.patch @@ -23,10 +23,10 @@ Signed-off-by: Chris Wright drivers/scsi/scsi_lib.c | 5 ----- 1 files changed, 5 deletions(-) -Index: linux-2.6.15.2/drivers/scsi/scsi_lib.c +Index: linux-2.6.15.3/drivers/scsi/scsi_lib.c =================================================================== ---- linux-2.6.15.2.orig/drivers/scsi/scsi_lib.c -+++ linux-2.6.15.2/drivers/scsi/scsi_lib.c +--- linux-2.6.15.3.orig/drivers/scsi/scsi_lib.c ++++ linux-2.6.15.3/drivers/scsi/scsi_lib.c @@ -1534,11 +1534,6 @@ struct request_queue *scsi_alloc_queue(s */ if (shost->ordered_tag) diff --git a/queue/seclvl-settime-fix.patch b/queue/seclvl-settime-fix.patch index 0af63d15090..b4532c6691f 100644 --- a/queue/seclvl-settime-fix.patch +++ b/queue/seclvl-settime-fix.patch @@ -19,10 +19,10 @@ Signed-off-by: Chris Wright security/seclvl.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) -Index: linux-2.6.15.2/security/seclvl.c +Index: linux-2.6.15.3/security/seclvl.c =================================================================== ---- linux-2.6.15.2.orig/security/seclvl.c -+++ linux-2.6.15.2/security/seclvl.c +--- linux-2.6.15.3.orig/security/seclvl.c ++++ linux-2.6.15.3/security/seclvl.c @@ -369,7 +369,7 @@ static int seclvl_capable(struct task_st static int seclvl_settime(struct timespec *tv, struct timezone *tz) { diff --git a/queue/selinux-fix-size-128-slab-leak.patch b/queue/selinux-fix-size-128-slab-leak.patch index 975ecf390ae..ce480c6acda 100644 --- a/queue/selinux-fix-size-128-slab-leak.patch +++ b/queue/selinux-fix-size-128-slab-leak.patch @@ -18,10 +18,10 @@ Signed-off-by: Chris Wright include/linux/security.h | 4 ---- 1 files changed, 4 deletions(-) -Index: linux-2.6.15.2/include/linux/security.h +Index: linux-2.6.15.3/include/linux/security.h =================================================================== ---- linux-2.6.15.2.orig/include/linux/security.h -+++ linux-2.6.15.2/include/linux/security.h +--- linux-2.6.15.3.orig/include/linux/security.h ++++ linux-2.6.15.3/include/linux/security.h @@ -1437,15 +1437,11 @@ static inline void security_sb_post_pivo static inline int security_inode_alloc (struct inode *inode)