From: Greg Kroah-Hartman Date: Wed, 12 Apr 2006 22:09:06 +0000 (-0700) Subject: patch refreshes and 2 more added to the -stable queue X-Git-Tag: v2.6.16.6~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a542b6e79e4d67c56f87109e06210e57ff189ae8;p=thirdparty%2Fkernel%2Fstable-queue.git patch refreshes and 2 more added to the -stable queue --- diff --git a/queue-2.6.16/CIFS-Incorrect-signature-sent-on-SMB-Read.patch b/queue-2.6.16/CIFS-Incorrect-signature-sent-on-SMB-Read.patch new file mode 100644 index 00000000000..36bb6940236 --- /dev/null +++ b/queue-2.6.16/CIFS-Incorrect-signature-sent-on-SMB-Read.patch @@ -0,0 +1,90 @@ +From nobody Mon Sep 17 00:00:00 2001 +From: Steve French +Date: Fri Mar 31 21:22:00 2006 +0000 +Subject: [PATCH] [CIFS] Incorrect signature sent on SMB Read + +Fixes Samba bug 3621 and kernel.org bug 6147 + +For servers which require SMB/CIFS packet signing, we were sending the +wrong signature (all zeros) on SMB Read request. The new cifs routine +to do signatures across an iovec was not complete - and SMB Read, unlike +the new SMBWrite2, did not fall back to the older routine (ie use +SendReceive vs. the more efficient SendReceive2 ie used the older +cifs_sign_smb vs. the disabled cifs_sign_smb2) for calculating signatures. + +This finishes up cifs_sign_smb2/cifs_calc_signature2 so that the callers +of SendReceive2 can get SMB/CIFS packet signatures. + +Now that cifs_sign_smb2 is supported, we could start using it in +the write path but this smaller fix does not include the change +to use SMBWrite2 when signatures are required (which when enabled +will make more Writes more efficient and alloc less memory). +Currently Write2 is only used when signatures are not +required at the moment but after more testing we will enable +that as well). + +Thanks to James Slepicka and Sam Flory for initial investigation. + +Signed-off-by: Steve French +Signed-off-by: Greg Kroah-Hartman + +--- + fs/cifs/cifsencrypt.c | 36 +++++++++++++++++++++++------------- + 1 file changed, 23 insertions(+), 13 deletions(-) + +--- linux-2.6.16.5.orig/fs/cifs/cifsencrypt.c ++++ linux-2.6.16.5/fs/cifs/cifsencrypt.c +@@ -56,9 +56,6 @@ int cifs_sign_smb(struct smb_hdr * cifs_ + int rc = 0; + char smb_signature[20]; + +- /* BB remember to initialize sequence number elsewhere and initialize mac_signing key elsewhere BB */ +- /* BB remember to add code to save expected sequence number in midQ entry BB */ +- + if((cifs_pdu == NULL) || (server == NULL)) + return -EINVAL; + +@@ -85,20 +82,33 @@ int cifs_sign_smb(struct smb_hdr * cifs_ + static int cifs_calc_signature2(const struct kvec * iov, int n_vec, + const char * key, char * signature) + { +- struct MD5Context context; +- +- if((iov == NULL) || (signature == NULL)) +- return -EINVAL; ++ struct MD5Context context; ++ int i; + +- MD5Init(&context); +- MD5Update(&context,key,CIFS_SESSION_KEY_SIZE+16); ++ if((iov == NULL) || (signature == NULL)) ++ return -EINVAL; + +-/* MD5Update(&context,cifs_pdu->Protocol,cifs_pdu->smb_buf_length); */ /* BB FIXME BB */ ++ MD5Init(&context); ++ MD5Update(&context,key,CIFS_SESSION_KEY_SIZE+16); ++ for(i=0;i +Date: Fri Mar 31 02:30:06 2006 -0800 +Subject: [PATCH] Fix suspend with traced tasks + +strace /bin/bash misbehaves after resume; this fixes it. + +(akpm: it's scary calling refrigerator() in state TASK_TRACED, but it seems to +do the right thing). + +Signed-off-by: Pavel Machek +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + kernel/power/process.c | 3 +-- + kernel/signal.c | 1 + + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- linux-2.6.16.5.orig/kernel/power/process.c ++++ linux-2.6.16.5/kernel/power/process.c +@@ -25,8 +25,7 @@ static inline int freezeable(struct task + (p->flags & PF_NOFREEZE) || + (p->exit_state == EXIT_ZOMBIE) || + (p->exit_state == EXIT_DEAD) || +- (p->state == TASK_STOPPED) || +- (p->state == TASK_TRACED)) ++ (p->state == TASK_STOPPED)) + return 0; + return 1; + } +--- linux-2.6.16.5.orig/kernel/signal.c ++++ linux-2.6.16.5/kernel/signal.c +@@ -1688,6 +1688,7 @@ static void ptrace_stop(int exit_code, i + /* Let the debugger run. */ + set_current_state(TASK_TRACED); + spin_unlock_irq(¤t->sighand->siglock); ++ try_to_freeze(); + read_lock(&tasklist_lock); + if (likely(current->ptrace & PT_PTRACED) && + likely(current->parent != current->real_parent || diff --git a/queue-2.6.16/RLIMIT_CPU-fix-handling-of-a-zero-limit.patch b/queue-2.6.16/RLIMIT_CPU-fix-handling-of-a-zero-limit.patch index 2c8dc83b82d..1d2bb3c2f01 100644 --- a/queue-2.6.16/RLIMIT_CPU-fix-handling-of-a-zero-limit.patch +++ b/queue-2.6.16/RLIMIT_CPU-fix-handling-of-a-zero-limit.patch @@ -27,8 +27,8 @@ Signed-off-by: Linus Torvalds 1 file changed, 13 insertions(+), 1 deletion(-) e0661111e5441995f7a69dc4336c9f131cb9bc58 ---- linux-2.6.16.4.orig/kernel/sys.c -+++ linux-2.6.16.4/kernel/sys.c +--- linux-2.6.16.5.orig/kernel/sys.c ++++ linux-2.6.16.5/kernel/sys.c @@ -1657,7 +1657,19 @@ asmlinkage long sys_setrlimit(unsigned i (cputime_eq(current->signal->it_prof_expires, cputime_zero) || new_rlim.rlim_cur <= cputime_to_secs( diff --git a/queue-2.6.16/XFS-Fix-utime-2-in-the-case-that-no-times-parameter-was-passed-in.patch b/queue-2.6.16/XFS-Fix-utime-2-in-the-case-that-no-times-parameter-was-passed-in.patch index d373f03369b..80f1fcc6c3f 100644 --- a/queue-2.6.16/XFS-Fix-utime-2-in-the-case-that-no-times-parameter-was-passed-in.patch +++ b/queue-2.6.16/XFS-Fix-utime-2-in-the-case-that-no-times-parameter-was-passed-in.patch @@ -15,8 +15,8 @@ Signed-off-by: Nathan Scott 1 file changed, 1 insertion(+), 2 deletions(-) 8c0b5113a55c698f3190ec85925815640f1c2049 ---- linux-2.6.16.4.orig/fs/xfs/linux-2.6/xfs_iops.c -+++ linux-2.6.16.4/fs/xfs/linux-2.6/xfs_iops.c +--- linux-2.6.16.5.orig/fs/xfs/linux-2.6/xfs_iops.c ++++ linux-2.6.16.5/fs/xfs/linux-2.6/xfs_iops.c @@ -673,8 +673,7 @@ linvfs_setattr( if (ia_valid & ATTR_ATIME) { vattr.va_mask |= XFS_AT_ATIME; diff --git a/queue-2.6.16/alpha-smp-boot-fixes.patch b/queue-2.6.16/alpha-smp-boot-fixes.patch index 1dcb5e8df7f..48bc571d6f3 100644 --- a/queue-2.6.16/alpha-smp-boot-fixes.patch +++ b/queue-2.6.16/alpha-smp-boot-fixes.patch @@ -47,8 +47,8 @@ Signed-off-by: Greg Kroah-Hartman arch/alpha/kernel/smp.c | 8 +++----- 2 files changed, 20 insertions(+), 5 deletions(-) ---- linux-2.6.16.4.orig/arch/alpha/kernel/setup.c -+++ linux-2.6.16.4/arch/alpha/kernel/setup.c +--- linux-2.6.16.5.orig/arch/alpha/kernel/setup.c ++++ linux-2.6.16.5/arch/alpha/kernel/setup.c @@ -24,6 +24,7 @@ #include /* CONFIG_ALPHA_LCA etc */ #include @@ -80,8 +80,8 @@ Signed-off-by: Greg Kroah-Hartman void __init setup_arch(char **cmdline_p) { ---- linux-2.6.16.4.orig/arch/alpha/kernel/smp.c -+++ linux-2.6.16.4/arch/alpha/kernel/smp.c +--- linux-2.6.16.5.orig/arch/alpha/kernel/smp.c ++++ linux-2.6.16.5/arch/alpha/kernel/smp.c @@ -439,7 +439,7 @@ setup_smp(void) if ((cpu->flags & 0x1cc) == 0x1cc) { smp_num_probed++; diff --git a/queue-2.6.16/cciss-bug-fix-for-crash-when-running-hpacucli.patch b/queue-2.6.16/cciss-bug-fix-for-crash-when-running-hpacucli.patch index 6b1b73d011e..cbd897dce5c 100644 --- a/queue-2.6.16/cciss-bug-fix-for-crash-when-running-hpacucli.patch +++ b/queue-2.6.16/cciss-bug-fix-for-crash-when-running-hpacucli.patch @@ -27,8 +27,8 @@ Signed-off-by: Greg Kroah-Hartman drivers/block/cciss.c | 96 +++++++++++++++++++++++++------------------------- 1 file changed, 49 insertions(+), 47 deletions(-) ---- linux-2.6.16.4.orig/drivers/block/cciss.c -+++ linux-2.6.16.4/drivers/block/cciss.c +--- linux-2.6.16.5.orig/drivers/block/cciss.c ++++ linux-2.6.16.5/drivers/block/cciss.c @@ -1181,6 +1181,53 @@ static int revalidate_allvol(ctlr_info_t return 0; } diff --git a/queue-2.6.16/edac_752x-needs-config_hotplug.patch b/queue-2.6.16/edac_752x-needs-config_hotplug.patch index 7f6adf33cf9..15f441724f6 100644 --- a/queue-2.6.16/edac_752x-needs-config_hotplug.patch +++ b/queue-2.6.16/edac_752x-needs-config_hotplug.patch @@ -25,8 +25,8 @@ Signed-off-by: Greg Kroah-Hartman drivers/edac/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- linux-2.6.16.4.orig/drivers/edac/Kconfig -+++ linux-2.6.16.4/drivers/edac/Kconfig +--- linux-2.6.16.5.orig/drivers/edac/Kconfig ++++ linux-2.6.16.5/drivers/edac/Kconfig @@ -71,7 +71,7 @@ config EDAC_E7XXX config EDAC_E752X diff --git a/queue-2.6.16/ext3-fix-missed-mutex-unlock.patch b/queue-2.6.16/ext3-fix-missed-mutex-unlock.patch index 1fe26770ca2..50ce3fb917f 100644 --- a/queue-2.6.16/ext3-fix-missed-mutex-unlock.patch +++ b/queue-2.6.16/ext3-fix-missed-mutex-unlock.patch @@ -19,8 +19,8 @@ Signed-off-by: Greg Kroah-Hartman fs/ext3/resize.c | 1 + 1 file changed, 1 insertion(+) ---- linux-2.6.16.4.orig/fs/ext3/resize.c -+++ linux-2.6.16.4/fs/ext3/resize.c +--- linux-2.6.16.5.orig/fs/ext3/resize.c ++++ linux-2.6.16.5/fs/ext3/resize.c @@ -974,6 +974,7 @@ int ext3_group_extend(struct super_block if (o_blocks_count != le32_to_cpu(es->s_blocks_count)) { ext3_warning(sb, __FUNCTION__, diff --git a/queue-2.6.16/fix-block-device-symlink-name.patch b/queue-2.6.16/fix-block-device-symlink-name.patch index 40d41a52205..fda70a73a69 100644 --- a/queue-2.6.16/fix-block-device-symlink-name.patch +++ b/queue-2.6.16/fix-block-device-symlink-name.patch @@ -24,8 +24,8 @@ Signed-off-by: Greg Kroah-Hartman fs/partitions/check.c | 5 +++++ 1 file changed, 5 insertions(+) ---- linux-2.6.16.4.orig/fs/partitions/check.c -+++ linux-2.6.16.4/fs/partitions/check.c +--- linux-2.6.16.5.orig/fs/partitions/check.c ++++ linux-2.6.16.5/fs/partitions/check.c @@ -345,6 +345,7 @@ static char *make_block_name(struct gend char *name; static char *block_str = "block:"; diff --git a/queue-2.6.16/fix-buddy-list-race-that-could-lead-to-page-lru-list-corruptions.patch b/queue-2.6.16/fix-buddy-list-race-that-could-lead-to-page-lru-list-corruptions.patch index 2501862b972..acf6dd688cf 100644 --- a/queue-2.6.16/fix-buddy-list-race-that-could-lead-to-page-lru-list-corruptions.patch +++ b/queue-2.6.16/fix-buddy-list-race-that-could-lead-to-page-lru-list-corruptions.patch @@ -34,8 +34,8 @@ Signed-off-by: Greg Kroah-Hartman mm/page_alloc.c | 31 ++++++++++++++++++------------- 3 files changed, 27 insertions(+), 17 deletions(-) ---- linux-2.6.16.4.orig/include/linux/mm.h -+++ linux-2.6.16.4/include/linux/mm.h +--- linux-2.6.16.5.orig/include/linux/mm.h ++++ linux-2.6.16.5/include/linux/mm.h @@ -229,10 +229,9 @@ struct page { unsigned long private; /* Mapping-private opaque data: * usually used for buffer_heads @@ -49,8 +49,8 @@ Signed-off-by: Greg Kroah-Hartman */ struct address_space *mapping; /* If low bit clear, points to * inode address_space, or NULL. ---- linux-2.6.16.4.orig/include/linux/page-flags.h -+++ linux-2.6.16.4/include/linux/page-flags.h +--- linux-2.6.16.5.orig/include/linux/page-flags.h ++++ linux-2.6.16.5/include/linux/page-flags.h @@ -74,7 +74,9 @@ #define PG_mappedtodisk 16 /* Has blocks allocated on-disk */ #define PG_reclaim 17 /* To be reclaimed asap */ @@ -73,8 +73,8 @@ Signed-off-by: Greg Kroah-Hartman #define PageMappedToDisk(page) test_bit(PG_mappedtodisk, &(page)->flags) #define SetPageMappedToDisk(page) set_bit(PG_mappedtodisk, &(page)->flags) #define ClearPageMappedToDisk(page) clear_bit(PG_mappedtodisk, &(page)->flags) ---- linux-2.6.16.4.orig/mm/page_alloc.c -+++ linux-2.6.16.4/mm/page_alloc.c +--- linux-2.6.16.5.orig/mm/page_alloc.c ++++ linux-2.6.16.5/mm/page_alloc.c @@ -153,7 +153,8 @@ static void bad_page(struct page *page) 1 << PG_reclaim | 1 << PG_slab | diff --git a/queue-2.6.16/fuse-fix-oops-in-fuse_send_readpages.patch b/queue-2.6.16/fuse-fix-oops-in-fuse_send_readpages.patch index 8314d8aa693..1cab4e9680b 100644 --- a/queue-2.6.16/fuse-fix-oops-in-fuse_send_readpages.patch +++ b/queue-2.6.16/fuse-fix-oops-in-fuse_send_readpages.patch @@ -25,8 +25,8 @@ Signed-off-by: Greg Kroah-Hartman fs/fuse/file.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---- linux-2.6.16.4.orig/fs/fuse/file.c -+++ linux-2.6.16.4/fs/fuse/file.c +--- linux-2.6.16.5.orig/fs/fuse/file.c ++++ linux-2.6.16.5/fs/fuse/file.c @@ -397,8 +397,12 @@ static int fuse_readpages(struct file *f return -EINTR; diff --git a/queue-2.6.16/isd200-limit-to-blk_dev_ide.patch b/queue-2.6.16/isd200-limit-to-blk_dev_ide.patch index 0da556a43b5..5e4b944e4ef 100644 --- a/queue-2.6.16/isd200-limit-to-blk_dev_ide.patch +++ b/queue-2.6.16/isd200-limit-to-blk_dev_ide.patch @@ -20,8 +20,8 @@ Signed-off-by: Greg Kroah-Hartman drivers/usb/storage/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---- linux-2.6.16.4.orig/drivers/usb/storage/Kconfig -+++ linux-2.6.16.4/drivers/usb/storage/Kconfig +--- linux-2.6.16.5.orig/drivers/usb/storage/Kconfig ++++ linux-2.6.16.5/drivers/usb/storage/Kconfig @@ -48,7 +48,8 @@ config USB_STORAGE_FREECOM config USB_STORAGE_ISD200 diff --git a/queue-2.6.16/m32r-fix-cpu_possible_map-and-cpu_present_map-initialization-for-smp-kernel.patch b/queue-2.6.16/m32r-fix-cpu_possible_map-and-cpu_present_map-initialization-for-smp-kernel.patch index 59266a0b141..fa2092b6f96 100644 --- a/queue-2.6.16/m32r-fix-cpu_possible_map-and-cpu_present_map-initialization-for-smp-kernel.patch +++ b/queue-2.6.16/m32r-fix-cpu_possible_map-and-cpu_present_map-initialization-for-smp-kernel.patch @@ -27,8 +27,8 @@ Signed-off-by: Greg Kroah-Hartman include/asm-m32r/smp.h | 3 ++- 3 files changed, 17 insertions(+), 17 deletions(-) ---- linux-2.6.16.4.orig/arch/m32r/kernel/setup.c -+++ linux-2.6.16.4/arch/m32r/kernel/setup.c +--- linux-2.6.16.5.orig/arch/m32r/kernel/setup.c ++++ linux-2.6.16.5/arch/m32r/kernel/setup.c @@ -9,6 +9,7 @@ #include @@ -66,8 +66,8 @@ Signed-off-by: Greg Kroah-Hartman return 0; } ---- linux-2.6.16.4.orig/arch/m32r/kernel/smpboot.c -+++ linux-2.6.16.4/arch/m32r/kernel/smpboot.c +--- linux-2.6.16.5.orig/arch/m32r/kernel/smpboot.c ++++ linux-2.6.16.5/arch/m32r/kernel/smpboot.c @@ -39,8 +39,10 @@ * Martin J. Bligh : Added support for multi-quad systems */ @@ -139,8 +139,8 @@ Signed-off-by: Greg Kroah-Hartman cpu_2_physid[cpu_id] = -1; } - ---- linux-2.6.16.4.orig/include/asm-m32r/smp.h -+++ linux-2.6.16.4/include/asm-m32r/smp.h +--- linux-2.6.16.5.orig/include/asm-m32r/smp.h ++++ linux-2.6.16.5/include/asm-m32r/smp.h @@ -67,7 +67,8 @@ extern volatile int cpu_2_physid[NR_CPUS #define raw_smp_processor_id() (current_thread_info()->cpu) diff --git a/queue-2.6.16/m32r-security-fix-of-get-put-_user-macros.patch b/queue-2.6.16/m32r-security-fix-of-get-put-_user-macros.patch index 9054cdd23ca..50767ba336d 100644 --- a/queue-2.6.16/m32r-security-fix-of-get-put-_user-macros.patch +++ b/queue-2.6.16/m32r-security-fix-of-get-put-_user-macros.patch @@ -33,8 +33,8 @@ Signed-off-by: Greg Kroah-Hartman include/asm-m32r/uaccess.h | 266 ++++++++++++++++++------------------------ 5 files changed, 117 insertions(+), 329 deletions(-) ---- linux-2.6.16.4.orig/arch/m32r/kernel/m32r_ksyms.c -+++ linux-2.6.16.4/arch/m32r/kernel/m32r_ksyms.c +--- linux-2.6.16.5.orig/arch/m32r/kernel/m32r_ksyms.c ++++ linux-2.6.16.5/arch/m32r/kernel/m32r_ksyms.c @@ -38,10 +38,6 @@ EXPORT_SYMBOL(__udelay); EXPORT_SYMBOL(__delay); EXPORT_SYMBOL(__const_udelay); @@ -46,8 +46,8 @@ Signed-off-by: Greg Kroah-Hartman EXPORT_SYMBOL(strpbrk); EXPORT_SYMBOL(strstr); ---- linux-2.6.16.4.orig/arch/m32r/lib/Makefile -+++ linux-2.6.16.4/arch/m32r/lib/Makefile +--- linux-2.6.16.5.orig/arch/m32r/lib/Makefile ++++ linux-2.6.16.5/arch/m32r/lib/Makefile @@ -2,6 +2,6 @@ # Makefile for M32R-specific library files.. # @@ -57,7 +57,7 @@ Signed-off-by: Greg Kroah-Hartman +lib-y := checksum.o ashxdi3.o memset.o memcpy.o \ + delay.o strlen.o usercopy.o csum_partial_copy.o ---- linux-2.6.16.4.orig/arch/m32r/lib/getuser.S +--- linux-2.6.16.5.orig/arch/m32r/lib/getuser.S +++ /dev/null @@ -1,88 +0,0 @@ -/* @@ -148,7 +148,7 @@ Signed-off-by: Greg Kroah-Hartman -.previous - - .end ---- linux-2.6.16.4.orig/arch/m32r/lib/putuser.S +--- linux-2.6.16.5.orig/arch/m32r/lib/putuser.S +++ /dev/null @@ -1,84 +0,0 @@ -/* @@ -235,8 +235,8 @@ Signed-off-by: Greg Kroah-Hartman - .long 2b,bad_put_user - .long 3b,bad_put_user -.previous ---- linux-2.6.16.4.orig/include/asm-m32r/uaccess.h -+++ linux-2.6.16.4/include/asm-m32r/uaccess.h +--- linux-2.6.16.5.orig/include/asm-m32r/uaccess.h ++++ linux-2.6.16.5/include/asm-m32r/uaccess.h @@ -5,17 +5,9 @@ * linux/include/asm-m32r/uaccess.h * diff --git a/queue-2.6.16/mpbl0010-driver-sysfs-permissions-wide-open.patch b/queue-2.6.16/mpbl0010-driver-sysfs-permissions-wide-open.patch index 342553ae389..41aa24694d1 100644 --- a/queue-2.6.16/mpbl0010-driver-sysfs-permissions-wide-open.patch +++ b/queue-2.6.16/mpbl0010-driver-sysfs-permissions-wide-open.patch @@ -25,8 +25,8 @@ Signed-off-by: Greg Kroah-Hartman drivers/char/tlclk.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) ---- linux-2.6.16.4.orig/drivers/char/tlclk.c -+++ linux-2.6.16.4/drivers/char/tlclk.c +--- linux-2.6.16.5.orig/drivers/char/tlclk.c ++++ linux-2.6.16.5/drivers/char/tlclk.c @@ -327,7 +327,7 @@ static ssize_t store_received_ref_clk3a( return strnlen(buf, count); } diff --git a/queue-2.6.16/netfilter-fix-fragmentation-issues-with-bridge-netfilter.patch b/queue-2.6.16/netfilter-fix-fragmentation-issues-with-bridge-netfilter.patch index 18e4d3fe42f..43944c0bfec 100644 --- a/queue-2.6.16/netfilter-fix-fragmentation-issues-with-bridge-netfilter.patch +++ b/queue-2.6.16/netfilter-fix-fragmentation-issues-with-bridge-netfilter.patch @@ -22,8 +22,8 @@ Signed-off-by: Greg Kroah-Hartman net/ipv4/ip_output.c | 6 +++--- 3 files changed, 15 insertions(+), 5 deletions(-) ---- linux-2.6.16.4.orig/include/net/ip.h -+++ linux-2.6.16.4/include/net/ip.h +--- linux-2.6.16.5.orig/include/net/ip.h ++++ linux-2.6.16.5/include/net/ip.h @@ -95,6 +95,7 @@ extern int ip_local_deliver(struct sk_b extern int ip_mr_input(struct sk_buff *skb); extern int ip_output(struct sk_buff *skb); @@ -32,8 +32,8 @@ Signed-off-by: Greg Kroah-Hartman extern int ip_do_nat(struct sk_buff *skb); extern void ip_send_check(struct iphdr *ip); extern int ip_queue_xmit(struct sk_buff *skb, int ipfragok); ---- linux-2.6.16.4.orig/net/bridge/br_netfilter.c -+++ linux-2.6.16.4/net/bridge/br_netfilter.c +--- linux-2.6.16.5.orig/net/bridge/br_netfilter.c ++++ linux-2.6.16.5/net/bridge/br_netfilter.c @@ -739,6 +739,15 @@ out: return NF_STOLEN; } @@ -68,8 +68,8 @@ Signed-off-by: Greg Kroah-Hartman #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) || ((out->priv_flags & IFF_802_1Q_VLAN) && VLAN_DEV_INFO(out)->real_dev->hard_start_xmit == br_dev_xmit) ---- linux-2.6.16.4.orig/net/ipv4/ip_output.c -+++ linux-2.6.16.4/net/ipv4/ip_output.c +--- linux-2.6.16.5.orig/net/ipv4/ip_output.c ++++ linux-2.6.16.5/net/ipv4/ip_output.c @@ -86,8 +86,6 @@ int sysctl_ip_default_ttl = IPDEFTTL; diff --git a/queue-2.6.16/powerpc-fix-incorrect-sa_onstack-behaviour-for-64-bit-processes.patch b/queue-2.6.16/powerpc-fix-incorrect-sa_onstack-behaviour-for-64-bit-processes.patch index 04b12694bff..c890895de3e 100644 --- a/queue-2.6.16/powerpc-fix-incorrect-sa_onstack-behaviour-for-64-bit-processes.patch +++ b/queue-2.6.16/powerpc-fix-incorrect-sa_onstack-behaviour-for-64-bit-processes.patch @@ -30,8 +30,8 @@ Signed-off-by: Greg Kroah-Hartman arch/powerpc/kernel/signal_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- linux-2.6.16.4.orig/arch/powerpc/kernel/signal_64.c -+++ linux-2.6.16.4/arch/powerpc/kernel/signal_64.c +--- linux-2.6.16.5.orig/arch/powerpc/kernel/signal_64.c ++++ linux-2.6.16.5/arch/powerpc/kernel/signal_64.c @@ -213,7 +213,7 @@ static inline void __user * get_sigframe /* Default to using normal stack */ newsp = regs->gpr[1]; diff --git a/queue-2.6.16/powerpc-iseries-needs-slb_initialize-to-be-called.patch b/queue-2.6.16/powerpc-iseries-needs-slb_initialize-to-be-called.patch index 970302e1382..aac21eb5ea6 100644 --- a/queue-2.6.16/powerpc-iseries-needs-slb_initialize-to-be-called.patch +++ b/queue-2.6.16/powerpc-iseries-needs-slb_initialize-to-be-called.patch @@ -22,8 +22,8 @@ Signed-off-by: Greg Kroah-Hartman arch/powerpc/kernel/setup_64.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) ---- linux-2.6.16.4.orig/arch/powerpc/kernel/setup_64.c -+++ linux-2.6.16.4/arch/powerpc/kernel/setup_64.c +--- linux-2.6.16.5.orig/arch/powerpc/kernel/setup_64.c ++++ linux-2.6.16.5/arch/powerpc/kernel/setup_64.c @@ -256,12 +256,10 @@ void __init early_setup(unsigned long dt /* * Initialize stab / SLB management except on iSeries diff --git a/queue-2.6.16/series b/queue-2.6.16/series index 0b40c5a86e9..8223475264d 100644 --- a/queue-2.6.16/series +++ b/queue-2.6.16/series @@ -15,3 +15,5 @@ cciss-bug-fix-for-crash-when-running-hpacucli.patch alpha-smp-boot-fixes.patch XFS-Fix-utime-2-in-the-case-that-no-times-parameter-was-passed-in.patch RLIMIT_CPU-fix-handling-of-a-zero-limit.patch +CIFS-Incorrect-signature-sent-on-SMB-Read.patch +Fix-suspend-with-traced-tasks.patch diff --git a/queue-2.6.16/sky2-bad-memory-reference-on-dual-port-cards.patch b/queue-2.6.16/sky2-bad-memory-reference-on-dual-port-cards.patch index a98a1951e00..8f9d367fb91 100644 --- a/queue-2.6.16/sky2-bad-memory-reference-on-dual-port-cards.patch +++ b/queue-2.6.16/sky2-bad-memory-reference-on-dual-port-cards.patch @@ -19,8 +19,8 @@ Signed-off-by: Greg Kroah-Hartman drivers/net/sky2.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) ---- linux-2.6.16.4.orig/drivers/net/sky2.c -+++ linux-2.6.16.4/drivers/net/sky2.c +--- linux-2.6.16.5.orig/drivers/net/sky2.c ++++ linux-2.6.16.5/drivers/net/sky2.c @@ -579,8 +579,8 @@ static void sky2_mac_init(struct sky2_hw reg = gma_read16(hw, port, GM_PHY_ADDR); gma_write16(hw, port, GM_PHY_ADDR, reg | GM_PAR_MIB_CLR); @@ -32,8 +32,8 @@ Signed-off-by: Greg Kroah-Hartman gma_write16(hw, port, GM_PHY_ADDR, reg); /* transmit control */ ---- linux-2.6.16.4.orig/drivers/net/sky2.h -+++ linux-2.6.16.4/drivers/net/sky2.h +--- linux-2.6.16.5.orig/drivers/net/sky2.h ++++ linux-2.6.16.5/drivers/net/sky2.h @@ -1380,6 +1380,7 @@ enum { /* MIB Counters */ #define GM_MIB_CNT_BASE 0x0100 /* Base Address of MIB Counters */