refresh 2.6.20 queue against 2.6.20.13 (and remove netfilter SCTP patch

since it just went out in a security release).

diff --git a/queue-2.6.20/01-data-corruption.diff b/queue-2.6.20/01-data-corruption.diff
index 814c5dc237bf669777df288f8b6a8b8280f471ad..c53e8fb39bc44899af59425a0747f538d6977b3e 100644 (file)
--- a/queue-2.6.20/01-data-corruption.diff
+++ b/queue-2.6.20/01-data-corruption.diff
@@ -49,8 +49,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  mm/rmap.c |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
---- a/mm/rmap.c
-+++ b/mm/rmap.c
+--- linux-2.6.20.13.orig/mm/rmap.c
++++ linux-2.6.20.13/mm/rmap.c
 @@ -490,9 +490,9 @@ int page_mkclean(struct page *page)
                struct address_space *mapping = page_mapping(page);
                if (mapping)

diff --git a/queue-2.6.20/02-network.diff b/queue-2.6.20/02-network.diff
index 15ced296e2ac69468e50b452821ff0b3cb891cf6..a59cf480e3899932fb5630759eda0dcf8728f55b 100644 (file)
--- a/queue-2.6.20/02-network.diff
+++ b/queue-2.6.20/02-network.diff
@@ -32,8 +32,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  include/asm-s390/checksum.h |   59 +++++++++++---------------------------------
  1 file changed, 15 insertions(+), 44 deletions(-)
 
---- a/include/asm-s390/checksum.h
-+++ b/include/asm-s390/checksum.h
+--- linux-2.6.20.13.orig/include/asm-s390/checksum.h
++++ linux-2.6.20.13/include/asm-s390/checksum.h
 @@ -121,50 +121,21 @@ csum_tcpudp_nofold(__be32 saddr, __be32 
                     unsigned short len, unsigned short proto,
                     __wsum sum)

