From: Greg KH Date: Thu, 9 Jun 2005 05:42:57 +0000 (-0700) Subject: put patches in proper kernel format, and refresh them to apply with no fuzz. X-Git-Tag: v2.6.11.12~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d15f06fb2788d82c7b4a87716e4f53c4faf96553;p=thirdparty%2Fkernel%2Fstable-queue.git put patches in proper kernel format, and refresh them to apply with no fuzz. --- diff --git a/queue/bridge-fdb-postfilter.patch b/queue/bridge-fdb-postfilter.patch index 08264b73409..546a2479f74 100644 --- a/queue/bridge-fdb-postfilter.patch +++ b/queue/bridge-fdb-postfilter.patch @@ -13,11 +13,14 @@ Signed-off-by: Stephen Hemminger Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman -Index: 2.6.11.11-net/net/bridge/br_input.c -=================================================================== ---- 2.6.11.11-net.orig/net/bridge/br_input.c -+++ 2.6.11.11-net/net/bridge/br_input.c -@@ -54,6 +54,9 @@ int br_handle_frame_finish(struct sk_buf +--- + net/bridge/br_input.c | 6 ++++-- + net/bridge/br_stp_bpdu.c | 3 +++ + 2 files changed, 7 insertions(+), 2 deletions(-) + +--- linux-2.6.11.10.orig/net/bridge/br_input.c 2005-05-16 10:51:56.000000000 -0700 ++++ linux-2.6.11.10/net/bridge/br_input.c 2005-06-08 22:40:37.000000000 -0700 +@@ -54,6 +54,9 @@ struct net_bridge_fdb_entry *dst; int passedup = 0; @@ -27,7 +30,7 @@ Index: 2.6.11.11-net/net/bridge/br_input.c if (br->dev->flags & IFF_PROMISC) { struct sk_buff *skb2; -@@ -108,8 +111,7 @@ int br_handle_frame(struct net_bridge_po +@@ -108,8 +111,7 @@ if (eth_hdr(skb)->h_source[0] & 1) goto err; @@ -37,11 +40,9 @@ Index: 2.6.11.11-net/net/bridge/br_input.c br_fdb_insert(p->br, p, eth_hdr(skb)->h_source, 0); if (p->br->stp_enabled && -Index: 2.6.11.11-net/net/bridge/br_stp_bpdu.c -=================================================================== ---- 2.6.11.11-net.orig/net/bridge/br_stp_bpdu.c -+++ 2.6.11.11-net/net/bridge/br_stp_bpdu.c -@@ -140,6 +140,9 @@ int br_stp_handle_bpdu(struct sk_buff *s +--- linux-2.6.11.10.orig/net/bridge/br_stp_bpdu.c 2005-05-16 10:51:56.000000000 -0700 ++++ linux-2.6.11.10/net/bridge/br_stp_bpdu.c 2005-06-08 22:40:37.000000000 -0700 +@@ -140,6 +140,9 @@ struct net_bridge *br = p->br; unsigned char *buf; diff --git a/queue/bttv-vc100.patch b/queue/bttv-vc100.patch index e6c843faad6..dc8bfd247a9 100644 --- a/queue/bttv-vc100.patch +++ b/queue/bttv-vc100.patch @@ -18,8 +18,12 @@ Signed-off-by: Linus Torvalds Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman ---- ./drivers/media/video/bttv-cards.c.orig 2005-04-24 23:39:41.000000000 +0100 -+++ ./drivers/media/video/bttv-cards.c 2005-04-25 19:59:27.000000000 +0100 +--- + drivers/media/video/bttv-cards.c | 1 - + 1 files changed, 1 deletion(-) + +--- linux-2.6.11.10.orig/drivers/media/video/bttv-cards.c 2005-05-16 10:50:32.000000000 -0700 ++++ linux-2.6.11.10/drivers/media/video/bttv-cards.c 2005-06-08 22:40:30.000000000 -0700 @@ -1939,7 +1939,6 @@ .no_tda9875 = 1, .no_tda7432 = 1, diff --git a/queue/fix-log_do_checkpoint-assertion-failure.patch b/queue/fix-log_do_checkpoint-assertion-failure.patch index 39eaae85c4e..e6b685a7716 100644 --- a/queue/fix-log_do_checkpoint-assertion-failure.patch +++ b/queue/fix-log_do_checkpoint-assertion-failure.patch @@ -18,10 +18,13 @@ Signed-off-by: Andrew Morton Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman -diff -rupX /home/jack/.kerndiffexclude linux-2.6.12-rc5/fs/jbd/checkpoint.c linux-2.6.12-rc5-1-checkretry/fs/jbd/checkpoint.c ---- linux-2.6.12-rc5/fs/jbd/checkpoint.c 2005-03-03 18:58:29.000000000 +0100 -+++ linux-2.6.12-rc5-1-checkretry/fs/jbd/checkpoint.c 2005-05-27 11:15:31.000000000 +0200 -@@ -339,8 +339,10 @@ int log_do_checkpoint(journal_t *journal +--- + fs/jbd/checkpoint.c | 4 +++- + 1 files changed, 3 insertions(+), 1 deletion(-) + +--- linux-2.6.11.10.orig/fs/jbd/checkpoint.c 2005-05-16 10:50:47.000000000 -0700 ++++ linux-2.6.11.10/fs/jbd/checkpoint.c 2005-06-08 22:40:33.000000000 -0700 +@@ -339,8 +339,10 @@ } } while (jh != last_jh && !retry); diff --git a/queue/fix-pte_unmap.patch b/queue/fix-pte_unmap.patch index a47770d7b98..cf1d7969ecb 100644 --- a/queue/fix-pte_unmap.patch +++ b/queue/fix-pte_unmap.patch @@ -29,8 +29,12 @@ Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman ---- gregkh-2.6.11.10.orig/mm/rmap.c 2005-05-16 10:51:55.000000000 -0700 -+++ gregkh-2.6.11.10/mm/rmap.c 2005-05-26 22:01:49.000000000 -0700 +--- + mm/rmap.c | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +--- linux-2.6.11.10.orig/mm/rmap.c 2005-05-16 10:51:55.000000000 -0700 ++++ linux-2.6.11.10/mm/rmap.c 2005-06-08 22:38:26.000000000 -0700 @@ -641,7 +641,7 @@ pgd_t *pgd; pud_t *pud; @@ -58,9 +62,3 @@ Signed-off-by: Greg Kroah-Hartman out_unlock: spin_unlock(&mm->page_table_lock); - -_______________________________________________ -stable mailing list -stable@linux.kernel.org -http://linux.kernel.org/mailman/listinfo/stable - diff --git a/queue/hfsplus-oops-hfs-leak-fix.patch b/queue/hfsplus-oops-hfs-leak-fix.patch index dd8699bf3dc..6c2bc3d0ef2 100644 --- a/queue/hfsplus-oops-hfs-leak-fix.patch +++ b/queue/hfsplus-oops-hfs-leak-fix.patch @@ -24,11 +24,10 @@ Signed-off-by: Greg Kroah-Hartman fs/hfsplus/super.c | 6 +++++- 3 files changed, 13 insertions(+), 6 deletions(-) -Index: release-2.6.11/fs/hfs/mdb.c -=================================================================== ---- release-2.6.11.orig/fs/hfs/mdb.c -+++ release-2.6.11/fs/hfs/mdb.c -@@ -333,6 +333,8 @@ void hfs_mdb_close(struct super_block *s +--- +--- linux-2.6.11.10.orig/fs/hfs/mdb.c 2005-05-16 10:50:47.000000000 -0700 ++++ linux-2.6.11.10/fs/hfs/mdb.c 2005-06-08 22:40:19.000000000 -0700 +@@ -333,6 +333,8 @@ * Release the resources associated with the in-core MDB. */ void hfs_mdb_put(struct super_block *sb) { @@ -37,7 +36,7 @@ Index: release-2.6.11/fs/hfs/mdb.c /* free the B-trees */ hfs_btree_close(HFS_SB(sb)->ext_tree); hfs_btree_close(HFS_SB(sb)->cat_tree); -@@ -340,4 +342,7 @@ void hfs_mdb_put(struct super_block *sb) +@@ -340,4 +342,7 @@ /* free the buffers holding the primary and alternate MDBs */ brelse(HFS_SB(sb)->mdb_bh); brelse(HFS_SB(sb)->alt_mdb_bh); @@ -45,11 +44,9 @@ Index: release-2.6.11/fs/hfs/mdb.c + kfree(HFS_SB(sb)); + sb->s_fs_info = NULL; } -Index: release-2.6.11/fs/hfs/super.c -=================================================================== ---- release-2.6.11.orig/fs/hfs/super.c -+++ release-2.6.11/fs/hfs/super.c -@@ -263,7 +263,7 @@ static int hfs_fill_super(struct super_b +--- linux-2.6.11.10.orig/fs/hfs/super.c 2005-05-16 10:50:47.000000000 -0700 ++++ linux-2.6.11.10/fs/hfs/super.c 2005-06-08 22:40:19.000000000 -0700 +@@ -263,7 +263,7 @@ res = -EINVAL; if (!parse_options((char *)data, sbi)) { hfs_warn("hfs_fs: unable to parse mount options.\n"); @@ -58,7 +55,7 @@ Index: release-2.6.11/fs/hfs/super.c } sb->s_op = &hfs_super_operations; -@@ -276,7 +276,7 @@ static int hfs_fill_super(struct super_b +@@ -276,7 +276,7 @@ hfs_warn("VFS: Can't find a HFS filesystem on dev %s.\n", hfs_mdb_name(sb)); res = -EINVAL; @@ -67,7 +64,7 @@ Index: release-2.6.11/fs/hfs/super.c } /* try to get the root inode */ -@@ -306,10 +306,8 @@ bail_iput: +@@ -306,10 +306,8 @@ iput(root_inode); bail_no_root: hfs_warn("hfs_fs: get root inode failed.\n"); @@ -79,11 +76,9 @@ Index: release-2.6.11/fs/hfs/super.c return res; } -Index: release-2.6.11/fs/hfsplus/super.c -=================================================================== ---- release-2.6.11.orig/fs/hfsplus/super.c -+++ release-2.6.11/fs/hfsplus/super.c -@@ -207,7 +207,9 @@ static void hfsplus_write_super(struct s +--- linux-2.6.11.10.orig/fs/hfsplus/super.c 2005-05-16 10:50:47.000000000 -0700 ++++ linux-2.6.11.10/fs/hfsplus/super.c 2005-06-08 22:40:19.000000000 -0700 +@@ -207,7 +207,9 @@ static void hfsplus_put_super(struct super_block *sb) { dprint(DBG_SUPER, "hfsplus_put_super\n"); @@ -94,7 +89,7 @@ Index: release-2.6.11/fs/hfsplus/super.c struct hfsplus_vh *vhdr = HFSPLUS_SB(sb).s_vhdr; vhdr->modify_date = hfsp_now2mt(); -@@ -223,6 +225,8 @@ static void hfsplus_put_super(struct sup +@@ -223,6 +225,8 @@ iput(HFSPLUS_SB(sb).alloc_file); iput(HFSPLUS_SB(sb).hidden_dir); brelse(HFSPLUS_SB(sb).s_vhbh); diff --git a/queue/netem-duplication-fix.patch b/queue/netem-duplication-fix.patch index 53e55814033..3ac5daea18a 100644 --- a/queue/netem-duplication-fix.patch +++ b/queue/netem-duplication-fix.patch @@ -11,11 +11,13 @@ Signed-off-by: Stephen Hemminger Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman -Index: 2.6.11.11-net/net/sched/sch_netem.c -=================================================================== ---- 2.6.11.11-net.orig/net/sched/sch_netem.c -+++ 2.6.11.11-net/net/sched/sch_netem.c -@@ -184,10 +184,15 @@ static int netem_enqueue(struct sk_buff +--- + net/sched/sch_netem.c | 13 +++++++++---- + 1 files changed, 9 insertions(+), 4 deletions(-) + +--- linux-2.6.11.10.orig/net/sched/sch_netem.c 2005-05-16 10:52:03.000000000 -0700 ++++ linux-2.6.11.10/net/sched/sch_netem.c 2005-06-08 22:40:40.000000000 -0700 +@@ -184,10 +184,15 @@ /* Random duplication */ if (q->duplicate && q->duplicate >= get_crandom(&q->dup_cor)) { struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC); @@ -25,7 +27,7 @@ Index: 2.6.11.11-net/net/sched/sch_netem.c - delay_skb(sch, skb2); + if (skb2) { + struct Qdisc *rootq = sch->dev->qdisc; -+ u32 dupsave = q->duplicate; ++ u32 dupsave = q->duplicate; + + /* prevent duplicating a dup... */ + q->duplicate = 0; diff --git a/queue/netfilter-ip_queue-deadlock-fix.patch b/queue/netfilter-ip_queue-deadlock-fix.patch index 3eb497bcb8a..74a4f71cbcb 100644 --- a/queue/netfilter-ip_queue-deadlock-fix.patch +++ b/queue/netfilter-ip_queue-deadlock-fix.patch @@ -23,8 +23,12 @@ Signed-off-by: David S. Miller Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman ---- 1/net/ipv4/netfilter/ip_queue.c 2005-05-27 09:44:32.000000000 +0200 -+++ 2/net/ipv4/netfilter/ip_queue.c 2005-05-27 09:47:13.000000000 +0200 +--- + net/ipv4/netfilter/ip_queue.c | 10 ++++++++++ + 1 files changed, 10 insertions(+) + +--- linux-2.6.11.10.orig/net/ipv4/netfilter/ip_queue.c 2005-05-16 10:51:59.000000000 -0700 ++++ linux-2.6.11.10/net/ipv4/netfilter/ip_queue.c 2005-06-08 22:40:10.000000000 -0700 @@ -3,6 +3,7 @@ * communicating with userspace via netlink. * diff --git a/queue/x86_64-avoid-SMP-bootup-race.patch b/queue/x86_64-avoid-SMP-bootup-race.patch index 9fd7cd54756..8b17b666b29 100644 --- a/queue/x86_64-avoid-SMP-bootup-race.patch +++ b/queue/x86_64-avoid-SMP-bootup-race.patch @@ -22,9 +22,13 @@ Signed-off-by: ak@suse.de Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman -diff -u linux/arch/x86_64/kernel/apic.c-o linux/arch/x86_64/kernel/apic.c ---- linux/arch/x86_64/kernel/apic.c-o 2005-05-31 16:40:01.000000000 +0200 -+++ linux/arch/x86_64/kernel/apic.c 2005-05-31 16:44:05.000000000 +0200 +--- + arch/x86_64/kernel/apic.c | 2 -- + arch/x86_64/kernel/smpboot.c | 4 ---- + 2 files changed, 6 deletions(-) + +--- linux-2.6.11.10.orig/arch/x86_64/kernel/apic.c 2005-05-16 10:50:31.000000000 -0700 ++++ linux-2.6.11.10/arch/x86_64/kernel/apic.c 2005-06-08 22:40:23.000000000 -0700 @@ -775,9 +775,7 @@ void __init setup_secondary_APIC_clock(void) @@ -35,9 +39,8 @@ diff -u linux/arch/x86_64/kernel/apic.c-o linux/arch/x86_64/kernel/apic.c } void __init disable_APIC_timer(void) -diff -u linux/arch/x86_64/kernel/smpboot.c-o linux-2.6.11/arch/x86_64/kernel/smpboot.c ---- linux/arch/x86_64/kernel/smpboot.c-o 2005-03-21 14:04:11.000000000 +0100 -+++ linux/arch/x86_64/kernel/smpboot.c 2005-05-31 16:44:07.000000000 +0200 +--- linux-2.6.11.10.orig/arch/x86_64/kernel/smpboot.c 2005-05-16 10:50:31.000000000 -0700 ++++ linux-2.6.11.10/arch/x86_64/kernel/smpboot.c 2005-06-08 22:40:23.000000000 -0700 @@ -309,8 +309,6 @@ Dprintk("CALLIN, before setup_local_APIC().\n"); setup_local_APIC(); @@ -56,4 +59,3 @@ diff -u linux/arch/x86_64/kernel/smpboot.c-o linux-2.6.11/arch/x86_64/kernel/smp /* * Allow the master to continue. */ - diff --git a/queue/x86_64-fix-ptrace-boundary-check.patch b/queue/x86_64-fix-ptrace-boundary-check.patch index 4ff616946cc..a4135fe6aa6 100644 --- a/queue/x86_64-fix-ptrace-boundary-check.patch +++ b/queue/x86_64-fix-ptrace-boundary-check.patch @@ -14,14 +14,13 @@ Signed-off-by: Andi Kleen Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman +--- arch/x86_64/kernel/ptrace.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -Index: release-2.6.11/arch/x86_64/kernel/ptrace.c -=================================================================== ---- release-2.6.11.orig/arch/x86_64/kernel/ptrace.c -+++ release-2.6.11/arch/x86_64/kernel/ptrace.c -@@ -252,7 +252,7 @@ asmlinkage long sys_ptrace(long request, +--- linux-2.6.11.10.orig/arch/x86_64/kernel/ptrace.c 2005-05-16 10:50:31.000000000 -0700 ++++ linux-2.6.11.10/arch/x86_64/kernel/ptrace.c 2005-06-08 22:40:26.000000000 -0700 +@@ -247,7 +247,7 @@ break; switch (addr) { @@ -30,7 +29,7 @@ Index: release-2.6.11/arch/x86_64/kernel/ptrace.c tmp = getreg(child, addr); break; case offsetof(struct user, u_debugreg[0]): -@@ -297,7 +297,7 @@ asmlinkage long sys_ptrace(long request, +@@ -292,7 +292,7 @@ break; switch (addr) {