From: Chris Wright Date: Wed, 29 Nov 2006 21:38:35 +0000 (-0800) Subject: push current queue out for review X-Git-Tag: v2.6.18.5~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c4559b24fe605a807f957c6fbb3e5ec41a8f36f4;p=thirdparty%2Fkernel%2Fstable-queue.git push current queue out for review --- diff --git a/queue-2.6.18/agp-allocate-agp-pages-with-gfp_dma32-by-default.patch b/review-2.6.18/agp-allocate-agp-pages-with-gfp_dma32-by-default.patch similarity index 90% rename from queue-2.6.18/agp-allocate-agp-pages-with-gfp_dma32-by-default.patch rename to review-2.6.18/agp-allocate-agp-pages-with-gfp_dma32-by-default.patch index b94d5479c4c..de3f778bae3 100644 --- a/queue-2.6.18/agp-allocate-agp-pages-with-gfp_dma32-by-default.patch +++ b/review-2.6.18/agp-allocate-agp-pages-with-gfp_dma32-by-default.patch @@ -36,8 +36,8 @@ Signed-off-by: Chris Wright drivers/char/agp/intel-agp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---- linux-2.6.18.3.orig/drivers/char/agp/generic.c -+++ linux-2.6.18.3/drivers/char/agp/generic.c +--- linux-2.6.18.4.orig/drivers/char/agp/generic.c ++++ linux-2.6.18.4/drivers/char/agp/generic.c @@ -1042,7 +1042,7 @@ void *agp_generic_alloc_page(struct agp_ { struct page * page; @@ -47,8 +47,8 @@ Signed-off-by: Chris Wright if (page == NULL) return NULL; ---- linux-2.6.18.3.orig/drivers/char/agp/intel-agp.c -+++ linux-2.6.18.3/drivers/char/agp/intel-agp.c +--- linux-2.6.18.4.orig/drivers/char/agp/intel-agp.c ++++ linux-2.6.18.4/drivers/char/agp/intel-agp.c @@ -160,7 +160,7 @@ static void *i8xx_alloc_pages(void) { struct page * page; diff --git a/queue-2.6.18/alpha-fix-alpha_ev56-dependencies-typo.patch b/review-2.6.18/alpha-fix-alpha_ev56-dependencies-typo.patch similarity index 92% rename from queue-2.6.18/alpha-fix-alpha_ev56-dependencies-typo.patch rename to review-2.6.18/alpha-fix-alpha_ev56-dependencies-typo.patch index 680884e10f4..2838c7f1bf6 100644 --- a/queue-2.6.18/alpha-fix-alpha_ev56-dependencies-typo.patch +++ b/review-2.6.18/alpha-fix-alpha_ev56-dependencies-typo.patch @@ -21,8 +21,8 @@ Signed-off-by: Chris Wright arch/alpha/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- linux-2.6.18.3.orig/arch/alpha/Kconfig -+++ linux-2.6.18.3/arch/alpha/Kconfig +--- linux-2.6.18.4.orig/arch/alpha/Kconfig ++++ linux-2.6.18.4/arch/alpha/Kconfig @@ -381,7 +381,7 @@ config ALPHA_EV56 config ALPHA_EV56 diff --git a/queue-2.6.18/bcm43xx-drain-tx-status-before-starting-irqs.patch b/review-2.6.18/bcm43xx-drain-tx-status-before-starting-irqs.patch similarity index 93% rename from queue-2.6.18/bcm43xx-drain-tx-status-before-starting-irqs.patch rename to review-2.6.18/bcm43xx-drain-tx-status-before-starting-irqs.patch index f8147484dfb..3e5e4e847a7 100644 --- a/queue-2.6.18/bcm43xx-drain-tx-status-before-starting-irqs.patch +++ b/review-2.6.18/bcm43xx-drain-tx-status-before-starting-irqs.patch @@ -21,8 +21,8 @@ Signed-off-by: Chris Wright drivers/net/wireless/bcm43xx/bcm43xx_main.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) ---- linux-2.6.18.3.orig/drivers/net/wireless/bcm43xx/bcm43xx_main.c -+++ linux-2.6.18.3/drivers/net/wireless/bcm43xx/bcm43xx_main.c +--- linux-2.6.18.4.orig/drivers/net/wireless/bcm43xx/bcm43xx_main.c ++++ linux-2.6.18.4/drivers/net/wireless/bcm43xx/bcm43xx_main.c @@ -1463,6 +1463,23 @@ static void handle_irq_transmit_status(s } } diff --git a/queue-2.6.18/bluetooth-fix-unaligned-access-in-hci_send_to_sock.patch b/review-2.6.18/bluetooth-fix-unaligned-access-in-hci_send_to_sock.patch similarity index 93% rename from queue-2.6.18/bluetooth-fix-unaligned-access-in-hci_send_to_sock.patch rename to review-2.6.18/bluetooth-fix-unaligned-access-in-hci_send_to_sock.patch index bfc9e078d1c..53b024508fd 100644 --- a/queue-2.6.18/bluetooth-fix-unaligned-access-in-hci_send_to_sock.patch +++ b/review-2.6.18/bluetooth-fix-unaligned-access-in-hci_send_to_sock.patch @@ -19,8 +19,8 @@ Signed-off-by: Chris Wright net/bluetooth/hci_sock.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) ---- linux-2.6.18.3.orig/net/bluetooth/hci_sock.c -+++ linux-2.6.18.3/net/bluetooth/hci_sock.c +--- linux-2.6.18.4.orig/net/bluetooth/hci_sock.c ++++ linux-2.6.18.4/net/bluetooth/hci_sock.c @@ -120,10 +120,13 @@ void hci_send_to_sock(struct hci_dev *hd if (!hci_test_bit(evt, &flt->event_mask)) continue; diff --git a/queue-2.6.18/bte_unaligned_copy-transfers-one-extra-cache-line.patch b/review-2.6.18/bte_unaligned_copy-transfers-one-extra-cache-line.patch similarity index 94% rename from queue-2.6.18/bte_unaligned_copy-transfers-one-extra-cache-line.patch rename to review-2.6.18/bte_unaligned_copy-transfers-one-extra-cache-line.patch index 7a4f422e7e6..b227a5560c5 100644 --- a/queue-2.6.18/bte_unaligned_copy-transfers-one-extra-cache-line.patch +++ b/review-2.6.18/bte_unaligned_copy-transfers-one-extra-cache-line.patch @@ -22,8 +22,8 @@ Signed-off-by: Chris Wright arch/ia64/sn/kernel/bte.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) ---- linux-2.6.18.3.orig/arch/ia64/sn/kernel/bte.c -+++ linux-2.6.18.3/arch/ia64/sn/kernel/bte.c +--- linux-2.6.18.4.orig/arch/ia64/sn/kernel/bte.c ++++ linux-2.6.18.4/arch/ia64/sn/kernel/bte.c @@ -382,14 +382,13 @@ bte_result_t bte_unaligned_copy(u64 src, * bcopy to the destination. */ diff --git a/queue-2.6.18/fuse-fix-oops-in-lookup.patch b/review-2.6.18/fuse-fix-oops-in-lookup.patch similarity index 98% rename from queue-2.6.18/fuse-fix-oops-in-lookup.patch rename to review-2.6.18/fuse-fix-oops-in-lookup.patch index bba48ccb138..52e852297f4 100644 --- a/queue-2.6.18/fuse-fix-oops-in-lookup.patch +++ b/review-2.6.18/fuse-fix-oops-in-lookup.patch @@ -29,8 +29,8 @@ Signed-off-by: Chris Wright fs/fuse/dir.c | 52 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 14 deletions(-) ---- linux-2.6.18.3.orig/fs/fuse/dir.c -+++ linux-2.6.18.3/fs/fuse/dir.c +--- linux-2.6.18.4.orig/fs/fuse/dir.c ++++ linux-2.6.18.4/fs/fuse/dir.c @@ -138,6 +138,7 @@ static int fuse_dentry_revalidate(struct struct fuse_entry_out outarg; struct fuse_conn *fc; diff --git a/queue-2.6.18/ipv6-fix-address-interface-handling-in-udp-and-dccp-according-to-the-scoping-architecture.patch b/review-2.6.18/ipv6-fix-address-interface-handling-in-udp-and-dccp-according-to-the-scoping-architecture.patch similarity index 93% rename from queue-2.6.18/ipv6-fix-address-interface-handling-in-udp-and-dccp-according-to-the-scoping-architecture.patch rename to review-2.6.18/ipv6-fix-address-interface-handling-in-udp-and-dccp-according-to-the-scoping-architecture.patch index 7f8ae50a44b..a274770b085 100644 --- a/queue-2.6.18/ipv6-fix-address-interface-handling-in-udp-and-dccp-according-to-the-scoping-architecture.patch +++ b/review-2.6.18/ipv6-fix-address-interface-handling-in-udp-and-dccp-according-to-the-scoping-architecture.patch @@ -18,8 +18,8 @@ Signed-off-by: Chris Wright net/ipv6/udp.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) ---- linux-2.6.18.3.orig/net/dccp/ipv6.c -+++ linux-2.6.18.3/net/dccp/ipv6.c +--- linux-2.6.18.4.orig/net/dccp/ipv6.c ++++ linux-2.6.18.4/net/dccp/ipv6.c @@ -276,7 +276,7 @@ static void dccp_v6_err(struct sk_buff * __u64 seq; @@ -29,8 +29,8 @@ Signed-off-by: Chris Wright if (sk == NULL) { ICMP6_INC_STATS_BH(__in6_dev_get(skb->dev), ICMP6_MIB_INERRORS); ---- linux-2.6.18.3.orig/net/ipv6/udp.c -+++ linux-2.6.18.3/net/ipv6/udp.c +--- linux-2.6.18.4.orig/net/ipv6/udp.c ++++ linux-2.6.18.4/net/ipv6/udp.c @@ -314,14 +314,13 @@ static void udpv6_err(struct sk_buff *sk { struct ipv6_pinfo *np; diff --git a/queue-2.6.18/netfilter-arp_tables-missing-unregistration-on-module-unload.patch b/review-2.6.18/netfilter-arp_tables-missing-unregistration-on-module-unload.patch similarity index 91% rename from queue-2.6.18/netfilter-arp_tables-missing-unregistration-on-module-unload.patch rename to review-2.6.18/netfilter-arp_tables-missing-unregistration-on-module-unload.patch index 68a46289464..fbae2a3cb43 100644 --- a/queue-2.6.18/netfilter-arp_tables-missing-unregistration-on-module-unload.patch +++ b/review-2.6.18/netfilter-arp_tables-missing-unregistration-on-module-unload.patch @@ -20,8 +20,8 @@ committer Patrick McHardy Fri, 17 Nov 2006 06:24:43 +0100 net/ipv4/netfilter/arp_tables.c | 2 ++ 1 file changed, 2 insertions(+) ---- linux-2.6.18.3.orig/net/ipv4/netfilter/arp_tables.c -+++ linux-2.6.18.3/net/ipv4/netfilter/arp_tables.c +--- linux-2.6.18.4.orig/net/ipv4/netfilter/arp_tables.c ++++ linux-2.6.18.4/net/ipv4/netfilter/arp_tables.c @@ -1211,6 +1211,8 @@ err1: static void __exit arp_tables_fini(void) { diff --git a/queue-2.6.18/netfilter-h.323-conntrack-fix-crash-with-config_ip_nf_ct_acct.patch b/review-2.6.18/netfilter-h.323-conntrack-fix-crash-with-config_ip_nf_ct_acct.patch similarity index 93% rename from queue-2.6.18/netfilter-h.323-conntrack-fix-crash-with-config_ip_nf_ct_acct.patch rename to review-2.6.18/netfilter-h.323-conntrack-fix-crash-with-config_ip_nf_ct_acct.patch index 66de2c4a286..84ab9dc9e93 100644 --- a/queue-2.6.18/netfilter-h.323-conntrack-fix-crash-with-config_ip_nf_ct_acct.patch +++ b/review-2.6.18/netfilter-h.323-conntrack-fix-crash-with-config_ip_nf_ct_acct.patch @@ -27,8 +27,8 @@ committer Patrick McHardy Fri, 17 Nov 2006 21:01:25 +0100 net/ipv4/netfilter/ip_conntrack_helper_h323.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---- linux-2.6.18.3.orig/net/ipv4/netfilter/ip_conntrack_helper_h323.c -+++ linux-2.6.18.3/net/ipv4/netfilter/ip_conntrack_helper_h323.c +--- linux-2.6.18.4.orig/net/ipv4/netfilter/ip_conntrack_helper_h323.c ++++ linux-2.6.18.4/net/ipv4/netfilter/ip_conntrack_helper_h323.c @@ -1417,7 +1417,7 @@ static int process_rcf(struct sk_buff ** DEBUGP ("ip_ct_ras: set RAS connection timeout to %u seconds\n", diff --git a/queue-2.6.18/netfilter-honour-source-routing-for-lvs-nat.patch b/review-2.6.18/netfilter-honour-source-routing-for-lvs-nat.patch similarity index 89% rename from queue-2.6.18/netfilter-honour-source-routing-for-lvs-nat.patch rename to review-2.6.18/netfilter-honour-source-routing-for-lvs-nat.patch index e8142eabe2e..8c210f899b6 100644 --- a/queue-2.6.18/netfilter-honour-source-routing-for-lvs-nat.patch +++ b/review-2.6.18/netfilter-honour-source-routing-for-lvs-nat.patch @@ -37,8 +37,8 @@ committer Patrick McHardy Fri, 17 Nov 2006 06:25:11 +0100 net/ipv4/netfilter/iptable_mangle.c | 3 ++- 5 files changed, 21 insertions(+), 6 deletions(-) ---- linux-2.6.18.3.orig/include/linux/netfilter_ipv4.h -+++ linux-2.6.18.3/include/linux/netfilter_ipv4.h +--- linux-2.6.18.4.orig/include/linux/netfilter_ipv4.h ++++ linux-2.6.18.4/include/linux/netfilter_ipv4.h @@ -77,7 +77,7 @@ enum nf_ip_hook_priorities { #define SO_ORIGINAL_DST 80 @@ -48,8 +48,8 @@ committer Patrick McHardy Fri, 17 Nov 2006 06:25:11 +0100 extern int ip_xfrm_me_harder(struct sk_buff **pskb); extern unsigned int nf_ip_checksum(struct sk_buff *skb, unsigned int hook, unsigned int dataoff, u_int8_t protocol); ---- linux-2.6.18.3.orig/net/ipv4/ipvs/ip_vs_core.c -+++ linux-2.6.18.3/net/ipv4/ipvs/ip_vs_core.c +--- linux-2.6.18.4.orig/net/ipv4/ipvs/ip_vs_core.c ++++ linux-2.6.18.4/net/ipv4/ipvs/ip_vs_core.c @@ -813,6 +813,16 @@ ip_vs_out(unsigned int hooknum, struct s skb->nh.iph->saddr = cp->vaddr; ip_send_check(skb->nh.iph); @@ -67,8 +67,8 @@ committer Patrick McHardy Fri, 17 Nov 2006 06:25:11 +0100 IP_VS_DBG_PKT(10, pp, skb, 0, "After SNAT"); ip_vs_out_stats(cp, skb); ---- linux-2.6.18.3.orig/net/ipv4/netfilter.c -+++ linux-2.6.18.3/net/ipv4/netfilter.c +--- linux-2.6.18.4.orig/net/ipv4/netfilter.c ++++ linux-2.6.18.4/net/ipv4/netfilter.c @@ -8,7 +8,7 @@ #include @@ -102,8 +102,8 @@ committer Patrick McHardy Fri, 17 Nov 2006 06:25:11 +0100 } return 0; } ---- linux-2.6.18.3.orig/net/ipv4/netfilter/ip_nat_standalone.c -+++ linux-2.6.18.3/net/ipv4/netfilter/ip_nat_standalone.c +--- linux-2.6.18.4.orig/net/ipv4/netfilter/ip_nat_standalone.c ++++ linux-2.6.18.4/net/ipv4/netfilter/ip_nat_standalone.c @@ -275,7 +275,8 @@ ip_nat_local_fn(unsigned int hooknum, ct->tuplehash[!dir].tuple.src.u.all #endif @@ -114,8 +114,8 @@ committer Patrick McHardy Fri, 17 Nov 2006 06:25:11 +0100 } return ret; } ---- linux-2.6.18.3.orig/net/ipv4/netfilter/iptable_mangle.c -+++ linux-2.6.18.3/net/ipv4/netfilter/iptable_mangle.c +--- linux-2.6.18.4.orig/net/ipv4/netfilter/iptable_mangle.c ++++ linux-2.6.18.4/net/ipv4/netfilter/iptable_mangle.c @@ -157,7 +157,8 @@ ipt_local_hook(unsigned int hook, || (*pskb)->nfmark != nfmark #endif diff --git a/queue-2.6.18/netfilter-ip_tables-compat-error-way-cleanup.patch b/review-2.6.18/netfilter-ip_tables-compat-error-way-cleanup.patch similarity index 92% rename from queue-2.6.18/netfilter-ip_tables-compat-error-way-cleanup.patch rename to review-2.6.18/netfilter-ip_tables-compat-error-way-cleanup.patch index b0209c3fa22..9729a9e95e4 100644 --- a/queue-2.6.18/netfilter-ip_tables-compat-error-way-cleanup.patch +++ b/review-2.6.18/netfilter-ip_tables-compat-error-way-cleanup.patch @@ -27,8 +27,8 @@ committer Patrick McHardy Fri, 17 Nov 2006 06:22:39 +0100 net/ipv4/netfilter/ip_tables.c | 1 + 1 file changed, 1 insertion(+) ---- linux-2.6.18.3.orig/net/ipv4/netfilter/ip_tables.c -+++ linux-2.6.18.3/net/ipv4/netfilter/ip_tables.c +--- linux-2.6.18.4.orig/net/ipv4/netfilter/ip_tables.c ++++ linux-2.6.18.4/net/ipv4/netfilter/ip_tables.c @@ -1775,6 +1775,7 @@ free_newinfo: out: return ret; diff --git a/queue-2.6.18/netfilter-ip_tables-fix-module-refcount-leaks-in-compat-error-paths.patch b/review-2.6.18/netfilter-ip_tables-fix-module-refcount-leaks-in-compat-error-paths.patch similarity index 97% rename from queue-2.6.18/netfilter-ip_tables-fix-module-refcount-leaks-in-compat-error-paths.patch rename to review-2.6.18/netfilter-ip_tables-fix-module-refcount-leaks-in-compat-error-paths.patch index d87976cb502..a79ad550032 100644 --- a/queue-2.6.18/netfilter-ip_tables-fix-module-refcount-leaks-in-compat-error-paths.patch +++ b/review-2.6.18/netfilter-ip_tables-fix-module-refcount-leaks-in-compat-error-paths.patch @@ -25,8 +25,8 @@ committer Patrick McHardy Fri, 17 Nov 2006 06:23:20 +0100 net/ipv4/netfilter/ip_tables.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) ---- linux-2.6.18.3.orig/net/ipv4/netfilter/ip_tables.c -+++ linux-2.6.18.3/net/ipv4/netfilter/ip_tables.c +--- linux-2.6.18.4.orig/net/ipv4/netfilter/ip_tables.c ++++ linux-2.6.18.4/net/ipv4/netfilter/ip_tables.c @@ -1537,7 +1537,7 @@ check_compat_entry_size_and_hooks(struct ret = IPT_MATCH_ITERATE(e, compat_check_calc_match, name, &e->ip, e->comefrom, &off, &j); diff --git a/queue-2.6.18/netfilter-kconfig-fix-xt_physdev-dependencies.patch b/review-2.6.18/netfilter-kconfig-fix-xt_physdev-dependencies.patch similarity index 94% rename from queue-2.6.18/netfilter-kconfig-fix-xt_physdev-dependencies.patch rename to review-2.6.18/netfilter-kconfig-fix-xt_physdev-dependencies.patch index 463e65ae457..c8ae3c390ac 100644 --- a/queue-2.6.18/netfilter-kconfig-fix-xt_physdev-dependencies.patch +++ b/review-2.6.18/netfilter-kconfig-fix-xt_physdev-dependencies.patch @@ -24,8 +24,8 @@ committer Patrick McHardy Fri, 17 Nov 2006 06:25:31 +0100 net/netfilter/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- linux-2.6.18.3.orig/net/netfilter/Kconfig -+++ linux-2.6.18.3/net/netfilter/Kconfig +--- linux-2.6.18.4.orig/net/netfilter/Kconfig ++++ linux-2.6.18.4/net/netfilter/Kconfig @@ -342,7 +342,7 @@ config NETFILTER_XT_MATCH_MULTIPORT config NETFILTER_XT_MATCH_PHYSDEV diff --git a/queue-2.6.18/netfilter-missed-and-reordered-checks-in-arp-ip-ip6-_tables.patch b/review-2.6.18/netfilter-missed-and-reordered-checks-in-arp-ip-ip6-_tables.patch similarity index 97% rename from queue-2.6.18/netfilter-missed-and-reordered-checks-in-arp-ip-ip6-_tables.patch rename to review-2.6.18/netfilter-missed-and-reordered-checks-in-arp-ip-ip6-_tables.patch index ed7e0b6bf47..3253dc354e8 100644 --- a/queue-2.6.18/netfilter-missed-and-reordered-checks-in-arp-ip-ip6-_tables.patch +++ b/review-2.6.18/netfilter-missed-and-reordered-checks-in-arp-ip-ip6-_tables.patch @@ -53,8 +53,8 @@ committer Patrick McHardy Tue, 21 Nov 2006 11:24:51 +0100 net/ipv6/netfilter/ip6_tables.c | 53 ++++++++++++++------------------ 3 files changed, 77 insertions(+), 78 deletions(-) ---- linux-2.6.18.3.orig/net/ipv4/netfilter/arp_tables.c -+++ linux-2.6.18.3/net/ipv4/netfilter/arp_tables.c +--- linux-2.6.18.4.orig/net/ipv4/netfilter/arp_tables.c ++++ linux-2.6.18.4/net/ipv4/netfilter/arp_tables.c @@ -380,6 +380,13 @@ static int mark_source_chains(struct xt_ && unconditional(&e->arp)) { unsigned int oldpos, size; @@ -135,8 +135,8 @@ committer Patrick McHardy Tue, 21 Nov 2006 11:24:51 +0100 return ret; } ---- linux-2.6.18.3.orig/net/ipv4/netfilter/ip_tables.c -+++ linux-2.6.18.3/net/ipv4/netfilter/ip_tables.c +--- linux-2.6.18.4.orig/net/ipv4/netfilter/ip_tables.c ++++ linux-2.6.18.4/net/ipv4/netfilter/ip_tables.c @@ -404,6 +404,13 @@ mark_source_chains(struct xt_table_info && unconditional(&e->ip)) { unsigned int oldpos, size; @@ -278,8 +278,8 @@ committer Patrick McHardy Tue, 21 Nov 2006 11:24:51 +0100 err: return ret; } ---- linux-2.6.18.3.orig/net/ipv6/netfilter/ip6_tables.c -+++ linux-2.6.18.3/net/ipv6/netfilter/ip6_tables.c +--- linux-2.6.18.4.orig/net/ipv6/netfilter/ip6_tables.c ++++ linux-2.6.18.4/net/ipv6/netfilter/ip6_tables.c @@ -444,6 +444,13 @@ mark_source_chains(struct xt_table_info && unconditional(&e->ipv6)) { unsigned int oldpos, size; diff --git a/queue-2.6.18/netfilter-missing-check-for-cap_net_admin-in-iptables-compat-layer.patch b/review-2.6.18/netfilter-missing-check-for-cap_net_admin-in-iptables-compat-layer.patch similarity index 94% rename from queue-2.6.18/netfilter-missing-check-for-cap_net_admin-in-iptables-compat-layer.patch rename to review-2.6.18/netfilter-missing-check-for-cap_net_admin-in-iptables-compat-layer.patch index 9a45ab249f5..7ca7a012dbc 100644 --- a/queue-2.6.18/netfilter-missing-check-for-cap_net_admin-in-iptables-compat-layer.patch +++ b/review-2.6.18/netfilter-missing-check-for-cap_net_admin-in-iptables-compat-layer.patch @@ -29,8 +29,8 @@ committer Patrick McHardy Fri, 17 Nov 2006 06:22:07 +0100 net/ipv4/netfilter/ip_tables.c | 3 +++ 1 file changed, 3 insertions(+) ---- linux-2.6.18.3.orig/net/ipv4/netfilter/ip_tables.c -+++ linux-2.6.18.3/net/ipv4/netfilter/ip_tables.c +--- linux-2.6.18.4.orig/net/ipv4/netfilter/ip_tables.c ++++ linux-2.6.18.4/net/ipv4/netfilter/ip_tables.c @@ -1994,6 +1994,9 @@ compat_do_ipt_get_ctl(struct sock *sk, i { int ret; diff --git a/queue-2.6.18/netfilter-xt_connsecmark-fix-kconfig-dependencies.patch b/review-2.6.18/netfilter-xt_connsecmark-fix-kconfig-dependencies.patch similarity index 94% rename from queue-2.6.18/netfilter-xt_connsecmark-fix-kconfig-dependencies.patch rename to review-2.6.18/netfilter-xt_connsecmark-fix-kconfig-dependencies.patch index 47dfc7343a0..c5c5c05452c 100644 --- a/queue-2.6.18/netfilter-xt_connsecmark-fix-kconfig-dependencies.patch +++ b/review-2.6.18/netfilter-xt_connsecmark-fix-kconfig-dependencies.patch @@ -25,8 +25,8 @@ committer Patrick McHardy Fri, 17 Nov 2006 06:25:54 +0100 net/netfilter/Kconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---- linux-2.6.18.3.orig/net/netfilter/Kconfig -+++ linux-2.6.18.3/net/netfilter/Kconfig +--- linux-2.6.18.4.orig/net/netfilter/Kconfig ++++ linux-2.6.18.4/net/netfilter/Kconfig @@ -197,7 +197,9 @@ config NETFILTER_XT_TARGET_SECMARK config NETFILTER_XT_TARGET_CONNSECMARK diff --git a/queue-2.6.18/pcmcia-fix-rmmod-pcmcia-with-unbound-devices.patch b/review-2.6.18/pcmcia-fix-rmmod-pcmcia-with-unbound-devices.patch similarity index 93% rename from queue-2.6.18/pcmcia-fix-rmmod-pcmcia-with-unbound-devices.patch rename to review-2.6.18/pcmcia-fix-rmmod-pcmcia-with-unbound-devices.patch index 33c93e991a6..18714d508c1 100644 --- a/queue-2.6.18/pcmcia-fix-rmmod-pcmcia-with-unbound-devices.patch +++ b/review-2.6.18/pcmcia-fix-rmmod-pcmcia-with-unbound-devices.patch @@ -21,8 +21,8 @@ Signed-off-by: Chris Wright drivers/pcmcia/ds.c | 5 +++++ 1 file changed, 5 insertions(+) ---- linux-2.6.18.3.orig/drivers/pcmcia/ds.c -+++ linux-2.6.18.3/drivers/pcmcia/ds.c +--- linux-2.6.18.4.orig/drivers/pcmcia/ds.c ++++ linux-2.6.18.4/drivers/pcmcia/ds.c @@ -1264,6 +1264,11 @@ static void pcmcia_bus_remove_socket(str socket->pcmcia_state.dead = 1; pccard_register_pcmcia(socket, NULL); diff --git a/queue-2.6.18/scsi-clear-garbage-after-cdbs-on-sg_io.patch b/review-2.6.18/scsi-clear-garbage-after-cdbs-on-sg_io.patch similarity index 91% rename from queue-2.6.18/scsi-clear-garbage-after-cdbs-on-sg_io.patch rename to review-2.6.18/scsi-clear-garbage-after-cdbs-on-sg_io.patch index f9b926e849b..9796f822ffb 100644 --- a/queue-2.6.18/scsi-clear-garbage-after-cdbs-on-sg_io.patch +++ b/review-2.6.18/scsi-clear-garbage-after-cdbs-on-sg_io.patch @@ -28,8 +28,8 @@ Signed-off-by: Chris Wright drivers/scsi/scsi_lib.c | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) ---- linux-2.6.18.3.orig/block/scsi_ioctl.c -+++ linux-2.6.18.3/block/scsi_ioctl.c +--- linux-2.6.18.4.orig/block/scsi_ioctl.c ++++ linux-2.6.18.4/block/scsi_ioctl.c @@ -286,9 +286,8 @@ static int sg_io(struct file *file, requ * fill in request structure */ @@ -41,8 +41,8 @@ Signed-off-by: Chris Wright memset(sense, 0, sizeof(sense)); rq->sense = sense; ---- linux-2.6.18.3.orig/drivers/scsi/scsi_lib.c -+++ linux-2.6.18.3/drivers/scsi/scsi_lib.c +--- linux-2.6.18.4.orig/drivers/scsi/scsi_lib.c ++++ linux-2.6.18.4/drivers/scsi/scsi_lib.c @@ -408,6 +408,7 @@ int scsi_execute_async(struct scsi_devic goto free_req; diff --git a/queue-2.6.18/series b/review-2.6.18/series similarity index 100% rename from queue-2.6.18/series rename to review-2.6.18/series diff --git a/queue-2.6.18/softmac-fix-a-slab-corruption-in-wep-restricted-key-association.patch b/review-2.6.18/softmac-fix-a-slab-corruption-in-wep-restricted-key-association.patch similarity index 89% rename from queue-2.6.18/softmac-fix-a-slab-corruption-in-wep-restricted-key-association.patch rename to review-2.6.18/softmac-fix-a-slab-corruption-in-wep-restricted-key-association.patch index 24249c00fa9..d48debf6d32 100644 --- a/queue-2.6.18/softmac-fix-a-slab-corruption-in-wep-restricted-key-association.patch +++ b/review-2.6.18/softmac-fix-a-slab-corruption-in-wep-restricted-key-association.patch @@ -17,8 +17,8 @@ Signed-off-by: Chris Wright net/ieee80211/softmac/ieee80211softmac_io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- linux-2.6.18.3.orig/net/ieee80211/softmac/ieee80211softmac_io.c -+++ linux-2.6.18.3/net/ieee80211/softmac/ieee80211softmac_io.c +--- linux-2.6.18.4.orig/net/ieee80211/softmac/ieee80211softmac_io.c ++++ linux-2.6.18.4/net/ieee80211/softmac/ieee80211softmac_io.c @@ -304,7 +304,7 @@ ieee80211softmac_auth(struct ieee80211_a 2 + /* Auth Transaction Seq */ 2 + /* Status Code */ diff --git a/queue-2.6.18/tg3-add-missing-unlock-in-tg3_open-error-path.patch b/review-2.6.18/tg3-add-missing-unlock-in-tg3_open-error-path.patch similarity index 92% rename from queue-2.6.18/tg3-add-missing-unlock-in-tg3_open-error-path.patch rename to review-2.6.18/tg3-add-missing-unlock-in-tg3_open-error-path.patch index a73041fa5a8..29b3dbb1193 100644 --- a/queue-2.6.18/tg3-add-missing-unlock-in-tg3_open-error-path.patch +++ b/review-2.6.18/tg3-add-missing-unlock-in-tg3_open-error-path.patch @@ -19,8 +19,8 @@ Signed-off-by: Chris Wright drivers/net/tg3.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---- linux-2.6.18.3.orig/drivers/net/tg3.c -+++ linux-2.6.18.3/drivers/net/tg3.c +--- linux-2.6.18.4.orig/drivers/net/tg3.c ++++ linux-2.6.18.4/drivers/net/tg3.c @@ -6889,8 +6889,10 @@ static int tg3_open(struct net_device *d tg3_full_lock(tp, 0); diff --git a/queue-2.6.18/udp-make-udp_encap_rcv-use-pskb_may_pull.patch b/review-2.6.18/udp-make-udp_encap_rcv-use-pskb_may_pull.patch similarity index 96% rename from queue-2.6.18/udp-make-udp_encap_rcv-use-pskb_may_pull.patch rename to review-2.6.18/udp-make-udp_encap_rcv-use-pskb_may_pull.patch index 360ffd391b1..5800edbda80 100644 --- a/queue-2.6.18/udp-make-udp_encap_rcv-use-pskb_may_pull.patch +++ b/review-2.6.18/udp-make-udp_encap_rcv-use-pskb_may_pull.patch @@ -23,8 +23,8 @@ Signed-off-by: Chris Wright net/ipv4/udp.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) ---- linux-2.6.18.3.orig/net/ipv4/udp.c -+++ linux-2.6.18.3/net/ipv4/udp.c +--- linux-2.6.18.4.orig/net/ipv4/udp.c ++++ linux-2.6.18.4/net/ipv4/udp.c @@ -892,23 +892,32 @@ static int udp_encap_rcv(struct sock * s return 1; #else diff --git a/queue-2.6.18/v4l-do-not-enable-video_v4l2-unconditionally.patch b/review-2.6.18/v4l-do-not-enable-video_v4l2-unconditionally.patch similarity index 92% rename from queue-2.6.18/v4l-do-not-enable-video_v4l2-unconditionally.patch rename to review-2.6.18/v4l-do-not-enable-video_v4l2-unconditionally.patch index 77ce56e7e19..dce0a603353 100644 --- a/queue-2.6.18/v4l-do-not-enable-video_v4l2-unconditionally.patch +++ b/review-2.6.18/v4l-do-not-enable-video_v4l2-unconditionally.patch @@ -22,8 +22,8 @@ Signed-off-by: Chris Wright drivers/media/Kconfig | 1 + 1 file changed, 1 insertion(+) ---- linux-2.6.18.3.orig/drivers/media/Kconfig -+++ linux-2.6.18.3/drivers/media/Kconfig +--- linux-2.6.18.4.orig/drivers/media/Kconfig ++++ linux-2.6.18.4/drivers/media/Kconfig @@ -54,6 +54,7 @@ config VIDEO_V4L1_COMPAT config VIDEO_V4L2 diff --git a/queue-2.6.18/x86-microcode-don-t-check-the-size.patch b/review-2.6.18/x86-microcode-don-t-check-the-size.patch similarity index 94% rename from queue-2.6.18/x86-microcode-don-t-check-the-size.patch rename to review-2.6.18/x86-microcode-don-t-check-the-size.patch index 80a2fa0de04..67bbaed9e29 100644 --- a/queue-2.6.18/x86-microcode-don-t-check-the-size.patch +++ b/review-2.6.18/x86-microcode-don-t-check-the-size.patch @@ -22,8 +22,8 @@ Signed-off-by: Chris Wright arch/i386/kernel/microcode.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) ---- linux-2.6.18.3.orig/arch/i386/kernel/microcode.c -+++ linux-2.6.18.3/arch/i386/kernel/microcode.c +--- linux-2.6.18.4.orig/arch/i386/kernel/microcode.c ++++ linux-2.6.18.4/arch/i386/kernel/microcode.c @@ -250,14 +250,14 @@ static int find_matching_ucodes (void) }