updated patches with my signed-off-by and proper diffstat format.

diff --git a/queue/ipsec-array-overflow.patch b/queue/ipsec-array-overflow.patch
index 165e1e75e826fcdfde59b54ed10ab95a9280acc1..147dda5535594f8fcd01d22553199a665f964a46 100644 (file)
--- a/queue/ipsec-array-overflow.patch
+++ b/queue/ipsec-array-overflow.patch
@@ -13,16 +13,14 @@ Spotted by, and original patch by, Balazs Scheidler.
 Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  net/xfrm/xfrm_user.c |    3 +++
  1 files changed, 3 insertions(+)
 
-Index: linux-2.6.12.y/net/xfrm/xfrm_user.c
-===================================================================
---- linux-2.6.12.y.orig/net/xfrm/xfrm_user.c
-+++ linux-2.6.12.y/net/xfrm/xfrm_user.c
-@@ -1180,6 +1180,9 @@ static struct xfrm_policy *xfrm_compile_
+--- linux-2.6.12.3.orig/net/xfrm/xfrm_user.c   2005-07-28 11:17:01.000000000 -0700
++++ linux-2.6.12.3/net/xfrm/xfrm_user.c        2005-07-28 11:17:18.000000000 -0700
+@@ -1180,6 +1180,9 @@
        if (nr > XFRM_MAX_DEPTH)
                return NULL;
  

diff --git a/queue/kbuild-fix-tags-problem-with-o.patch b/queue/kbuild-fix-tags-problem-with-o.patch
index e1a4d0f2c2c8ab9ed6efff2064568c3806a6651b..a8439c1e355fa23fe84afd1e035545270b60c215 100644 (file)
--- a/queue/kbuild-fix-tags-problem-with-o.patch
+++ b/queue/kbuild-fix-tags-problem-with-o.patch
@@ -30,12 +30,16 @@ Signed-off-by: George Anzinger <george@mvista.com>
 Cc: Sam Ravnborg <sam@ravnborg.org>
 Signed-off-by: Andrew Morton <akpm@osdl.org>
 Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 
-diff --git a/Makefile b/Makefile
---- a/Makefile
-+++ b/Makefile
-@@ -1149,7 +1149,7 @@ endif # KBUILD_EXTMOD
+---
+ Makefile |    2 +-
+ 1 files changed, 1 insertion(+), 1 deletion(-)
+
+--- linux-2.6.12.3.orig/Makefile       2005-07-28 11:17:01.000000000 -0700
++++ linux-2.6.12.3/Makefile    2005-07-28 11:17:04.000000000 -0700
+@@ -1149,7 +1149,7 @@
  #(which is the most common case IMHO) to avoid unneeded clutter in the big tags file.
  #Adding $(srctree) adds about 20M on i386 to the size of the output file!
  
@@ -44,9 +48,3 @@ diff --git a/Makefile b/Makefile
  __srctree =
  else
  __srctree = $(srctree)/
-
-_______________________________________________
-stable mailing list
-stable@linux.kernel.org
-http://linux.kernel.org/mailman/listinfo/stable
-

diff --git a/queue/netfilter-NAT-memory-corruption.patch b/queue/netfilter-NAT-memory-corruption.patch
index c6aa7a6c75f9242124ead245bfb3b3fb35040eb5..229b2e2e40579d2d91e18c996a18b995bf1e4d63 100644 (file)
--- a/queue/netfilter-NAT-memory-corruption.patch
+++ b/queue/netfilter-NAT-memory-corruption.patch
@@ -14,17 +14,15 @@ protocol are NATed at the same time and one conntrack goes away.
 
 Signed-off-by: Patrick McHardy <kaber@trash.net>
 Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  net/ipv4/netfilter/ip_nat_proto_tcp.c |    3 ++-
  net/ipv4/netfilter/ip_nat_proto_udp.c |    3 ++-
  2 files changed, 4 insertions(+), 2 deletions(-)
 