diff --git a/queue-2.6.20/acpi-thermal-fix-mod_timer-interval.patch b/queue-2.6.20/acpi-thermal-fix-mod_timer-interval.patch
index 96f1527fa16ba3480e22c4a934e7845216bb3a7a..06c9489dd7ff84f7b8be41a4eb8faab769690f28 100644 (file)
--- a/queue-2.6.20/acpi-thermal-fix-mod_timer-interval.patch
+++ b/queue-2.6.20/acpi-thermal-fix-mod_timer-interval.patch
@@ -21,8 +21,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  drivers/acpi/thermal.c |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
---- linux-2.6.20.12.orig/drivers/acpi/thermal.c
-+++ linux-2.6.20.12/drivers/acpi/thermal.c
+--- linux-2.6.20.13.orig/drivers/acpi/thermal.c
++++ linux-2.6.20.13/drivers/acpi/thermal.c
 @@ -758,7 +758,8 @@ static void acpi_thermal_check(void *dat
                        del_timer(&(tz->timer));
        } else {

diff --git a/queue-2.6.20/alsa-usb-audio-explicitly-match-logitech-quickcam.patch b/queue-2.6.20/alsa-usb-audio-explicitly-match-logitech-quickcam.patch
index 13a21033106b23e000a29a4819be20578710ee62..17b12e19ff63d231de7f2b7da03e5a427527efe6 100644 (file)
--- a/queue-2.6.20/alsa-usb-audio-explicitly-match-logitech-quickcam.patch
+++ b/queue-2.6.20/alsa-usb-audio-explicitly-match-logitech-quickcam.patch
@@ -29,8 +29,8 @@ X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.
  sound/usb/usbquirks.h |   23 +++++++++++++++++++++++
  1 file changed, 23 insertions(+)
 
---- linux-2.6.20.12.orig/sound/usb/usbquirks.h
-+++ linux-2.6.20.12/sound/usb/usbquirks.h
+--- linux-2.6.20.13.orig/sound/usb/usbquirks.h
++++ linux-2.6.20.13/sound/usb/usbquirks.h
 @@ -40,6 +40,29 @@
        .bInterfaceClass = USB_CLASS_VENDOR_SPEC
  

diff --git a/queue-2.6.20/crypto-api-read-module-pointer-before-freeing-algorithm.patch b/queue-2.6.20/crypto-api-read-module-pointer-before-freeing-algorithm.patch
index 5c82e8ff8624ed822ab882bb38f835131bb5a17b..ec1676a9d9824a85b3b5923f2a2db8c3a861c6da 100644 (file)
--- a/queue-2.6.20/crypto-api-read-module-pointer-before-freeing-algorithm.patch
+++ b/queue-2.6.20/crypto-api-read-module-pointer-before-freeing-algorithm.patch
@@ -22,8 +22,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  crypto/api.c |    4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
---- linux-2.6.20.12.orig/crypto/api.c
-+++ linux-2.6.20.12/crypto/api.c
+--- linux-2.6.20.13.orig/crypto/api.c
++++ linux-2.6.20.13/crypto/api.c
 @@ -48,8 +48,10 @@ EXPORT_SYMBOL_GPL(crypto_mod_get);
  
  void crypto_mod_put(struct crypto_alg *alg)

diff --git a/queue-2.6.20/driver-core-don-t-free-devt_attr-till-the-device-is-released.patch b/queue-2.6.20/driver-core-don-t-free-devt_attr-till-the-device-is-released.patch
index 8dc94db41fce45983297dc0ec6e148d19ff3e63a..90142163c38f4a349e3431589931936b23ad349f 100644 (file)
--- a/queue-2.6.20/driver-core-don-t-free-devt_attr-till-the-device-is-released.patch
+++ b/queue-2.6.20/driver-core-don-t-free-devt_attr-till-the-device-is-released.patch
@@ -28,8 +28,8 @@ too (applies well there as well).
  drivers/base/core.c |    7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
---- linux-2.6.20.12.orig/drivers/base/core.c
-+++ linux-2.6.20.12/drivers/base/core.c
+--- linux-2.6.20.13.orig/drivers/base/core.c
++++ linux-2.6.20.13/drivers/base/core.c
 @@ -93,6 +93,9 @@ static void device_release(struct kobjec
  {
        struct device * dev = to_dev(kobj);

diff --git a/queue-2.6.20/fix-af_unix-oops.patch b/queue-2.6.20/fix-af_unix-oops.patch
index d52258184c3ced171e5fd1e794afc776685ac534..81b6141cdefcf34b0bf7a7ab6def8980816b792b 100644 (file)
--- a/queue-2.6.20/fix-af_unix-oops.patch
+++ b/queue-2.6.20/fix-af_unix-oops.patch
@@ -57,8 +57,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  net/unix/af_unix.c    |  127 +++++++++++++++++++++++++++++++-------------------
  2 files changed, 83 insertions(+), 52 deletions(-)
 
---- linux-2.6.20.12.orig/include/net/af_unix.h
-+++ linux-2.6.20.12/include/net/af_unix.h
+--- linux-2.6.20.13.orig/include/net/af_unix.h
++++ linux-2.6.20.13/include/net/af_unix.h
 @@ -62,13 +62,11 @@ struct unix_skb_parms {
  #define UNIXCREDS(skb)        (&UNIXCB((skb)).creds)
  #define UNIXSID(skb)  (&UNIXCB((skb)).secid)
@@ -76,8 +76,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  
  #ifdef __KERNEL__
  /* The AF_UNIX socket */
---- linux-2.6.20.12.orig/net/unix/af_unix.c
-+++ linux-2.6.20.12/net/unix/af_unix.c
+--- linux-2.6.20.13.orig/net/unix/af_unix.c
++++ linux-2.6.20.13/net/unix/af_unix.c
 @@ -175,11 +175,11 @@ static struct sock *unix_peer_get(struct
  {
        struct sock *peer;

diff --git a/queue-2.6.20/fuse-fix-mknod-of-regular-file.patch b/queue-2.6.20/fuse-fix-mknod-of-regular-file.patch
index 6577263aedec077302abd17d2d09758c5e16b061..3b5de94205b6429d6395af5521f324c04b67d11e 100644 (file)
--- a/queue-2.6.20/fuse-fix-mknod-of-regular-file.patch
+++ b/queue-2.6.20/fuse-fix-mknod-of-regular-file.patch
@@ -23,8 +23,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  fs/fuse/dir.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- linux-2.6.20.12.orig/fs/fuse/dir.c
-+++ linux-2.6.20.12/fs/fuse/dir.c
+--- linux-2.6.20.13.orig/fs/fuse/dir.c
++++ linux-2.6.20.13/fs/fuse/dir.c
 @@ -484,7 +484,7 @@ static int fuse_mknod(struct inode *dir,
  static int fuse_create(struct inode *dir, struct dentry *entry, int mode,
                       struct nameidata *nd)

diff --git a/queue-2.6.20/icmp-fix-icmp_errors_use_inbound_ifaddr-sysctl.patch b/queue-2.6.20/icmp-fix-icmp_errors_use_inbound_ifaddr-sysctl.patch
index c172c96838cd878e171281e38ad02d5c58fe7428..515c109f232255fe41c4f83fea367469e9867adf 100644 (file)
--- a/queue-2.6.20/icmp-fix-icmp_errors_use_inbound_ifaddr-sysctl.patch
+++ b/queue-2.6.20/icmp-fix-icmp_errors_use_inbound_ifaddr-sysctl.patch
@@ -21,8 +21,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  net/ipv4/icmp.c |   12 +++++++++---
  1 file changed, 9 insertions(+), 3 deletions(-)
 
---- linux-2.6.20.12.orig/net/ipv4/icmp.c
-+++ linux-2.6.20.12/net/ipv4/icmp.c
+--- linux-2.6.20.13.orig/net/ipv4/icmp.c
++++ linux-2.6.20.13/net/ipv4/icmp.c
 @@ -513,9 +513,15 @@ void icmp_send(struct sk_buff *skb_in, i
  
        saddr = iph->daddr;

diff --git a/queue-2.6.20/iop13xx-fix-i-o-address-translation.patch b/queue-2.6.20/iop13xx-fix-i-o-address-translation.patch
index 6601943659b1d3d285ec4d522c5da642013706dd..ef2874e6114972402d23c50bf462e46552618906 100644 (file)
--- a/queue-2.6.20/iop13xx-fix-i-o-address-translation.patch
+++ b/queue-2.6.20/iop13xx-fix-i-o-address-translation.patch
@@ -24,8 +24,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  include/asm-arm/arch-iop13xx/iop13xx.h |   22 +++++++++++++---------
  2 files changed, 17 insertions(+), 13 deletions(-)
 
---- linux-2.6.20.12.orig/arch/arm/mach-iop13xx/pci.c
-+++ linux-2.6.20.12/arch/arm/mach-iop13xx/pci.c
+--- linux-2.6.20.13.orig/arch/arm/mach-iop13xx/pci.c
++++ linux-2.6.20.13/arch/arm/mach-iop13xx/pci.c
 @@ -1023,7 +1023,7 @@ int iop13xx_pci_setup(int nr, struct pci
                                  << IOP13XX_ATUX_PCIXSR_FUNC_NUM;
                __raw_writel(pcixsr, IOP13XX_ATUX_PCIXSR);
@@ -62,8 +62,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
                sys->map_irq = iop13xx_pcie_map_irq;
                break;
        default:
---- linux-2.6.20.12.orig/include/asm-arm/arch-iop13xx/iop13xx.h
-+++ linux-2.6.20.12/include/asm-arm/arch-iop13xx/iop13xx.h
+--- linux-2.6.20.13.orig/include/asm-arm/arch-iop13xx/iop13xx.h
++++ linux-2.6.20.13/include/asm-arm/arch-iop13xx/iop13xx.h
 @@ -55,19 +55,24 @@ static inline int iop13xx_cpu_id(void)
  #define IOP13XX_PCI_OFFSET     IOP13XX_MAX_RAM_SIZE
  

diff --git a/queue-2.6.20/ip-nf-_nat_proto_gre-do-not-modify-corrupt-grev0-packets-through-nat.patch b/queue-2.6.20/ip-nf-_nat_proto_gre-do-not-modify-corrupt-grev0-packets-through-nat.patch
index 55089022ae279352e969912fa64e144cd38185cc..f6a5c425a279193e5605f79d358a12c6c55f1f54 100644 (file)
--- a/queue-2.6.20/ip-nf-_nat_proto_gre-do-not-modify-corrupt-grev0-packets-through-nat.patch
+++ b/queue-2.6.20/ip-nf-_nat_proto_gre-do-not-modify-corrupt-grev0-packets-through-nat.patch
@@ -36,8 +36,8 @@ committer Patrick McHardy <kaber@trash.net> Thu, 03 May 2007 02:50:51 +0200
  net/ipv4/netfilter/nf_nat_proto_gre.c                 |   20 +++++++-----------
  4 files changed, 16 insertions(+), 61 deletions(-)
 
---- linux-2.6.20.12.orig/include/linux/netfilter/nf_conntrack_proto_gre.h
-+++ linux-2.6.20.12/include/linux/netfilter/nf_conntrack_proto_gre.h
+--- linux-2.6.20.13.orig/include/linux/netfilter/nf_conntrack_proto_gre.h
++++ linux-2.6.20.13/include/linux/netfilter/nf_conntrack_proto_gre.h
 @@ -87,24 +87,6 @@ int nf_ct_gre_keymap_add(struct nf_conn 
  /* delete keymap entries */
  void nf_ct_gre_keymap_destroy(struct nf_conn *ct);
@@ -63,8 +63,8 @@ committer Patrick McHardy <kaber@trash.net> Thu, 03 May 2007 02:50:51 +0200
  extern void nf_ct_gre_keymap_flush(void);
  extern void nf_nat_need_gre(void);
  
---- linux-2.6.20.12.orig/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
-+++ linux-2.6.20.12/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
+--- linux-2.6.20.13.orig/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
++++ linux-2.6.20.13/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
 @@ -90,25 +90,6 @@ int ip_ct_gre_keymap_add(struct ip_connt
  /* delete keymap entries */
  void ip_ct_gre_keymap_destroy(struct ip_conntrack *ct);
@@ -91,8 +91,8 @@ committer Patrick McHardy <kaber@trash.net> Thu, 03 May 2007 02:50:51 +0200
  #endif /* __KERNEL__ */
  
  #endif /* _CONNTRACK_PROTO_GRE_H */
---- linux-2.6.20.12.orig/net/ipv4/netfilter/ip_nat_proto_gre.c
-+++ linux-2.6.20.12/net/ipv4/netfilter/ip_nat_proto_gre.c
+--- linux-2.6.20.13.orig/net/ipv4/netfilter/ip_nat_proto_gre.c
++++ linux-2.6.20.13/net/ipv4/netfilter/ip_nat_proto_gre.c
 @@ -70,6 +70,11 @@ gre_unique_tuple(struct ip_conntrack_tup
        __be16 *keyptr;
        unsigned int min, i, range_size;
@@ -127,8 +127,8 @@ committer Patrick McHardy <kaber@trash.net> Thu, 03 May 2007 02:50:51 +0200
                        break;
                case GRE_VERSION_PPTP:
                        DEBUGP("call_id -> 0x%04x\n",
---- linux-2.6.20.12.orig/net/ipv4/netfilter/nf_nat_proto_gre.c
-+++ linux-2.6.20.12/net/ipv4/netfilter/nf_nat_proto_gre.c
+--- linux-2.6.20.13.orig/net/ipv4/netfilter/nf_nat_proto_gre.c
++++ linux-2.6.20.13/net/ipv4/netfilter/nf_nat_proto_gre.c
 @@ -72,6 +72,11 @@ gre_unique_tuple(struct nf_conntrack_tup
        __be16 *keyptr;
        unsigned int min, i, range_size;

diff --git a/queue-2.6.20/ipsec-fix-panic-when-using-inter-address-familiy-ipsec-on-loopback.patch b/queue-2.6.20/ipsec-fix-panic-when-using-inter-address-familiy-ipsec-on-loopback.patch
index 8ecb03868daff9a629bd1925ffb0f8be022cfaf6..52db6cbb8930193a441b81a97885f262ac34e803 100644 (file)
--- a/queue-2.6.20/ipsec-fix-panic-when-using-inter-address-familiy-ipsec-on-loopback.patch
+++ b/queue-2.6.20/ipsec-fix-panic-when-using-inter-address-familiy-ipsec-on-loopback.patch
@@ -19,8 +19,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  net/ipv6/xfrm6_mode_tunnel.c |    1 +
  4 files changed, 7 insertions(+), 8 deletions(-)
 
---- linux-2.6.20.12.orig/net/ipv4/xfrm4_input.c
-+++ linux-2.6.20.12/net/ipv4/xfrm4_input.c
+--- linux-2.6.20.13.orig/net/ipv4/xfrm4_input.c
++++ linux-2.6.20.13/net/ipv4/xfrm4_input.c
 @@ -136,10 +136,8 @@ int xfrm4_rcv_encap(struct sk_buff *skb,
        nf_reset(skb);
  
@@ -34,8 +34,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
                netif_rx(skb);
                return 0;
        } else {
---- linux-2.6.20.12.orig/net/ipv4/xfrm4_mode_tunnel.c
-+++ linux-2.6.20.12/net/ipv4/xfrm4_mode_tunnel.c
+--- linux-2.6.20.13.orig/net/ipv4/xfrm4_mode_tunnel.c
++++ linux-2.6.20.13/net/ipv4/xfrm4_mode_tunnel.c
 @@ -66,6 +66,8 @@ static int xfrm4_tunnel_output(struct xf
        top_iph->daddr = x->id.daddr.a4;
        top_iph->protocol = IPPROTO_IPIP;
@@ -45,8 +45,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
        memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options));
        return 0;
  }
---- linux-2.6.20.12.orig/net/ipv6/xfrm6_input.c
-+++ linux-2.6.20.12/net/ipv6/xfrm6_input.c
+--- linux-2.6.20.13.orig/net/ipv6/xfrm6_input.c
++++ linux-2.6.20.13/net/ipv6/xfrm6_input.c
 @@ -103,10 +103,8 @@ int xfrm6_rcv_spi(struct sk_buff *skb, _
        nf_reset(skb);
  
@@ -60,8 +60,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
                netif_rx(skb);
                return -1;
        } else {
---- linux-2.6.20.12.orig/net/ipv6/xfrm6_mode_tunnel.c
-+++ linux-2.6.20.12/net/ipv6/xfrm6_mode_tunnel.c
+--- linux-2.6.20.13.orig/net/ipv6/xfrm6_mode_tunnel.c
++++ linux-2.6.20.13/net/ipv6/xfrm6_mode_tunnel.c
 @@ -65,6 +65,7 @@ static int xfrm6_tunnel_output(struct xf
        top_iph->hop_limit = dst_metric(dst->child, RTAX_HOPLIMIT);
        ipv6_addr_copy(&top_iph->saddr, (struct in6_addr *)&x->props.saddr);

diff --git a/queue-2.6.20/ipv4-correct-rp_filter-help-text.patch b/queue-2.6.20/ipv4-correct-rp_filter-help-text.patch
index 456e74b515f8b17bd1b7e83f1386ebdacf3c6a26..2822a09acce7aa988745f905a81e1d3691757420 100644 (file)
--- a/queue-2.6.20/ipv4-correct-rp_filter-help-text.patch
+++ b/queue-2.6.20/ipv4-correct-rp_filter-help-text.patch
@@ -21,8 +21,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  net/ipv4/Kconfig |    6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
---- linux-2.6.20.12.orig/net/ipv4/Kconfig
-+++ linux-2.6.20.12/net/ipv4/Kconfig
+--- linux-2.6.20.13.orig/net/ipv4/Kconfig
++++ linux-2.6.20.13/net/ipv4/Kconfig
 @@ -43,11 +43,11 @@ config IP_ADVANCED_ROUTER
          asymmetric routing (packets from you to a host take a different path
          than packets from that host to you) or if you operate a non-routing

diff --git a/queue-2.6.20/ipv6-route-no-longer-handle-0-specially.patch b/queue-2.6.20/ipv6-route-no-longer-handle-0-specially.patch
index d50f98a82b0abb3680646f9d26c2db5d1930b6c8..eb6f714e9294e1d5f2e8c9526cd19894454d4dae 100644 (file)
--- a/queue-2.6.20/ipv6-route-no-longer-handle-0-specially.patch
+++ b/queue-2.6.20/ipv6-route-no-longer-handle-0-specially.patch
@@ -21,8 +21,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  net/ipv6/ip6_fib.c |    8 --------
  1 file changed, 8 deletions(-)
 
---- linux-2.6.20.12.orig/net/ipv6/ip6_fib.c
-+++ linux-2.6.20.12/net/ipv6/ip6_fib.c
+--- linux-2.6.20.13.orig/net/ipv6/ip6_fib.c
++++ linux-2.6.20.13/net/ipv6/ip6_fib.c
 @@ -620,14 +620,6 @@ static int fib6_add_rt2node(struct fib6_
  
        ins = &fn->leaf;

diff --git a/queue-2.6.20/ipv6-track-device-renames-in-snmp6.patch b/queue-2.6.20/ipv6-track-device-renames-in-snmp6.patch
index a41557aef90910491f50a6babbcae7cfb26afd19..c553f87185f8b9b414a6bb6fc78f4ad9b9fb3cd8 100644 (file)
--- a/queue-2.6.20/ipv6-track-device-renames-in-snmp6.patch
+++ b/queue-2.6.20/ipv6-track-device-renames-in-snmp6.patch
@@ -21,8 +21,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  net/ipv6/proc.c     |    1 +
  2 files changed, 5 insertions(+), 2 deletions(-)
 
---- linux-2.6.20.12.orig/net/ipv6/addrconf.c
-+++ linux-2.6.20.12/net/ipv6/addrconf.c
+--- linux-2.6.20.13.orig/net/ipv6/addrconf.c
++++ linux-2.6.20.13/net/ipv6/addrconf.c
 @@ -2338,8 +2338,9 @@ static int addrconf_notify(struct notifi
                break;
  
@@ -45,8 +45,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
                break;
        };
  
---- linux-2.6.20.12.orig/net/ipv6/proc.c
-+++ linux-2.6.20.12/net/ipv6/proc.c
+--- linux-2.6.20.13.orig/net/ipv6/proc.c
++++ linux-2.6.20.13/net/ipv6/proc.c
 @@ -237,6 +237,7 @@ int snmp6_unregister_dev(struct inet6_de
                return -EINVAL;
        remove_proc_entry(idev->stats.proc_dir_entry->name,

diff --git a/queue-2.6.20/jfs-fix-race-waking-up-jfsio-kernel-thread.patch b/queue-2.6.20/jfs-fix-race-waking-up-jfsio-kernel-thread.patch
index bd292c0e36cd02fc105f77521065e01a551382cc..d17701e81fd8f7a78754eb7b69ada44c30802ea6 100644 (file)
--- a/queue-2.6.20/jfs-fix-race-waking-up-jfsio-kernel-thread.patch
+++ b/queue-2.6.20/jfs-fix-race-waking-up-jfsio-kernel-thread.patch
@@ -20,8 +20,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  fs/jfs/jfs_logmgr.c |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
---- linux-2.6.20.12.orig/fs/jfs/jfs_logmgr.c
-+++ linux-2.6.20.12/fs/jfs/jfs_logmgr.c
+--- linux-2.6.20.13.orig/fs/jfs/jfs_logmgr.c
++++ linux-2.6.20.13/fs/jfs/jfs_logmgr.c
 @@ -2354,12 +2354,13 @@ int jfsIOWait(void *arg)
                        lbmStartIO(bp);
                        spin_lock_irq(&log_redrive_lock);

diff --git a/queue-2.6.20/kbuild-fixdep-segfault-on-pathological-string-o-death.patch b/queue-2.6.20/kbuild-fixdep-segfault-on-pathological-string-o-death.patch
index b8c9f867cdf87cb73f59a71d67a8d4f2acdf33d9..079c2f794600205869f972ddb317d27e26ca8418 100644 (file)
--- a/queue-2.6.20/kbuild-fixdep-segfault-on-pathological-string-o-death.patch
+++ b/queue-2.6.20/kbuild-fixdep-segfault-on-pathological-string-o-death.patch
@@ -24,8 +24,8 @@ Fixes https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=241915
  scripts/basic/fixdep.c |    2 ++
  1 file changed, 2 insertions(+)
 
---- linux-2.6.20.12.orig/scripts/basic/fixdep.c
-+++ linux-2.6.20.12/scripts/basic/fixdep.c
+--- linux-2.6.20.13.orig/scripts/basic/fixdep.c
++++ linux-2.6.20.13/scripts/basic/fixdep.c
 @@ -249,6 +249,8 @@ void parse_config_file(char *map, size_t
        found:
                if (!memcmp(q - 7, "_MODULE", 7))

diff --git a/queue-2.6.20/net-fix-bmsr_100-half-full-2-defines-in-linux-mii.h.patch b/queue-2.6.20/net-fix-bmsr_100-half-full-2-defines-in-linux-mii.h.patch
index ea2949eeb4abe2991ae056a3f1f38b6f78fa905d..e32046bd03fc26301196edf9c7625e71d68fa7e4 100644 (file)
--- a/queue-2.6.20/net-fix-bmsr_100-half-full-2-defines-in-linux-mii.h.patch
+++ b/queue-2.6.20/net-fix-bmsr_100-half-full-2-defines-in-linux-mii.h.patch
@@ -15,8 +15,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  include/linux/mii.h |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
---- linux-2.6.20.12.orig/include/linux/mii.h
-+++ linux-2.6.20.12/include/linux/mii.h
+--- linux-2.6.20.13.orig/include/linux/mii.h
++++ linux-2.6.20.13/include/linux/mii.h
 @@ -56,8 +56,8 @@
  #define BMSR_ANEGCOMPLETE       0x0020  /* Auto-negotiation complete   */
  #define BMSR_RESV               0x00c0  /* Unused...                   */

diff --git a/queue-2.6.20/net-fix-race-condition-about-network-device-name-allocation.patch b/queue-2.6.20/net-fix-race-condition-about-network-device-name-allocation.patch
index be08d059fd8a3961f85bc2d322724f3f8e82cde4..9f8aebceedaf51df8eb5d1aa493928117f60b1ec 100644 (file)
--- a/queue-2.6.20/net-fix-race-condition-about-network-device-name-allocation.patch
+++ b/queue-2.6.20/net-fix-race-condition-about-network-device-name-allocation.patch
@@ -28,8 +28,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  net/core/net-sysfs.c |    8 +++++++-
  2 files changed, 13 insertions(+), 5 deletions(-)
 
---- linux-2.6.20.12.orig/net/core/dev.c
-+++ linux-2.6.20.12/net/core/dev.c
+--- linux-2.6.20.13.orig/net/core/dev.c
++++ linux-2.6.20.13/net/core/dev.c
 @@ -3138,7 +3138,6 @@ void netdev_run_todo(void)
                        continue;
                }
@@ -63,8 +63,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
        /* Finish processing unregister after unlock */
        net_set_todo(dev);
  
---- linux-2.6.20.12.orig/net/core/net-sysfs.c
-+++ linux-2.6.20.12/net/core/net-sysfs.c
+--- linux-2.6.20.13.orig/net/core/net-sysfs.c
++++ linux-2.6.20.13/net/core/net-sysfs.c
 @@ -440,9 +440,15 @@ static struct class net_class = {
  #endif
  };

diff --git a/queue-2.6.20/net-parse-ip-port-strings-correctly-in-in4_pton.patch b/queue-2.6.20/net-parse-ip-port-strings-correctly-in-in4_pton.patch
index 6217abacd34f7ab1ba418d1959fa22a056dcf580..fd008f46117828bd4c8732854aeccddc36c15718 100644 (file)
--- a/queue-2.6.20/net-parse-ip-port-strings-correctly-in-in4_pton.patch
+++ b/queue-2.6.20/net-parse-ip-port-strings-correctly-in-in4_pton.patch
@@ -27,8 +27,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  net/core/utils.c |    6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
---- linux-2.6.20.12.orig/net/core/utils.c
-+++ linux-2.6.20.12/net/core/utils.c
+--- linux-2.6.20.13.orig/net/core/utils.c
++++ linux-2.6.20.13/net/core/utils.c
 @@ -137,16 +137,16 @@ int in4_pton(const char *src, int srclen
        while(1) {
                int c;

diff --git a/queue-2.6.20/net-wrong-timeout-value-in-sk_wait_data-v2.patch b/queue-2.6.20/net-wrong-timeout-value-in-sk_wait_data-v2.patch
index 8a3708bfda3cb50afa87e8fc9a52596b26154ffd..5235713a23a0e2382c2ac6329d35b4db0b953a1b 100644 (file)
--- a/queue-2.6.20/net-wrong-timeout-value-in-sk_wait_data-v2.patch
+++ b/queue-2.6.20/net-wrong-timeout-value-in-sk_wait_data-v2.patch
@@ -30,8 +30,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  net/core/sock.c |   12 ++++++++++++
  1 file changed, 12 insertions(+)
 
---- linux-2.6.20.12.orig/net/core/sock.c
-+++ linux-2.6.20.12/net/core/sock.c
+--- linux-2.6.20.13.orig/net/core/sock.c
++++ linux-2.6.20.13/net/core/sock.c
 @@ -204,7 +204,19 @@ static int sock_set_timeout(long *timeo_
                return -EINVAL;
        if (copy_from_user(&tv, optval, sizeof(tv)))

diff --git a/queue-2.6.20/netfilter-ip-nf-_conntrack_sctp-fix-remotely-triggerable-null-ptr-dereference.patch b/queue-2.6.20/netfilter-ip-nf-_conntrack_sctp-fix-remotely-triggerable-null-ptr-dereference.patch
deleted file mode 100644 (file)
index 7d9de9f..0000000
--- a/queue-2.6.20/netfilter-ip-nf-_conntrack_sctp-fix-remotely-triggerable-null-ptr-dereference.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From stable-bounces@linux.kernel.org Tue Jun  5 05:17:17 2007
-From: Patrick McHardy <kaber@trash.net>
-Date: Tue, 05 Jun 2007 14:14:22 +0200
-Subject: NETFILTER: {ip, nf}_conntrack_sctp: fix remotely triggerable NULL ptr dereference (CVE-2007-2876)
-To: "David S. Miller" <davem@davemloft.net>
-Cc: security@kernel.org, Adrian Bunk <bunk@stusta.de>, Kiran Kumar Immidi <immidi_kiran@yahoo.com>, stable@kernel.org, Vilmos Nebehaj <vilmos.nebehaj@ramsys.hu>
-Message-ID: <4665539E.9040005@trash.net>
-
-From: Patrick McHardy <kaber@trash.net>
-
-When creating a new connection by sending an unknown chunk type, we
-don't transition to a valid state, causing a NULL pointer dereference in
-sctp_packet when accessing sctp_timeouts[SCTP_CONNTRACK_NONE].
-
-Fix by don't creating new conntrack entry if initial state is invalid.
-
-Noticed by Vilmos Nebehaj <vilmos.nebehaj@ramsys.hu>
-
-CC: Kiran Kumar Immidi <immidi_kiran@yahoo.com>
-Cc: David Miller <davem@davemloft.net>
-Signed-off-by: Patrick McHardy <kaber@trash.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-Signed-off-by: Chris Wright <chrisw@sous-sol.org>
-
----
- net/ipv4/netfilter/ip_conntrack_proto_sctp.c |    3 ++-
- net/netfilter/nf_conntrack_proto_sctp.c      |    3 ++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
---- a/net/ipv4/netfilter/ip_conntrack_proto_sctp.c
-+++ b/net/ipv4/netfilter/ip_conntrack_proto_sctp.c
-@@ -461,7 +461,8 @@ static int sctp_new(struct ip_conntrack 
-                                               SCTP_CONNTRACK_NONE, sch->type);
- 
-               /* Invalid: delete conntrack */
--              if (newconntrack == SCTP_CONNTRACK_MAX) {
-+              if (newconntrack == SCTP_CONNTRACK_NONE ||
-+                  newconntrack == SCTP_CONNTRACK_MAX) {
-                       DEBUGP("ip_conntrack_sctp: invalid new deleting.\n");
-                       return 0;
-               }
---- a/net/netfilter/nf_conntrack_proto_sctp.c
-+++ b/net/netfilter/nf_conntrack_proto_sctp.c
-@@ -470,7 +470,8 @@ static int sctp_new(struct nf_conn *conn
-                                        SCTP_CONNTRACK_NONE, sch->type);
- 
-               /* Invalid: delete conntrack */
--              if (newconntrack == SCTP_CONNTRACK_MAX) {
-+              if (newconntrack == SCTP_CONNTRACK_NONE ||
-+                  newconntrack == SCTP_CONNTRACK_MAX) {
-                       DEBUGP("nf_conntrack_sctp: invalid new deleting.\n");
-                       return 0;
-               }

diff --git a/queue-2.6.20/ntfs_init_locked_inode-fix-array-indexing.patch b/queue-2.6.20/ntfs_init_locked_inode-fix-array-indexing.patch
index 44c248ac6ff23af8f10add5649f038371dc5da5f..c47465e3190276844fa2b5bb58617a1d17052039 100644 (file)
--- a/queue-2.6.20/ntfs_init_locked_inode-fix-array-indexing.patch
+++ b/queue-2.6.20/ntfs_init_locked_inode-fix-array-indexing.patch
@@ -18,8 +18,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  fs/ntfs/inode.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- linux-2.6.20.12.orig/fs/ntfs/inode.c
-+++ linux-2.6.20.12/fs/ntfs/inode.c
+--- linux-2.6.20.13.orig/fs/ntfs/inode.c
++++ linux-2.6.20.13/fs/ntfs/inode.c
 @@ -141,7 +141,7 @@ static int ntfs_init_locked_inode(struct
                if (!ni->name)
                        return -ENOMEM;

diff --git a/queue-2.6.20/oom-kill-all-threads-that-share-mm-with-killed-task.patch b/queue-2.6.20/oom-kill-all-threads-that-share-mm-with-killed-task.patch
index ba721d2be3ec47882c0df7149087063f26c2c5c4..94fa9d49714e580d40569fb1ddd3e72ea097c11c 100644 (file)
--- a/queue-2.6.20/oom-kill-all-threads-that-share-mm-with-killed-task.patch
+++ b/queue-2.6.20/oom-kill-all-threads-that-share-mm-with-killed-task.patch
@@ -27,8 +27,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  mm/oom_kill.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- linux-2.6.20.12.orig/mm/oom_kill.c
-+++ linux-2.6.20.12/mm/oom_kill.c
+--- linux-2.6.20.13.orig/mm/oom_kill.c
++++ linux-2.6.20.13/mm/oom_kill.c
 @@ -335,7 +335,7 @@ static int oom_kill_task(struct task_str
         */
        do_each_thread(g, q) {

diff --git a/queue-2.6.20/sata_via-add-missing-pm-hooks.patch b/queue-2.6.20/sata_via-add-missing-pm-hooks.patch
index 8fb0f212fe0a720d52701eb6da9b0d2eafb18ff7..50b4d11c8cf093771f5a811fd762656b7c9f919c 100644 (file)
--- a/queue-2.6.20/sata_via-add-missing-pm-hooks.patch
+++ b/queue-2.6.20/sata_via-add-missing-pm-hooks.patch
@@ -19,8 +19,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  drivers/ata/sata_via.c |    8 ++++++++
  1 file changed, 8 insertions(+)
 
---- linux-2.6.20.12.orig/drivers/ata/sata_via.c
-+++ linux-2.6.20.12/drivers/ata/sata_via.c
+--- linux-2.6.20.13.orig/drivers/ata/sata_via.c
++++ linux-2.6.20.13/drivers/ata/sata_via.c
 @@ -90,6 +90,10 @@ static struct pci_driver svia_pci_driver
        .name                   = DRV_NAME,
        .id_table               = svia_pci_tbl,

diff --git a/queue-2.6.20/series b/queue-2.6.20/series
index 74f6e97d19219b6a558fafb0a76afe1a3b0b293e..6337a555877355fdefa0e8919ed39d493b54ba7c 100644 (file)
--- a/queue-2.6.20/series
+++ b/queue-2.6.20/series
@@ -30,4 +30,3 @@ net-fix-race-condition-about-network-device-name-allocation.patch
 fix-af_unix-oops.patch
 ipv6-route-no-longer-handle-0-specially.patch
 sparc64-don-t-be-picky-about-virtual-dma-values-on-sun4v.patch
-netfilter-ip-nf-_conntrack_sctp-fix-remotely-triggerable-null-ptr-dereference.patch

diff --git a/queue-2.6.20/smc911x-fix-compilation-breakage-wjen-debug-is-on.patch b/queue-2.6.20/smc911x-fix-compilation-breakage-wjen-debug-is-on.patch
index f372db685e839aecb7d0f7ddf7822b13770a45df..937318611ad9c653bd6f38583042affadc95c6c3 100644 (file)
--- a/queue-2.6.20/smc911x-fix-compilation-breakage-wjen-debug-is-on.patch
+++ b/queue-2.6.20/smc911x-fix-compilation-breakage-wjen-debug-is-on.patch
@@ -18,8 +18,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  drivers/net/smc911x.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- linux-2.6.20.12.orig/drivers/net/smc911x.c
-+++ linux-2.6.20.12/drivers/net/smc911x.c
+--- linux-2.6.20.13.orig/drivers/net/smc911x.c
++++ linux-2.6.20.13/drivers/net/smc911x.c
 @@ -499,7 +499,7 @@ static inline void  smc911x_rcv(struct n
                SMC_SET_RX_CFG(RX_CFG_RX_END_ALGN4_ | ((2<<8) & RX_CFG_RXDOFF_));
                SMC_PULL_DATA(data, pkt_len+2+3);

diff --git a/queue-2.6.20/sparc-linux-always-started-with-9600-8n1.patch b/queue-2.6.20/sparc-linux-always-started-with-9600-8n1.patch
index 65aaf6fb47405a7b143623cab1603bb892fda36b..240623cae39cf71fbad2289c14ef3bc47f9462c6 100644 (file)
--- a/queue-2.6.20/sparc-linux-always-started-with-9600-8n1.patch
+++ b/queue-2.6.20/sparc-linux-always-started-with-9600-8n1.patch
@@ -27,8 +27,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  drivers/serial/suncore.c |    6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
---- linux-2.6.20.12.orig/drivers/serial/suncore.c
-+++ linux-2.6.20.12/drivers/serial/suncore.c
+--- linux-2.6.20.13.orig/drivers/serial/suncore.c
++++ linux-2.6.20.13/drivers/serial/suncore.c
 @@ -30,9 +30,9 @@ void
  sunserial_console_termios(struct console *con)
  {

diff --git a/queue-2.6.20/sparc64-don-t-be-picky-about-virtual-dma-values-on-sun4v.patch b/queue-2.6.20/sparc64-don-t-be-picky-about-virtual-dma-values-on-sun4v.patch
index cd5a2b34ec8dd210b1d301e5905dcf74ad0e0aa7..49af1e1a87c2956cf86f249cb95048c838e43379 100644 (file)
--- a/queue-2.6.20/sparc64-don-t-be-picky-about-virtual-dma-values-on-sun4v.patch
+++ b/queue-2.6.20/sparc64-don-t-be-picky-about-virtual-dma-values-on-sun4v.patch
@@ -19,8 +19,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  arch/sparc64/kernel/pci_sun4v.c |   36 ++++++++++--------------------------
  1 file changed, 10 insertions(+), 26 deletions(-)
 
---- linux-2.6.20.12.orig/arch/sparc64/kernel/pci_sun4v.c
-+++ linux-2.6.20.12/arch/sparc64/kernel/pci_sun4v.c
+--- linux-2.6.20.13.orig/arch/sparc64/kernel/pci_sun4v.c
++++ linux-2.6.20.13/arch/sparc64/kernel/pci_sun4v.c
 @@ -10,6 +10,7 @@
  #include <linux/slab.h>
  #include <linux/interrupt.h>

diff --git a/queue-2.6.20/sparc64-fix-_page_exec_4u-check-in-sun4u-i-tlb-miss-handler.patch b/queue-2.6.20/sparc64-fix-_page_exec_4u-check-in-sun4u-i-tlb-miss-handler.patch
index 1f166e3d77f2a672b7b60226fd075fe8ea6e0b51..52a45b1bba6ddef7fde1ffeb41c89f301ea97ea2 100644 (file)
--- a/queue-2.6.20/sparc64-fix-_page_exec_4u-check-in-sun4u-i-tlb-miss-handler.patch
+++ b/queue-2.6.20/sparc64-fix-_page_exec_4u-check-in-sun4u-i-tlb-miss-handler.patch
@@ -19,8 +19,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  arch/sparc64/kernel/itlb_miss.S |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
---- linux-2.6.20.12.orig/arch/sparc64/kernel/itlb_miss.S
-+++ linux-2.6.20.12/arch/sparc64/kernel/itlb_miss.S
+--- linux-2.6.20.13.orig/arch/sparc64/kernel/itlb_miss.S
++++ linux-2.6.20.13/arch/sparc64/kernel/itlb_miss.S
 @@ -11,12 +11,12 @@
  /* ITLB ** ICACHE line 2: TSB compare and TLB load    */
        bne,pn  %xcc, tsb_miss_itlb             ! Miss

diff --git a/queue-2.6.20/sparc64-fix-two-bugs-wrt.-kernel-4mb-tsb.patch b/queue-2.6.20/sparc64-fix-two-bugs-wrt.-kernel-4mb-tsb.patch
index 5b62c1abc96f6802d762a01fdfdc3b87e50ae343..98e46c39ec4f4454d5a50c1e56c746c5dd97ee74 100644 (file)
--- a/queue-2.6.20/sparc64-fix-two-bugs-wrt.-kernel-4mb-tsb.patch
+++ b/queue-2.6.20/sparc64-fix-two-bugs-wrt.-kernel-4mb-tsb.patch
@@ -23,8 +23,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  include/asm-sparc64/tsb.h  |    2 +-
  3 files changed, 32 insertions(+), 8 deletions(-)
 
---- linux-2.6.20.12.orig/arch/sparc64/kernel/head.S
-+++ linux-2.6.20.12/arch/sparc64/kernel/head.S
+--- linux-2.6.20.13.orig/arch/sparc64/kernel/head.S
++++ linux-2.6.20.13/arch/sparc64/kernel/head.S
 @@ -653,33 +653,54 @@ setup_tba:
         restore
  sparc64_boot_end:
@@ -85,8 +85,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  #include "systbls.S"
  
        .data
---- linux-2.6.20.12.orig/arch/sparc64/mm/init.c
-+++ linux-2.6.20.12/arch/sparc64/mm/init.c
+--- linux-2.6.20.13.orig/arch/sparc64/mm/init.c
++++ linux-2.6.20.13/arch/sparc64/mm/init.c
 @@ -60,8 +60,11 @@ unsigned long kern_linear_pte_xor[2] __r
  unsigned long kpte_linear_bitmap[KPTE_BITMAP_BYTES / sizeof(unsigned long)];
  
@@ -101,8 +101,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  #endif
  
  #define MAX_BANKS     32
---- linux-2.6.20.12.orig/include/asm-sparc64/tsb.h
-+++ linux-2.6.20.12/include/asm-sparc64/tsb.h
+--- linux-2.6.20.13.orig/include/asm-sparc64/tsb.h
++++ linux-2.6.20.13/include/asm-sparc64/tsb.h
 @@ -271,7 +271,7 @@ extern struct tsb_phys_patch_entry __tsb
  #define KERN_TSB4M_LOOKUP_TL1(TAG, REG1, REG2, REG3, REG4, OK_LABEL) \
        sethi           %hi(swapper_4m_tsb), REG1; \

diff --git a/queue-2.6.20/tcp-use-default-32768-61000-outgoing-port-range-in-all-cases.patch b/queue-2.6.20/tcp-use-default-32768-61000-outgoing-port-range-in-all-cases.patch
index 46b00b32e82a7f78e1dfe38e53fd124a3b0e47a9..21ddc4188fd01df378e8dfdf593643cc7669fecc 100644 (file)
--- a/queue-2.6.20/tcp-use-default-32768-61000-outgoing-port-range-in-all-cases.patch
+++ b/queue-2.6.20/tcp-use-default-32768-61000-outgoing-port-range-in-all-cases.patch
@@ -25,8 +25,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  net/ipv4/tcp.c                  |    3 ---
  2 files changed, 1 insertion(+), 6 deletions(-)
 
---- linux-2.6.20.12.orig/net/ipv4/inet_connection_sock.c
-+++ linux-2.6.20.12/net/ipv4/inet_connection_sock.c
+--- linux-2.6.20.13.orig/net/ipv4/inet_connection_sock.c
++++ linux-2.6.20.13/net/ipv4/inet_connection_sock.c
 @@ -31,10 +31,8 @@ EXPORT_SYMBOL(inet_csk_timer_bug_msg);
  
  /*
@@ -39,8 +39,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  
  int inet_csk_bind_conflict(const struct sock *sk,
                           const struct inet_bind_bucket *tb)
---- linux-2.6.20.12.orig/net/ipv4/tcp.c
-+++ linux-2.6.20.12/net/ipv4/tcp.c
+--- linux-2.6.20.13.orig/net/ipv4/tcp.c
++++ linux-2.6.20.13/net/ipv4/tcp.c
 @@ -2445,13 +2445,10 @@ void __init tcp_init(void)
                        order++)
                ;

diff --git a/queue-2.6.20/v4l-dvb-budget-ci-fix-tuning-for-tdm-1316.patch b/queue-2.6.20/v4l-dvb-budget-ci-fix-tuning-for-tdm-1316.patch
index 6db0b01e4a11f1bc5c6943b6bbae656cfe016c53..6039780e1e080b03ee390fd686ee81febc9b1ce4 100644 (file)
--- a/queue-2.6.20/v4l-dvb-budget-ci-fix-tuning-for-tdm-1316.patch
+++ b/queue-2.6.20/v4l-dvb-budget-ci-fix-tuning-for-tdm-1316.patch
@@ -27,8 +27,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  drivers/media/dvb/ttpci/budget-ci.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- linux-2.6.20.12.orig/drivers/media/dvb/ttpci/budget-ci.c
-+++ linux-2.6.20.12/drivers/media/dvb/ttpci/budget-ci.c
+--- linux-2.6.20.13.orig/drivers/media/dvb/ttpci/budget-ci.c
++++ linux-2.6.20.13/drivers/media/dvb/ttpci/budget-ci.c
 @@ -892,7 +892,7 @@ static int dvbc_philips_tdm1316l_tuner_s
                band = 1;
        } else if (tuner_frequency < 200000000) {

diff --git a/queue-2.6.20/x86-64-always-flush-all-pages-in-change_page_attr.patch b/queue-2.6.20/x86-64-always-flush-all-pages-in-change_page_attr.patch
index 8b913ced144b70734a0764acd234620eff5c674c..345a86833e36a403ca65357400d1b9e93b37c53c 100644 (file)
--- a/queue-2.6.20/x86-64-always-flush-all-pages-in-change_page_attr.patch
+++ b/queue-2.6.20/x86-64-always-flush-all-pages-in-change_page_attr.patch
@@ -27,8 +27,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  arch/x86_64/mm/pageattr.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- linux-2.6.20.12.orig/arch/x86_64/mm/pageattr.c
-+++ linux-2.6.20.12/arch/x86_64/mm/pageattr.c
+--- linux-2.6.20.13.orig/arch/x86_64/mm/pageattr.c
++++ linux-2.6.20.13/arch/x86_64/mm/pageattr.c
 @@ -81,8 +81,8 @@ static void flush_kernel_map(void *arg)
                void *adr = page_address(pg);
                if (cpu_has_clflush)