refreshed patches and added 2 more to queue

diff --git a/queue/4GB-memory-intel-dual-core.patch b/queue/4GB-memory-intel-dual-core.patch
index 109665387c4aac5731edbe67ef65dff1b13df35e..d144130aaeea42767998b94e2bd360fa577577a5 100644 (file)
--- a/queue/4GB-memory-intel-dual-core.patch
+++ b/queue/4GB-memory-intel-dual-core.patch
@@ -23,16 +23,14 @@ http://download.intel.com/design/Pentium4/specupdt/30235221.pdf
 Signed-off-by: Shaohua Li<shaohua.li@intel.com>
 Signed-off-by: Andi Kleen <ak@suse.de>
 Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  arch/i386/kernel/cpu/mtrr/main.c |    8 ++++++++
  arch/x86_64/kernel/setup.c       |    5 +++++
  2 files changed, 13 insertions(+)
 
-Index: linux-2.6.14.y/arch/i386/kernel/cpu/mtrr/main.c
-===================================================================
---- linux-2.6.14.y.orig/arch/i386/kernel/cpu/mtrr/main.c
-+++ linux-2.6.14.y/arch/i386/kernel/cpu/mtrr/main.c
+--- linux-2.6.14.2.orig/arch/i386/kernel/cpu/mtrr/main.c
++++ linux-2.6.14.2/arch/i386/kernel/cpu/mtrr/main.c
 @@ -626,6 +626,14 @@ void __init mtrr_bp_init(void)
                if (cpuid_eax(0x80000000) >= 0x80000008) {
                        u32 phys_addr;
@@ -48,10 +46,8 @@ Index: linux-2.6.14.y/arch/i386/kernel/cpu/mtrr/main.c
                        size_or_mask = ~((1 << (phys_addr - PAGE_SHIFT)) - 1);
                        size_and_mask = ~size_or_mask & 0xfff00000;
                } else if (boot_cpu_data.x86_vendor == X86_VENDOR_CENTAUR &&
-Index: linux-2.6.14.y/arch/x86_64/kernel/setup.c
-===================================================================
---- linux-2.6.14.y.orig/arch/x86_64/kernel/setup.c
-+++ linux-2.6.14.y/arch/x86_64/kernel/setup.c
+--- linux-2.6.14.2.orig/arch/x86_64/kernel/setup.c
++++ linux-2.6.14.2/arch/x86_64/kernel/setup.c
 @@ -993,6 +993,11 @@ static void __cpuinit init_intel(struct 
                unsigned eax = cpuid_eax(0x80000008);
                c->x86_virt_bits = (eax >> 8) & 0xff;

diff --git a/queue/acpi-fix-null-deref-in-video-lcd-brightness.patch b/queue/acpi-fix-null-deref-in-video-lcd-brightness.patch
new file mode 100644 (file)
index 0000000..aaaeded
--- /dev/null
+++ b/queue/acpi-fix-null-deref-in-video-lcd-brightness.patch
@@ -0,0 +1,34 @@
+From stable-bounces@linux.kernel.org Sat Nov 19 15:41:57 2005
+Message-Id: <200511192354.jAJNs0Aw015608@shell0.pdx.osdl.net>
+To: luming.yu@gmail.com, len.brown@intel.com, nacc@us.ibm.com, stable@kernel.org, trenn@suse.de, mm-commits@vger.kernel.org
+From: akpm@osdl.org
+Date: Sat, 19 Nov 2005 15:53:56 -0800
+Cc: 
+Subject: apci: fix NULL deref in video/lcd/brightness
+
+From: Yu Luming <luming.yu@gmail.com>
+
+Fix Null pointer deref in video/lcd/brightness
+http://bugzilla.kernel.org/show_bug.cgi?id=5571
+
+Signed-off-by: Yu Luming <luming.yu@gmail.com>
+Cc: "Brown, Len" <len.brown@intel.com>
+Signed-off-by: Thomas Renninger <trenn@suse.de>
+Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+---
+ drivers/acpi/video.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- linux-2.6.14.2.orig/drivers/acpi/video.c
++++ linux-2.6.14.2/drivers/acpi/video.c
+@@ -813,7 +813,7 @@ acpi_video_device_write_brightness(struc
+ 
+       ACPI_FUNCTION_TRACE("acpi_video_device_write_brightness");
+ 
+-      if (!dev || count + 1 > sizeof str)
++      if (!dev || !dev->brightness || count + 1 > sizeof str)
+               return_VALUE(-EINVAL);
+ 
+       if (copy_from_user(str, buffer, count))

diff --git a/queue/ctnetlink-check-if-protoinfo-is-present.patch b/queue/ctnetlink-check-if-protoinfo-is-present.patch
index 48efc77b18dce7db6f67bd4150926cf13954d0f8..7a7023cfacf304365572093a73c9d13bc126b235 100644 (file)
--- a/queue/ctnetlink-check-if-protoinfo-is-present.patch
+++ b/queue/ctnetlink-check-if-protoinfo-is-present.patch
@@ -12,15 +12,13 @@ likely to happen in update messages.
 Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
 Signed-off-by: Harald Welte <laforge@netfilter.org>
 Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  net/ipv4/netfilter/ip_conntrack_proto_tcp.c |    5 +++++
- 1 files changed, 5 insertions(+)
+ 1 file changed, 5 insertions(+)
 
-Index: linux-2.6.14.y/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
-===================================================================
---- linux-2.6.14.y.orig/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
-+++ linux-2.6.14.y/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
+--- linux-2.6.14.2.orig/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
++++ linux-2.6.14.2/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
 @@ -362,6 +362,11 @@ static int nfattr_to_tcp(struct nfattr *
        struct nfattr *attr = cda[CTA_PROTOINFO_TCP-1];
        struct nfattr *tb[CTA_PROTOINFO_TCP_MAX];

diff --git a/queue/ctnetlink-fix-oops-when-no-icpm-id-info-in-message.patch b/queue/ctnetlink-fix-oops-when-no-icpm-id-info-in-message.patch
index 7aa6077a4cd9542665962da2aeaf2259b785216e..1b35cc6fe7595dd28c5a2779f51e43994f29f9a8 100644 (file)
--- a/queue/ctnetlink-fix-oops-when-no-icpm-id-info-in-message.patch
+++ b/queue/ctnetlink-fix-oops-when-no-icpm-id-info-in-message.patch
@@ -14,15 +14,13 @@ Signed-off-by: Krzysztof Piotr Oledzki <ole@ans.pl>
 Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
 Signed-off-by: Harald Welte <laforge@netfilter.org>
 Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  net/ipv4/netfilter/ip_conntrack_proto_icmp.c |   13 +++++++------
- 1 files changed, 7 insertions(+), 6 deletions(-)
+ 1 file changed, 7 insertions(+), 6 deletions(-)
 
-Index: linux-2.6.14.y/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
-===================================================================
---- linux-2.6.14.y.orig/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
-+++ linux-2.6.14.y/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
+--- linux-2.6.14.2.orig/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
++++ linux-2.6.14.2/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
 @@ -151,13 +151,13 @@ icmp_error_message(struct sk_buff *skb,
        /* Not enough header? */
        inside = skb_header_pointer(skb, skb->nh.iph->ihl*4, sizeof(_in), &_in);

diff --git a/queue/drivers-isdn-hardware-eicon-os_4bri.c-correct-the-xdiloadfile-signature.patch b/queue/drivers-isdn-hardware-eicon-os_4bri.c-correct-the-xdiloadfile-signature.patch
new file mode 100644 (file)
index 0000000..26be6a5
--- /dev/null
+++ b/queue/drivers-isdn-hardware-eicon-os_4bri.c-correct-the-xdiloadfile-signature.patch
@@ -0,0 +1,42 @@
+From stable-bounces@linux.kernel.org Sat Nov 19 12:21:35 2005
+Date: Sat, 19 Nov 2005 08:58:12 +0100
+From: Adrian Bunk <bunk@stusta.de>
+To: mac@melware.de
+Message-ID: <20051119075812.GC16060@stusta.de>
+Content-Disposition: inline
+Cc: kai.germaschewski@gmx.de, isdn4linux@listserv.isdn4linux.de, stable@kernel.org, kkeil@suse.de
+Subject: drivers/isdn/hardware/eicon/os_4bri.c: correct the xdiLoadFile() signature
+
+It's not good if caller and callee disagree regarding the type of the
+arguments.
+
+In this case, this could cause problems on 64bit architectures.
+
+
+Signed-off-by: Adrian Bunk <bunk@stusta.de>
+Signed-off-by: Armin Schindler <armin@melware.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/isdn/hardware/eicon/os_4bri.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- linux-2.6.14.2.orig/drivers/isdn/hardware/eicon/os_4bri.c
++++ linux-2.6.14.2/drivers/isdn/hardware/eicon/os_4bri.c
+@@ -16,6 +16,7 @@
+ #include "diva_pci.h"
+ #include "mi_pc.h"
+ #include "dsrv4bri.h"
++#include "helpers.h"
+ 
+ static void *diva_xdiLoadFileFile = NULL;
+ static dword diva_xdiLoadFileLength = 0;
+@@ -815,7 +816,7 @@ diva_4bri_cmd_card_proc(struct _diva_os_
+       return (ret);
+ }
+ 
+-void *xdiLoadFile(char *FileName, unsigned long *FileLength,
++void *xdiLoadFile(char *FileName, dword *FileLength,
+                 unsigned long lim)
+ {
+       void *ret = diva_xdiLoadFileFile;

diff --git a/queue/fix-calculation-of-ah-length-during.patch b/queue/fix-calculation-of-ah-length-during.patch
index 67bb4074387fd88f360820e0b27a5496e4efee05..d9a3cffd92f74405d712c0d44bebfa4f6325b67a 100644 (file)
--- a/queue/fix-calculation-of-ah-length-during.patch
+++ b/queue/fix-calculation-of-ah-length-during.patch
@@ -10,15 +10,13 @@ From: Ville Nuorvala <vnuorval@tcs.hut.fi>
 
 Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
 Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  net/ipv6/datagram.c |    2 +-
- 1 files changed, 1 insertion(+), 1 deletion(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: linux-2.6.14.y/net/ipv6/datagram.c
-===================================================================
---- linux-2.6.14.y.orig/net/ipv6/datagram.c
-+++ linux-2.6.14.y/net/ipv6/datagram.c
+--- linux-2.6.14.2.orig/net/ipv6/datagram.c
++++ linux-2.6.14.2/net/ipv6/datagram.c
 @@ -437,7 +437,7 @@ int datagram_recv_ctl(struct sock *sk, s
                                break;
                        case IPPROTO_AH:

diff --git a/queue/fix-memory-leak-with-file-leases.patch b/queue/fix-memory-leak-with-file-leases.patch
index 80b32c4ed18ffd860ebc8ab21087ff1af6ab209e..51dbf3464d13a3082748afddb8960056ff24bd84 100644 (file)
--- a/queue/fix-memory-leak-with-file-leases.patch
+++ b/queue/fix-memory-leak-with-file-leases.patch
@@ -16,15 +16,13 @@ freeing up the lease.
 Signed-off-by: J. Bruce Fields <bfields@fieldses.org>
 Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
 Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  fs/locks.c |    2 +-
- 1 files changed, 1 insertion(+), 1 deletion(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: linux-2.6.14.y/fs/locks.c
-===================================================================
---- linux-2.6.14.y.orig/fs/locks.c
-+++ linux-2.6.14.y/fs/locks.c
+--- linux-2.6.14.2.orig/fs/locks.c
++++ linux-2.6.14.2/fs/locks.c
 @@ -1418,7 +1418,7 @@ int fcntl_setlease(unsigned int fd, stru
        lock_kernel();
  

diff --git a/queue/fix-memory-management-error-during.patch b/queue/fix-memory-management-error-during.patch
index cdeb592ecaae7e8f6067c02ee2a647163515d40a..03060f264f79d62c932538ff03b4b5f1ece8ea42 100644 (file)
--- a/queue/fix-memory-management-error-during.patch
+++ b/queue/fix-memory-management-error-during.patch
@@ -8,15 +8,13 @@ Subject: [PATCH] [IPV6]: Fix memory management error during setting up new advap
 
 Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
 Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  net/ipv6/exthdrs.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletion(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
-Index: linux-2.6.14.y/net/ipv6/exthdrs.c
-===================================================================
---- linux-2.6.14.y.orig/net/ipv6/exthdrs.c
-+++ linux-2.6.14.y/net/ipv6/exthdrs.c
+--- linux-2.6.14.2.orig/net/ipv6/exthdrs.c
++++ linux-2.6.14.2/net/ipv6/exthdrs.c
 @@ -628,6 +628,7 @@ ipv6_renew_options(struct sock *sk, stru
        if (!tot_len)
                return NULL;

diff --git a/queue/fix-sending-extension-headers-before.patch b/queue/fix-sending-extension-headers-before.patch
index 6e18d10f507550fe55885da74b320ee3cf0968e2..4ce666e902238356f1dc9580503ecc7eb08d8cb6 100644 (file)
--- a/queue/fix-sending-extension-headers-before.patch
+++ b/queue/fix-sending-extension-headers-before.patch
@@ -10,8 +10,8 @@ Based on suggestion from Masahide Nakamura <nakam@linux-ipv6.org>.
 
 Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
 Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  include/net/ipv6.h       |    2 ++
  net/ipv6/exthdrs.c       |   19 +++++++++++++++++++
  net/ipv6/ip6_flowlabel.c |   16 ++++++----------
@@ -19,10 +19,8 @@ Signed-off-by: Chris Wright <chrisw@osdl.org>
  net/ipv6/udp.c           |    4 +++-
  5 files changed, 33 insertions(+), 12 deletions(-)
 
-Index: linux-2.6.14.y/include/net/ipv6.h
-===================================================================
---- linux-2.6.14.y.orig/include/net/ipv6.h
-+++ linux-2.6.14.y/include/net/ipv6.h
+--- linux-2.6.14.2.orig/include/net/ipv6.h
++++ linux-2.6.14.2/include/net/ipv6.h
 @@ -237,6 +237,8 @@ extern struct ipv6_txoptions *     ipv6_rene
                                                   int newtype,
                                                   struct ipv6_opt_hdr __user *newopt,
@@ -32,10 +30,8 @@ Index: linux-2.6.14.y/include/net/ipv6.h
  
  extern int ip6_frag_nqueues;
  extern atomic_t ip6_frag_mem;
-Index: linux-2.6.14.y/net/ipv6/exthdrs.c
-===================================================================
---- linux-2.6.14.y.orig/net/ipv6/exthdrs.c
-+++ linux-2.6.14.y/net/ipv6/exthdrs.c
+--- linux-2.6.14.2.orig/net/ipv6/exthdrs.c
++++ linux-2.6.14.2/net/ipv6/exthdrs.c
 @@ -673,3 +673,22 @@ out:
        return ERR_PTR(err);
  }
@@ -59,10 +55,8 @@ Index: linux-2.6.14.y/net/ipv6/exthdrs.c
 +      return opt;
 +}
 +
-Index: linux-2.6.14.y/net/ipv6/ip6_flowlabel.c
-===================================================================
---- linux-2.6.14.y.orig/net/ipv6/ip6_flowlabel.c
-+++ linux-2.6.14.y/net/ipv6/ip6_flowlabel.c
+--- linux-2.6.14.2.orig/net/ipv6/ip6_flowlabel.c
++++ linux-2.6.14.2/net/ipv6/ip6_flowlabel.c
 @@ -225,20 +225,16 @@ struct ipv6_txoptions *fl6_merge_options
                                         struct ip6_flowlabel * fl,
                                         struct ipv6_txoptions * fopt)
@@ -75,10 +69,10 @@ Index: linux-2.6.14.y/net/ipv6/ip6_flowlabel.c
 -      }
 -
 +      struct ipv6_txoptions * fl_opt = fl->opt;
-+      
++
 +      if (fopt == NULL || fopt->opt_flen == 0)
 +              return fl_opt;
-+      
++
        if (fl_opt != NULL) {
                opt_space->hopopt = fl_opt->hopopt;
 -              opt_space->dst0opt = fl_opt->srcrt ? fl_opt->dst0opt : NULL;
@@ -90,10 +84,8 @@ Index: linux-2.6.14.y/net/ipv6/ip6_flowlabel.c
        } else {
                if (fopt->opt_nflen == 0)
                        return fopt;
-Index: linux-2.6.14.y/net/ipv6/raw.c
-===================================================================
---- linux-2.6.14.y.orig/net/ipv6/raw.c
-+++ linux-2.6.14.y/net/ipv6/raw.c
+--- linux-2.6.14.2.orig/net/ipv6/raw.c
++++ linux-2.6.14.2/net/ipv6/raw.c
 @@ -756,7 +756,9 @@ static int rawv6_sendmsg(struct kiocb *i
        }
        if (opt == NULL)
@@ -105,10 +97,8 @@ Index: linux-2.6.14.y/net/ipv6/raw.c
  
        fl.proto = proto;
        rawv6_probe_proto_opt(&fl, msg);
-Index: linux-2.6.14.y/net/ipv6/udp.c
-===================================================================
---- linux-2.6.14.y.orig/net/ipv6/udp.c
-+++ linux-2.6.14.y/net/ipv6/udp.c
+--- linux-2.6.14.2.orig/net/ipv6/udp.c
++++ linux-2.6.14.2/net/ipv6/udp.c
 @@ -778,7 +778,9 @@ do_udp_sendmsg:
        }
        if (opt == NULL)

diff --git a/queue/fix-soft-lockup-with-ALSA-rtc-timer.patch b/queue/fix-soft-lockup-with-ALSA-rtc-timer.patch
index 43cb0c01a3daee9ecc8fda1be2c71b32547b5d71..ef9d7ec566ff9fc8cf4fa2a79ff9991f3abd6442 100644 (file)
--- a/queue/fix-soft-lockup-with-ALSA-rtc-timer.patch
+++ b/queue/fix-soft-lockup-with-ALSA-rtc-timer.patch
@@ -10,14 +10,13 @@ handling in rtc_control().  The call of rtc_control() can be atomic.
 
 Signed-off-by: Takashi Iwai <tiwai@suse.de>
 Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
  drivers/char/rtc.c |   65 ++++++++++++++++++++++++++++++-----------------------
- 1 files changed, 38 insertions(+), 27 deletions(-)
+ 1 file changed, 38 insertions(+), 27 deletions(-)
 
-Index: linux-2.6.14.y/drivers/char/rtc.c
-===================================================================
---- linux-2.6.14.y.orig/drivers/char/rtc.c
-+++ linux-2.6.14.y/drivers/char/rtc.c
+--- linux-2.6.14.2.orig/drivers/char/rtc.c
++++ linux-2.6.14.2/drivers/char/rtc.c
 @@ -149,8 +149,22 @@ static void get_rtc_alm_time (struct rtc
  #ifdef RTC_IRQ
  static void rtc_dropped_irq(unsigned long data);

diff --git a/queue/generic-hdlc-wan-drivers-disable-netif_carrier_off.patch b/queue/generic-hdlc-wan-drivers-disable-netif_carrier_off.patch
index 6dab9b331c6ba889e119871c3074276650b98d02..e14a33c2e8477c17699795461ff4d2b14052e312 100644 (file)
--- a/queue/generic-hdlc-wan-drivers-disable-netif_carrier_off.patch
+++ b/queue/generic-hdlc-wan-drivers-disable-netif_carrier_off.patch
@@ -16,17 +16,15 @@ don't touch the physical device.
 
 Signed-off-by: Krzysztof Halasa <khc@pm.waw.pl>
 Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  drivers/net/wan/hdlc_cisco.c   |    6 ++++++
  drivers/net/wan/hdlc_fr.c      |    4 ++++
  drivers/net/wan/hdlc_generic.c |    6 ++++++
  3 files changed, 16 insertions(+)
 
-Index: linux-2.6.14.y/drivers/net/wan/hdlc_cisco.c
-===================================================================
---- linux-2.6.14.y.orig/drivers/net/wan/hdlc_cisco.c
-+++ linux-2.6.14.y/drivers/net/wan/hdlc_cisco.c
+--- linux-2.6.14.2.orig/drivers/net/wan/hdlc_cisco.c
++++ linux-2.6.14.2/drivers/net/wan/hdlc_cisco.c
 @@ -192,7 +192,9 @@ static int cisco_rx(struct sk_buff *skb)
                                               "uptime %ud%uh%um%us)\n",
                                               dev->name, days, hrs,
@@ -58,10 +56,8 @@ Index: linux-2.6.14.y/drivers/net/wan/hdlc_cisco.c
        hdlc->state.cisco.up = 0;
        hdlc->state.cisco.request_sent = 0;
  }
-Index: linux-2.6.14.y/drivers/net/wan/hdlc_fr.c
-===================================================================
---- linux-2.6.14.y.orig/drivers/net/wan/hdlc_fr.c
-+++ linux-2.6.14.y/drivers/net/wan/hdlc_fr.c
+--- linux-2.6.14.2.orig/drivers/net/wan/hdlc_fr.c
++++ linux-2.6.14.2/drivers/net/wan/hdlc_fr.c
 @@ -545,8 +545,10 @@ static void fr_set_link_state(int reliab
  
        hdlc->state.fr.reliable = reliable;
@@ -84,10 +80,8 @@ Index: linux-2.6.14.y/drivers/net/wan/hdlc_fr.c
  
                while (pvc) {           /* Deactivate all PVCs */
                        pvc_carrier(0, pvc);
-Index: linux-2.6.14.y/drivers/net/wan/hdlc_generic.c
-===================================================================
---- linux-2.6.14.y.orig/drivers/net/wan/hdlc_generic.c
-+++ linux-2.6.14.y/drivers/net/wan/hdlc_generic.c
+--- linux-2.6.14.2.orig/drivers/net/wan/hdlc_generic.c
++++ linux-2.6.14.2/drivers/net/wan/hdlc_generic.c
 @@ -79,11 +79,13 @@ static void __hdlc_set_carrier_on(struct
        hdlc_device *hdlc = dev_to_hdlc(dev);
        if (hdlc->proto.start)

diff --git a/queue/ip_conntrack-fix-ftp-irc-tftp-helpers-on-large-ports.patch b/queue/ip_conntrack-fix-ftp-irc-tftp-helpers-on-large-ports.patch
index 4a1e0e540f918de7e3b315307efa29a72d0dbfa4..06f442cbc8f7a27ee7b2305ff1faf31611154d32 100644 (file)
--- a/queue/ip_conntrack-fix-ftp-irc-tftp-helpers-on-large-ports.patch
+++ b/queue/ip_conntrack-fix-ftp-irc-tftp-helpers-on-large-ports.patch
@@ -15,17 +15,15 @@ Thanks to Jan Nijs for reporting this bug.
 
 Signed-off-by: Harald Welte <laforge@netfilter.org>
 Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  net/ipv4/netfilter/ip_conntrack_ftp.c  |    4 ++--
  net/ipv4/netfilter/ip_conntrack_irc.c  |    4 ++--
  net/ipv4/netfilter/ip_conntrack_tftp.c |    4 ++--
  3 files changed, 6 insertions(+), 6 deletions(-)
 
-Index: linux-2.6.14.y/net/ipv4/netfilter/ip_conntrack_ftp.c
-===================================================================
---- linux-2.6.14.y.orig/net/ipv4/netfilter/ip_conntrack_ftp.c
-+++ linux-2.6.14.y/net/ipv4/netfilter/ip_conntrack_ftp.c
+--- linux-2.6.14.2.orig/net/ipv4/netfilter/ip_conntrack_ftp.c
++++ linux-2.6.14.2/net/ipv4/netfilter/ip_conntrack_ftp.c
 @@ -29,9 +29,9 @@ static char *ftp_buffer;
  static DEFINE_SPINLOCK(ip_ftp_lock);
  
@@ -38,10 +36,8 @@ Index: linux-2.6.14.y/net/ipv4/netfilter/ip_conntrack_ftp.c
  
  static int loose;
  module_param(loose, int, 0600);
-Index: linux-2.6.14.y/net/ipv4/netfilter/ip_conntrack_irc.c
-===================================================================
---- linux-2.6.14.y.orig/net/ipv4/netfilter/ip_conntrack_irc.c
-+++ linux-2.6.14.y/net/ipv4/netfilter/ip_conntrack_irc.c
+--- linux-2.6.14.2.orig/net/ipv4/netfilter/ip_conntrack_irc.c
++++ linux-2.6.14.2/net/ipv4/netfilter/ip_conntrack_irc.c
 @@ -34,7 +34,7 @@
  #include <linux/moduleparam.h>
  
@@ -60,10 +56,8 @@ Index: linux-2.6.14.y/net/ipv4/netfilter/ip_conntrack_irc.c
  MODULE_PARM_DESC(ports, "port numbers of IRC servers");
  module_param(max_dcc_channels, int, 0400);
  MODULE_PARM_DESC(max_dcc_channels, "max number of expected DCC channels per IRC session");
-Index: linux-2.6.14.y/net/ipv4/netfilter/ip_conntrack_tftp.c
-===================================================================
---- linux-2.6.14.y.orig/net/ipv4/netfilter/ip_conntrack_tftp.c
-+++ linux-2.6.14.y/net/ipv4/netfilter/ip_conntrack_tftp.c
+--- linux-2.6.14.2.orig/net/ipv4/netfilter/ip_conntrack_tftp.c
++++ linux-2.6.14.2/net/ipv4/netfilter/ip_conntrack_tftp.c
 @@ -26,9 +26,9 @@ MODULE_DESCRIPTION("tftp connection trac
  MODULE_LICENSE("GPL");
  

diff --git a/queue/ip_conntrack-tcp-accept-syn+push-like-syn.patch b/queue/ip_conntrack-tcp-accept-syn+push-like-syn.patch
index fbd3cffa67e5165d4d9ad8060a71811cd688bfab..842115e7a3d126afce0a0ce936fe6c57f6e64b50 100644 (file)
--- a/queue/ip_conntrack-tcp-accept-syn+push-like-syn.patch
+++ b/queue/ip_conntrack-tcp-accept-syn+push-like-syn.patch
@@ -19,15 +19,13 @@ flag combination.
 Signed-off-by: Vlad Drukker <vlad@storewiz.com>
 Signed-off-by: Harald Welte <laforge@netfilter.org>
 Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  net/ipv4/netfilter/ip_conntrack_proto_tcp.c |    1 +
- 1 files changed, 1 insertion(+)
+ 1 file changed, 1 insertion(+)
 
-Index: linux-2.6.14.y/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
-===================================================================
---- linux-2.6.14.y.orig/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
-+++ linux-2.6.14.y/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
+--- linux-2.6.14.2.orig/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
++++ linux-2.6.14.2/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
 @@ -818,6 +818,7 @@ static u8 tcp_valid_flags[(TH_FIN|TH_SYN
  {
        [TH_SYN]                        = 1,

diff --git a/queue/nat-fix-module-refcount-droppoing-too-far.patch b/queue/nat-fix-module-refcount-droppoing-too-far.patch
index 83db00ded599912f177db1c89d6acc9d65af7dfb..4818b3607ac046aeb269cc8a5a84a4dd647a51fe 100644 (file)
--- a/queue/nat-fix-module-refcount-droppoing-too-far.patch
+++ b/queue/nat-fix-module-refcount-droppoing-too-far.patch
@@ -17,16 +17,14 @@ Also, remove the "protocol is NULL" test: it's never NULL.
 Signed-off-by: Rusty Rusty <rusty@rustcorp.com.au>
 Signed-off-by: Harald Welte <laforge@netfilter.org>
 Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  net/ipv4/netfilter/ip_nat_core.c          |    6 ++----
  net/ipv4/netfilter/ip_nat_proto_unknown.c |    2 +-
  2 files changed, 3 insertions(+), 5 deletions(-)
 
-Index: linux-2.6.14.y/net/ipv4/netfilter/ip_nat_core.c
-===================================================================
---- linux-2.6.14.y.orig/net/ipv4/netfilter/ip_nat_core.c
-+++ linux-2.6.14.y/net/ipv4/netfilter/ip_nat_core.c
+--- linux-2.6.14.2.orig/net/ipv4/netfilter/ip_nat_core.c
++++ linux-2.6.14.2/net/ipv4/netfilter/ip_nat_core.c
 @@ -66,10 +66,8 @@ ip_nat_proto_find_get(u_int8_t protonum)
         * removed until we've grabbed the reference */
        preempt_disable();
@@ -40,10 +38,8 @@ Index: linux-2.6.14.y/net/ipv4/netfilter/ip_nat_core.c
        preempt_enable();
  
        return p;
-Index: linux-2.6.14.y/net/ipv4/netfilter/ip_nat_proto_unknown.c
-===================================================================
---- linux-2.6.14.y.orig/net/ipv4/netfilter/ip_nat_proto_unknown.c
-+++ linux-2.6.14.y/net/ipv4/netfilter/ip_nat_proto_unknown.c
+--- linux-2.6.14.2.orig/net/ipv4/netfilter/ip_nat_proto_unknown.c
++++ linux-2.6.14.2/net/ipv4/netfilter/ip_nat_proto_unknown.c
 @@ -62,7 +62,7 @@ unknown_print_range(char *buffer, const 
  
  struct ip_nat_protocol ip_nat_unknown_protocol = {

diff --git a/queue/nf_queue-fix-oops-when-no-queue-handler-registered.patch b/queue/nf_queue-fix-oops-when-no-queue-handler-registered.patch
index 27b2eb8b5f9ac4a0c1bbaf3d4efabb846c485fce..c26389b115c276a5a7250330f9e28a631afabd8b 100644 (file)
--- a/queue/nf_queue-fix-oops-when-no-queue-handler-registered.patch
+++ b/queue/nf_queue-fix-oops-when-no-queue-handler-registered.patch
@@ -11,15 +11,13 @@ registered.  This patch fixes it.
 
 Signed-off-by: Harald Welte <laforge@netfilter.org>
 Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  net/netfilter/nf_queue.c |    2 +-
- 1 files changed, 1 insertion(+), 1 deletion(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: linux-2.6.14.y/net/netfilter/nf_queue.c
-===================================================================
---- linux-2.6.14.y.orig/net/netfilter/nf_queue.c
-+++ linux-2.6.14.y/net/netfilter/nf_queue.c
+--- linux-2.6.14.2.orig/net/netfilter/nf_queue.c
++++ linux-2.6.14.2/net/netfilter/nf_queue.c
 @@ -117,7 +117,7 @@ int nf_queue(struct sk_buff **skb, 
  
        /* QUEUE == DROP if noone is waiting, to be safe. */

diff --git a/queue/packet-writing-oops-fix.patch b/queue/packet-writing-oops-fix.patch
index 550c9d0282f97c0b0d0c3612053d50e121a80476..eaa1c388f1302f504d3617a58b7ddcd9e1c33cf0 100644 (file)
--- a/queue/packet-writing-oops-fix.patch
+++ b/queue/packet-writing-oops-fix.patch
@@ -15,15 +15,13 @@ Signed-off-by: Peter Osterlund <petero2@telia.com>
 Cc: <stable@kernel.org>
 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/block/pktcdvd.c |    2 +-
- 1 files changed, 1 insertion(+), 1 deletion(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: linux-2.6.14.y/drivers/block/pktcdvd.c
-===================================================================
---- linux-2.6.14.y.orig/drivers/block/pktcdvd.c
-+++ linux-2.6.14.y/drivers/block/pktcdvd.c
+--- linux-2.6.14.2.orig/drivers/block/pktcdvd.c
++++ linux-2.6.14.2/drivers/block/pktcdvd.c
 @@ -1191,7 +1191,7 @@ static void pkt_count_states(struct pktc
        struct packet_data *pkt;
        int i;

diff --git a/queue/ppc64-memory-model-depends-on-NUMA.patch b/queue/ppc64-memory-model-depends-on-NUMA.patch
index eb55cbfbc700a294f365003a327bc374b4a3a13a..852724890781b78083068e3723afdf85259cc3ea 100644 (file)
--- a/queue/ppc64-memory-model-depends-on-NUMA.patch
+++ b/queue/ppc64-memory-model-depends-on-NUMA.patch
@@ -9,12 +9,13 @@ Subject: [PATCH] ppc64 memory model depends on NUMA
 Signed-off-by: Andy Whitcroft <apw@shadowen.org>
 Signed-off-by: Joel Schopp <jschopp@austin.ibm.com>
 Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
+ arch/ppc64/Kconfig |   11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
 
-Index: 2.6.14-stable1/arch/ppc64/Kconfig
-===================================================================
---- 2.6.14-stable1.orig/arch/ppc64/Kconfig     2005-11-09 17:20:56.%N -0600
-+++ 2.6.14-stable1/arch/ppc64/Kconfig  2005-11-09 17:31:34.%N -0600
+--- linux-2.6.14.2.orig/arch/ppc64/Kconfig
++++ linux-2.6.14.2/arch/ppc64/Kconfig
 @@ -234,6 +234,10 @@ config HMT
          This option enables hardware multithreading on RS64 cpus.
          pSeries systems p620 and p660 have such a cpu type.
@@ -47,4 +48,3 @@ Index: 2.6.14-stable1/arch/ppc64/Kconfig
  config SCHED_SMT
        bool "SMT (Hyperthreading) scheduler support"
        depends on SMP
-

diff --git a/queue/pptp-helper-fix-endianness-bug-in-gre-key-callid-nat.patch b/queue/pptp-helper-fix-endianness-bug-in-gre-key-callid-nat.patch
index 9db470dbfdf441e8e3067aac955721cece9aca65..cac12d0684755e2d659248af6af7bd46aba0abc9 100644 (file)
--- a/queue/pptp-helper-fix-endianness-bug-in-gre-key-callid-nat.patch
+++ b/queue/pptp-helper-fix-endianness-bug-in-gre-key-callid-nat.patch
@@ -63,15 +63,13 @@ None of my tests caught the problem, since the linux pptp client always has
 
 Signed-off-by: Harald Welte <laforge@netfilter.org>
 Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  net/ipv4/netfilter/ip_nat_proto_gre.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: linux-2.6.14.y/net/ipv4/netfilter/ip_nat_proto_gre.c
-===================================================================
---- linux-2.6.14.y.orig/net/ipv4/netfilter/ip_nat_proto_gre.c
-+++ linux-2.6.14.y/net/ipv4/netfilter/ip_nat_proto_gre.c
+--- linux-2.6.14.2.orig/net/ipv4/netfilter/ip_nat_proto_gre.c
++++ linux-2.6.14.2/net/ipv4/netfilter/ip_nat_proto_gre.c
 @@ -139,8 +139,8 @@ gre_manip_pkt(struct sk_buff **pskb,
                        break;
                case GRE_VERSION_PPTP:

diff --git a/queue/pptp-helper-fix-pns-pac-expectation-call-id.patch b/queue/pptp-helper-fix-pns-pac-expectation-call-id.patch
index 0e0a3f87644c0b30480a90ccb0817e0b551f329a..ed65ef0733e7d26c136d42b9874da934ed35e847 100644 (file)
--- a/queue/pptp-helper-fix-pns-pac-expectation-call-id.patch
+++ b/queue/pptp-helper-fix-pns-pac-expectation-call-id.patch
@@ -23,15 +23,13 @@ We also cannot use ip_nat_follow_master().
 Signed-off-by: Philip Craig <philipc@snapgear.com>
 Signed-off-by: Harald Welte <laforge@netfilter.org>
 Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  net/ipv4/netfilter/ip_nat_helper_pptp.c |   28 ++++++++++++++++++++++++++--
- 1 files changed, 26 insertions(+), 2 deletions(-)
+ 1 file changed, 26 insertions(+), 2 deletions(-)
 
-Index: linux-2.6.14.y/net/ipv4/netfilter/ip_nat_helper_pptp.c
-===================================================================
---- linux-2.6.14.y.orig/net/ipv4/netfilter/ip_nat_helper_pptp.c
-+++ linux-2.6.14.y/net/ipv4/netfilter/ip_nat_helper_pptp.c
+--- linux-2.6.14.2.orig/net/ipv4/netfilter/ip_nat_helper_pptp.c
++++ linux-2.6.14.2/net/ipv4/netfilter/ip_nat_helper_pptp.c
 @@ -73,6 +73,7 @@ static void pptp_nat_expected(struct ip_
        struct ip_conntrack_tuple t;
        struct ip_ct_pptp_master *ct_pptp_info;

diff --git a/queue/ptrace-auto-reap-fix.patch b/queue/ptrace-auto-reap-fix.patch
index 9402b0170feb8daefe5ac699608d6496715ae71e..039713bdad3580afc22f7fca7177c87ad75de449 100644 (file)
--- a/queue/ptrace-auto-reap-fix.patch
+++ b/queue/ptrace-auto-reap-fix.patch
@@ -8,15 +8,13 @@ like its parent doesn't care. The tracer obviously _does_ care.
 
 Signed-off-by: Linus Torvalds <torvalds@osdl.org>
 Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  kernel/signal.c |    2 +-
- 1 files changed, 1 insertion(+), 1 deletion(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: linux-2.6.14.y/kernel/signal.c
-===================================================================
---- linux-2.6.14.y.orig/kernel/signal.c
-+++ linux-2.6.14.y/kernel/signal.c
+--- linux-2.6.14.2.orig/kernel/signal.c
++++ linux-2.6.14.2/kernel/signal.c
 @@ -1524,7 +1524,7 @@ void do_notify_parent(struct task_struct
  
        psig = tsk->parent->sighand;

diff --git a/queue/recount-leak-of-proto-when-ctnetlink-dumping-tuple.patch b/queue/recount-leak-of-proto-when-ctnetlink-dumping-tuple.patch
index 86689245294ca4466bd09ba65b9c9f91976a0447..9f1f2fbdb0b6481001fa297039627dd4217d2bc4 100644 (file)
--- a/queue/recount-leak-of-proto-when-ctnetlink-dumping-tuple.patch
+++ b/queue/recount-leak-of-proto-when-ctnetlink-dumping-tuple.patch
@@ -10,15 +10,13 @@ From: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
 Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
 Signed-off-by: Harald Welte <laforge@netfilter.org>
 Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
-
  net/ipv4/netfilter/ip_conntrack_netlink.c |    9 ++++++---
- 1 files changed, 6 insertions(+), 3 deletions(-)
+ 1 file changed, 6 insertions(+), 3 deletions(-)
 
-Index: linux-2.6.14.y/net/ipv4/netfilter/ip_conntrack_netlink.c
-===================================================================
---- linux-2.6.14.y.orig/net/ipv4/netfilter/ip_conntrack_netlink.c
-+++ linux-2.6.14.y/net/ipv4/netfilter/ip_conntrack_netlink.c
+--- linux-2.6.14.2.orig/net/ipv4/netfilter/ip_conntrack_netlink.c
++++ linux-2.6.14.2/net/ipv4/netfilter/ip_conntrack_netlink.c
 @@ -58,14 +58,17 @@ ctnetlink_dump_tuples_proto(struct sk_bu
                            const struct ip_conntrack_tuple *tuple)
  {

diff --git a/queue/series b/queue/series
index 3b3e7d82f6e4eef40a9d6385b51da03e0f502a22..7d51e3b8557ebc1efc9d5b59c131c057d6b5fdfb 100644 (file)
--- a/queue/series
+++ b/queue/series
@@ -17,3 +17,5 @@ fix-memory-management-error-during.patch
 fix-calculation-of-ah-length-during.patch
 fix-sending-extension-headers-before.patch
 4GB-memory-intel-dual-core.patch
+acpi-fix-null-deref-in-video-lcd-brightness.patch
+drivers-isdn-hardware-eicon-os_4bri.c-correct-the-xdiloadfile-signature.patch