-Index: linux-2.6.12.y/net/ipv4/netfilter/ip_nat_proto_tcp.c
-===================================================================
---- linux-2.6.12.y.orig/net/ipv4/netfilter/ip_nat_proto_tcp.c
-+++ linux-2.6.12.y/net/ipv4/netfilter/ip_nat_proto_tcp.c
-@@ -40,7 +40,8 @@ tcp_unique_tuple(struct ip_conntrack_tup
+--- linux-2.6.12.3.orig/net/ipv4/netfilter/ip_nat_proto_tcp.c  2005-07-28 11:17:01.000000000 -0700
++++ linux-2.6.12.3/net/ipv4/netfilter/ip_nat_proto_tcp.c       2005-07-28 11:17:15.000000000 -0700
+@@ -40,7 +40,8 @@
                 enum ip_nat_manip_type maniptype,
                 const struct ip_conntrack *conntrack)
  {
@@ -34,11 +32,9 @@ Index: linux-2.6.12.y/net/ipv4/netfilter/ip_nat_proto_tcp.c
        unsigned int range_size, min, i;
  
        if (maniptype == IP_NAT_MANIP_SRC)
-Index: linux-2.6.12.y/net/ipv4/netfilter/ip_nat_proto_udp.c
-===================================================================
---- linux-2.6.12.y.orig/net/ipv4/netfilter/ip_nat_proto_udp.c
-+++ linux-2.6.12.y/net/ipv4/netfilter/ip_nat_proto_udp.c
-@@ -41,7 +41,8 @@ udp_unique_tuple(struct ip_conntrack_tup
+--- linux-2.6.12.3.orig/net/ipv4/netfilter/ip_nat_proto_udp.c  2005-07-28 11:17:01.000000000 -0700
++++ linux-2.6.12.3/net/ipv4/netfilter/ip_nat_proto_udp.c       2005-07-28 11:17:15.000000000 -0700
+@@ -41,7 +41,8 @@
                 enum ip_nat_manip_type maniptype,
                 const struct ip_conntrack *conntrack)
  {

diff --git a/queue/netfilter-deadlock-ip6_queue.patch b/queue/netfilter-deadlock-ip6_queue.patch
index 26529e8911ac0a24c4e44915f0347d0ff10a6eca..c0a4be8767d154e8778386a99674be420ecccd16 100644 (file)
--- a/queue/netfilter-deadlock-ip6_queue.patch
+++ b/queue/netfilter-deadlock-ip6_queue.patch
@@ -12,16 +12,14 @@ Already fixed in ip_queue, ip6_queue was missed.
 
 Signed-off-by: Patrick McHardy <kaber@trash.net>
 Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  net/ipv6/netfilter/ip6_queue.c |    2 ++
  1 files changed, 2 insertions(+)
 
-Index: linux-2.6.12.y/net/ipv6/netfilter/ip6_queue.c
-===================================================================
---- linux-2.6.12.y.orig/net/ipv6/netfilter/ip6_queue.c
-+++ linux-2.6.12.y/net/ipv6/netfilter/ip6_queue.c
-@@ -76,7 +76,9 @@ static DECLARE_MUTEX(ipqnl_sem);
+--- linux-2.6.12.3.orig/net/ipv6/netfilter/ip6_queue.c 2005-07-28 11:17:01.000000000 -0700
++++ linux-2.6.12.3/net/ipv6/netfilter/ip6_queue.c      2005-07-28 11:17:13.000000000 -0700
+@@ -76,7 +76,9 @@
  static void
  ipq_issue_verdict(struct ipq_queue_entry *entry, int verdict)
  {

diff --git a/queue/netfilter-ip_conntrack_untracked-refcount.patch b/queue/netfilter-ip_conntrack_untracked-refcount.patch
index 49d6ebe822c8b7a053087520b4e5ccf1eacc7a25..aed51394c8a8376eb1227862eed95745918ec627 100644 (file)
--- a/queue/netfilter-ip_conntrack_untracked-refcount.patch
+++ b/queue/netfilter-ip_conntrack_untracked-refcount.patch
@@ -13,16 +13,14 @@ Fixes a crash when unloading ip_conntrack.
 
 Signed-off-by: Patrick McHardy <kaber@trash.net>
 Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  net/ipv4/netfilter/ip_conntrack_core.c |    3 +++
  1 files changed, 3 insertions(+)
 
-Index: linux-2.6.12.y/net/ipv4/netfilter/ip_conntrack_core.c
-===================================================================
---- linux-2.6.12.y.orig/net/ipv4/netfilter/ip_conntrack_core.c
-+++ linux-2.6.12.y/net/ipv4/netfilter/ip_conntrack_core.c
-@@ -1124,6 +1124,9 @@ void ip_conntrack_cleanup(void)
+--- linux-2.6.12.3.orig/net/ipv4/netfilter/ip_conntrack_core.c 2005-07-28 11:17:01.000000000 -0700
++++ linux-2.6.12.3/net/ipv4/netfilter/ip_conntrack_core.c      2005-07-28 11:17:16.000000000 -0700
+@@ -1124,6 +1124,9 @@
                schedule();
                goto i_see_dead_people;
        }

diff --git a/queue/qla2xxx-fc_remote_port_add-failure-fix.patch b/queue/qla2xxx-fc_remote_port_add-failure-fix.patch
index d278b392de06a207f8dddaad64bc6f509253331e..363d95460ee6016544bd0561ebc66b8df17887b6 100644 (file)
--- a/queue/qla2xxx-fc_remote_port_add-failure-fix.patch
+++ b/queue/qla2xxx-fc_remote_port_add-failure-fix.patch
@@ -15,11 +15,14 @@ Reported-by: Michael Reed <mdr@sgi.com>
 
 Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
 Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
+ drivers/scsi/qla2xxx/qla_init.c |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletion(-)
 
---- linux-2.6.12.2/drivers/scsi/qla2xxx/qla_init.c.orig        2005-07-14 15:14:14.000000000 -0700
-+++ linux-2.6.12.2/drivers/scsi/qla2xxx/qla_init.c     2005-07-14 15:14:54.000000000 -0700
-@@ -1914,9 +1914,11 @@ qla2x00_reg_remote_port(scsi_qla_host_t 
+--- linux-2.6.12.3.orig/drivers/scsi/qla2xxx/qla_init.c        2005-07-28 11:17:01.000000000 -0700
++++ linux-2.6.12.3/drivers/scsi/qla2xxx/qla_init.c     2005-07-28 11:17:08.000000000 -0700
+@@ -1914,9 +1914,11 @@
                rport_ids.roles |= FC_RPORT_ROLE_FCP_TARGET;
  
        fcport->rport = rport = fc_remote_port_add(ha->host, 0, &rport_ids);

diff --git a/queue/rocket_c-fix-ldisc-ref-count.patch b/queue/rocket_c-fix-ldisc-ref-count.patch
index 9cff972da4bae6c19db1543e717a21469263e3b8..bc3824546ba5ccee731e9c9fc6d09856807091ec 100644 (file)
--- a/queue/rocket_c-fix-ldisc-ref-count.patch
+++ b/queue/rocket_c-fix-ldisc-ref-count.patch
@@ -14,16 +14,14 @@ and causes release_dev() to hang since it can't get the ref count to 0.
 Signed-off-by: Michal Ostrowski <mostrows@watson.ibm.com>
 Signed-off-by: Andrew Morton <akpm@osdl.org>
 Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  drivers/char/rocket.c |    3 ++-
  1 files changed, 2 insertions(+), 1 deletion(-)
 
-Index: linux-2.6.12.y/drivers/char/rocket.c
-===================================================================
---- linux-2.6.12.y.orig/drivers/char/rocket.c
-+++ linux-2.6.12.y/drivers/char/rocket.c
-@@ -277,7 +277,7 @@ static void rp_do_receive(struct r_port 
+--- linux-2.6.12.3.orig/drivers/char/rocket.c  2005-07-28 11:17:01.000000000 -0700
++++ linux-2.6.12.3/drivers/char/rocket.c       2005-07-28 11:17:09.000000000 -0700
+@@ -277,7 +277,7 @@
                ToRecv = space;
  
        if (ToRecv <= 0)
@@ -32,7 +30,7 @@ Index: linux-2.6.12.y/drivers/char/rocket.c
  
        /*
         * if status indicates there are errored characters in the
-@@ -359,6 +359,7 @@ static void rp_do_receive(struct r_port 
+@@ -359,6 +359,7 @@
        }
        /*  Push the data up to the tty layer */
        ld->receive_buf(tty, tty->flip.char_buf, tty->flip.flag_buf, count);

diff --git a/queue/skb-signedness-fix.patch b/queue/skb-signedness-fix.patch
index 5770feb8f448c64be0aeb97ddaefc21f929c256d..fca4d4503f9fddab8a4d1298e5a399f9ebfe0a92 100644 (file)
--- a/queue/skb-signedness-fix.patch
+++ b/queue/skb-signedness-fix.patch
@@ -43,16 +43,14 @@ problem by crashing his machine and providing me with an Oops.
 
 Signed-off-by: Patrick McHardy <kaber@trash.net>
 Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  include/linux/skbuff.h |    2 +-
  1 files changed, 1 insertion(+), 1 deletion(-)
 
-Index: linux-2.6.12.y/include/linux/skbuff.h
-===================================================================
---- linux-2.6.12.y.orig/include/linux/skbuff.h
-+++ linux-2.6.12.y/include/linux/skbuff.h
-@@ -1192,7 +1192,7 @@ static inline void *skb_header_pointer(c
+--- linux-2.6.12.3.orig/include/linux/skbuff.h 2005-07-28 11:17:01.000000000 -0700
++++ linux-2.6.12.3/include/linux/skbuff.h      2005-07-28 11:17:12.000000000 -0700
+@@ -1192,7 +1192,7 @@
  {
        int hlen = skb_headlen(skb);
  

diff --git a/queue/x86_64-32bit-memleak.patch b/queue/x86_64-32bit-memleak.patch
index d3983269152e413b659e38bb33d6502a37779cb7..fa3f92b5bd282765f1bad495478a26395a238bc8 100644 (file)
--- a/queue/x86_64-32bit-memleak.patch
+++ b/queue/x86_64-32bit-memleak.patch
@@ -20,10 +20,13 @@ Check the return value and free the vma incase of failure.
 
 Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
 Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
+ arch/x86_64/ia32/syscall32.c |    7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletion(-)
 
---- linux-2.6.12.2/arch/x86_64/ia32/syscall32.c.orig   2005-06-29 16:00:53.000000000 -0700
-+++ linux-2.6.12.2/arch/x86_64/ia32/syscall32.c        2005-07-15 18:09:06.684409144 -0700
+--- linux-2.6.12.3.orig/arch/x86_64/ia32/syscall32.c   2005-07-28 11:17:01.000000000 -0700
++++ linux-2.6.12.3/arch/x86_64/ia32/syscall32.c        2005-07-28 11:17:11.000000000 -0700
 @@ -57,6 +57,7 @@
        int npages = (VSYSCALL32_END - VSYSCALL32_BASE) >> PAGE_SHIFT;
        struct vm_area_struct *vma;