refresh 2.6.21 queue against 2.6.21.4 (and remove netfilter SCTP patch

since it just went out in a security release).

diff --git a/queue-2.6.21/aacraid-correct-sa-platform-support.patch b/queue-2.6.21/aacraid-correct-sa-platform-support.patch
index 2927e2f90353b7b67fdff286eac7609badb9c2db..67bdfb82bd4d625603d12fb376eb1a8491d91c14 100644 (file)
--- a/queue-2.6.21/aacraid-correct-sa-platform-support.patch
+++ b/queue-2.6.21/aacraid-correct-sa-platform-support.patch
@@ -30,8 +30,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  drivers/scsi/aacraid/sa.c      |    9 ++++++++-
  3 files changed, 10 insertions(+), 2 deletions(-)
 
---- a/drivers/scsi/aacraid/aacraid.h
-+++ b/drivers/scsi/aacraid/aacraid.h
+--- linux-2.6.21.4.orig/drivers/scsi/aacraid/aacraid.h
++++ linux-2.6.21.4/drivers/scsi/aacraid/aacraid.h
 @@ -1840,6 +1840,7 @@ struct aac_driver_ident* aac_get_driver_
  int aac_get_adapter_info(struct aac_dev* dev);
  int aac_send_shutdown(struct aac_dev *dev);
@@ -40,8 +40,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  extern int numacb;
  extern int acbsize;
  extern char aac_driver_version[];
---- a/drivers/scsi/aacraid/rx.c
-+++ b/drivers/scsi/aacraid/rx.c
+--- linux-2.6.21.4.orig/drivers/scsi/aacraid/rx.c
++++ linux-2.6.21.4/drivers/scsi/aacraid/rx.c
 @@ -378,7 +378,7 @@ static int aac_rx_check_health(struct aa
   *
   *    Will send a fib, returning 0 if successful.
@@ -51,8 +51,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  {
        struct aac_dev *dev = fib->dev;
        struct aac_queue *q = &dev->queues->queue[AdapNormCmdQueue];
---- a/drivers/scsi/aacraid/sa.c
-+++ b/drivers/scsi/aacraid/sa.c
+--- linux-2.6.21.4.orig/drivers/scsi/aacraid/sa.c
++++ linux-2.6.21.4/drivers/scsi/aacraid/sa.c
 @@ -5,7 +5,7 @@
   * based on the old aacraid driver that is..
   * Adaptec aacraid device driver for Linux.

diff --git a/queue-2.6.21/acpi-fix-potential-call-to-a-freed-memory-section.patch b/queue-2.6.21/acpi-fix-potential-call-to-a-freed-memory-section.patch
index 6706b4ed83773f00fa2a6a64aa70ca519aa69733..b12fe3bc229d8a6b303119fbc9775e3970dbe763 100644 (file)
--- a/queue-2.6.21/acpi-fix-potential-call-to-a-freed-memory-section.patch
+++ b/queue-2.6.21/acpi-fix-potential-call-to-a-freed-memory-section.patch
@@ -32,8 +32,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  include/acpi/acpi_numa.h |    7 ++-----
  2 files changed, 6 insertions(+), 9 deletions(-)
 
---- a/drivers/acpi/numa.c
-+++ b/drivers/acpi/numa.c
+--- linux-2.6.21.4.orig/drivers/acpi/numa.c
++++ linux-2.6.21.4/drivers/acpi/numa.c
 @@ -40,19 +40,19 @@ static nodemask_t nodes_found_map = NODE
  #define NID_INVAL     -1
  
@@ -58,8 +58,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  {
        if (node < 0)
                return PXM_INVAL;
---- a/include/acpi/acpi_numa.h
-+++ b/include/acpi/acpi_numa.h
+--- linux-2.6.21.4.orig/include/acpi/acpi_numa.h
++++ linux-2.6.21.4/include/acpi/acpi_numa.h
 @@ -11,11 +11,8 @@
  #define MAX_PXM_DOMAINS (256) /* Old pxm spec is defined 8 bit */
  #endif

diff --git a/queue-2.6.21/ahci-disable-64bit-dma-on-sb600.patch b/queue-2.6.21/ahci-disable-64bit-dma-on-sb600.patch
index b89e7bf02e7e7947a7bc492130033c7cbc68e756..14500a0ba41718c41a8e844127334ca79cda7510 100644 (file)
--- a/queue-2.6.21/ahci-disable-64bit-dma-on-sb600.patch
+++ b/queue-2.6.21/ahci-disable-64bit-dma-on-sb600.patch
@@ -21,8 +21,8 @@ controller malfunction if some memory is over 4G.  Please consider for
  drivers/ata/ahci.c |   10 +++++++++-
  1 file changed, 9 insertions(+), 1 deletion(-)
 
---- linux-2.6.21.3.orig/drivers/ata/ahci.c
-+++ linux-2.6.21.3/drivers/ata/ahci.c
+--- linux-2.6.21.4.orig/drivers/ata/ahci.c
++++ linux-2.6.21.4/drivers/ata/ahci.c
 @@ -170,6 +170,7 @@ enum {
        AHCI_FLAG_IGN_IRQ_IF_ERR        = (1 << 25), /* ignore IRQ_IF_ERR */
        AHCI_FLAG_HONOR_PI              = (1 << 26), /* honor PORTS_IMPL */

diff --git a/queue-2.6.21/alsa-hda-intel-fix-detection-of-audio-codec-on-toshiba-a100.patch b/queue-2.6.21/alsa-hda-intel-fix-detection-of-audio-codec-on-toshiba-a100.patch
index 76c5df162949b7c6809cb76bcb9ab8e97e567d02..9bbcfd26daed5caa63a7fe99c7544d27738013f2 100644 (file)
--- a/queue-2.6.21/alsa-hda-intel-fix-detection-of-audio-codec-on-toshiba-a100.patch
+++ b/queue-2.6.21/alsa-hda-intel-fix-detection-of-audio-codec-on-toshiba-a100.patch
@@ -22,8 +22,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  sound/pci/hda/hda_intel.c |   11 +++++++----
  1 file changed, 7 insertions(+), 4 deletions(-)
 
---- linux-2.6.21.3.orig/sound/pci/hda/hda_intel.c
-+++ linux-2.6.21.3/sound/pci/hda/hda_intel.c
+--- linux-2.6.21.4.orig/sound/pci/hda/hda_intel.c
++++ linux-2.6.21.4/sound/pci/hda/hda_intel.c
 @@ -979,7 +979,7 @@ static unsigned int azx_max_codecs[] __d
  static int __devinit azx_codec_create(struct azx *chip, const char *model)
  {

diff --git a/queue-2.6.21/alsa-hda-intel-probe-additional-slots-only-if-necessary.patch b/queue-2.6.21/alsa-hda-intel-probe-additional-slots-only-if-necessary.patch
index b8321ae1d9f54641e8e1953eacf65016a3e308b3..119d6cd6d9405869236f794d7fe33b45aa31f876 100644 (file)
--- a/queue-2.6.21/alsa-hda-intel-probe-additional-slots-only-if-necessary.patch
+++ b/queue-2.6.21/alsa-hda-intel-probe-additional-slots-only-if-necessary.patch
@@ -25,8 +25,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  sound/pci/hda/hda_intel.c |   16 ++++++++++++++--
  1 file changed, 14 insertions(+), 2 deletions(-)
 
---- linux-2.6.21.3.orig/sound/pci/hda/hda_intel.c
-+++ linux-2.6.21.3/sound/pci/hda/hda_intel.c
+--- linux-2.6.21.4.orig/sound/pci/hda/hda_intel.c
++++ linux-2.6.21.4/sound/pci/hda/hda_intel.c
 @@ -198,6 +198,7 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO
  #define RIRB_INT_MASK         0x05
  

diff --git a/queue-2.6.21/alsa-usb-audio-explicitly-match-logitech-quickcam.patch b/queue-2.6.21/alsa-usb-audio-explicitly-match-logitech-quickcam.patch
index f285758c57c57c336f462eeee4b2d1ca24de0873..a0a0c61593d69714b1ac113b2bfc3892b0302674 100644 (file)
--- a/queue-2.6.21/alsa-usb-audio-explicitly-match-logitech-quickcam.patch
+++ b/queue-2.6.21/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.21.3.orig/sound/usb/usbquirks.h
-+++ linux-2.6.21.3/sound/usb/usbquirks.h
+--- linux-2.6.21.4.orig/sound/usb/usbquirks.h
++++ linux-2.6.21.4/sound/usb/usbquirks.h
 @@ -40,6 +40,29 @@
        .bInterfaceClass = USB_CLASS_VENDOR_SPEC
  

diff --git a/queue-2.6.21/alsa-wm8750-typo-fix.patch b/queue-2.6.21/alsa-wm8750-typo-fix.patch
index 957619e2f586a36bafca89a1c62c703e379c7861..b3653d0eb561c52df7ce35058a51c3f7b9589601 100644 (file)
--- a/queue-2.6.21/alsa-wm8750-typo-fix.patch
+++ b/queue-2.6.21/alsa-wm8750-typo-fix.patch
@@ -14,8 +14,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  sound/soc/codecs/wm8750.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- linux-2.6.21.3.orig/sound/soc/codecs/wm8750.c
-+++ linux-2.6.21.3/sound/soc/codecs/wm8750.c
+--- linux-2.6.21.4.orig/sound/soc/codecs/wm8750.c
++++ linux-2.6.21.4/sound/soc/codecs/wm8750.c
 @@ -808,7 +808,7 @@ static int wm8750_init(struct snd_soc_de
        codec->dai = &wm8750_dai;
        codec->num_dai = 1;

diff --git a/queue-2.6.21/bluetooth-fix-locking-in-hci_sock_dev_event.patch b/queue-2.6.21/bluetooth-fix-locking-in-hci_sock_dev_event.patch
index 3abdc001da8eba1871b17cc08b3e1f9d03937cc1..b66be8ab043e1f406144769bdb81f66c34be3383 100644 (file)
--- a/queue-2.6.21/bluetooth-fix-locking-in-hci_sock_dev_event.patch
+++ b/queue-2.6.21/bluetooth-fix-locking-in-hci_sock_dev_event.patch
@@ -31,8 +31,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  net/bluetooth/hci_sock.c |    6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
---- linux-2.6.21.3.orig/net/bluetooth/hci_sock.c
-+++ linux-2.6.21.3/net/bluetooth/hci_sock.c
+--- linux-2.6.21.4.orig/net/bluetooth/hci_sock.c
++++ linux-2.6.21.4/net/bluetooth/hci_sock.c
 @@ -656,7 +656,8 @@ static int hci_sock_dev_event(struct not
                /* Detach sockets from device */
                read_lock(&hci_sk_list.lock);

diff --git a/queue-2.6.21/cciss-fix-pci_driver.shutdown-while-device-is-still-active.patch b/queue-2.6.21/cciss-fix-pci_driver.shutdown-while-device-is-still-active.patch
index dfa59e190bc16ea7e6308b3366e977b5f2e6b6fe..0268c4568b4892ba7bf1fd3d9f53d5abb5a74374 100644 (file)
--- a/queue-2.6.21/cciss-fix-pci_driver.shutdown-while-device-is-still-active.patch
+++ b/queue-2.6.21/cciss-fix-pci_driver.shutdown-while-device-is-still-active.patch
@@ -30,8 +30,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  drivers/block/cciss.c |   45 ++++++++++++++++++++++++++++++---------------
  1 file changed, 30 insertions(+), 15 deletions(-)
 
---- a/drivers/block/cciss.c
-+++ b/drivers/block/cciss.c
+--- linux-2.6.21.4.orig/drivers/block/cciss.c
++++ linux-2.6.21.4/drivers/block/cciss.c
 @@ -3405,13 +3405,39 @@ static int __devinit cciss_init_one(stru
        return -1;
  }

diff --git a/queue-2.6.21/char-cyclades-fix-deadlock.patch b/queue-2.6.21/char-cyclades-fix-deadlock.patch
index 81b7e4b9a63a03ce9d91a44a403674ec0e2ff7f1..4b6c76cacec187ace915d1d1269f4191e8d7f101 100644 (file)
--- a/queue-2.6.21/char-cyclades-fix-deadlock.patch
+++ b/queue-2.6.21/char-cyclades-fix-deadlock.patch
@@ -19,8 +19,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  drivers/char/cyclades.c |    1 +
  1 file changed, 1 insertion(+)
 
---- linux-2.6.21.3.orig/drivers/char/cyclades.c
-+++ linux-2.6.21.3/drivers/char/cyclades.c
+--- linux-2.6.21.4.orig/drivers/char/cyclades.c
++++ linux-2.6.21.4/drivers/char/cyclades.c
 @@ -1103,6 +1103,7 @@ static void cyy_intr_chip(struct cyclade
  
                                if (data & info->ignore_status_mask) {

diff --git a/queue-2.6.21/e1000-disable-polling-before-registering-netdevice.patch b/queue-2.6.21/e1000-disable-polling-before-registering-netdevice.patch
index 62fb6bc6488833025d7f2dbaedc2c617a448319d..123773b43399cb5038056a4a52ad7a992cbcb975 100644 (file)
--- a/queue-2.6.21/e1000-disable-polling-before-registering-netdevice.patch
+++ b/queue-2.6.21/e1000-disable-polling-before-registering-netdevice.patch
@@ -19,8 +19,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  drivers/net/e1000/e1000_main.c |   11 +++++++----
  1 file changed, 7 insertions(+), 4 deletions(-)
 
---- linux-2.6.21.3.orig/drivers/net/e1000/e1000_main.c
-+++ linux-2.6.21.3/drivers/net/e1000/e1000_main.c
+--- linux-2.6.21.4.orig/drivers/net/e1000/e1000_main.c
++++ linux-2.6.21.4/drivers/net/e1000/e1000_main.c
 @@ -1153,13 +1153,16 @@ e1000_probe(struct pci_dev *pdev,
            !e1000_check_mng_mode(&adapter->hw))
                e1000_get_hw_control(adapter);

diff --git a/queue-2.6.21/fix-af_unix-oops.patch b/queue-2.6.21/fix-af_unix-oops.patch
index b37fece151e412e3621097ed05d1ec5421dc1265..ff40e072705c409a245220eb6e41f1074448cc31 100644 (file)
--- a/queue-2.6.21/fix-af_unix-oops.patch
+++ b/queue-2.6.21/fix-af_unix-oops.patch
@@ -57,8 +57,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  net/unix/af_unix.c    |  127 +++++++++++++++++++++++++++++++-------------------
  2 files changed, 83 insertions(+), 52 deletions(-)
 
---- linux-2.6.21.3.orig/include/net/af_unix.h
-+++ linux-2.6.21.3/include/net/af_unix.h
+--- linux-2.6.21.4.orig/include/net/af_unix.h
++++ linux-2.6.21.4/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: Greg Kroah-Hartman <gregkh@suse.de>
  
  #ifdef __KERNEL__
  /* The AF_UNIX socket */
---- linux-2.6.21.3.orig/net/unix/af_unix.c
-+++ linux-2.6.21.3/net/unix/af_unix.c
+--- linux-2.6.21.4.orig/net/unix/af_unix.c
++++ linux-2.6.21.4/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.21/fix-compat-console-unimap-regression.patch b/queue-2.6.21/fix-compat-console-unimap-regression.patch
index 856434a95bc51341105c2261aa20ceb90abfe26e..303a3471afe68228773282715df400c1e42e4454 100644 (file)
--- a/queue-2.6.21/fix-compat-console-unimap-regression.patch
+++ b/queue-2.6.21/fix-compat-console-unimap-regression.patch
@@ -31,8 +31,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  fs/compat_ioctl.c |   33 +++++++++++++++++++++++++--------
  1 file changed, 25 insertions(+), 8 deletions(-)
 
---- linux-2.6.21.3.orig/fs/compat_ioctl.c
-+++ linux-2.6.21.3/fs/compat_ioctl.c
+--- linux-2.6.21.4.orig/fs/compat_ioctl.c
++++ linux-2.6.21.4/fs/compat_ioctl.c
 @@ -1178,6 +1178,7 @@ static int vt_check(struct file *file)
  {
        struct tty_struct *tty;

diff --git a/queue-2.6.21/fix-roundup_pow_of_two.patch b/queue-2.6.21/fix-roundup_pow_of_two.patch
index ae228a68b5c041eada4d4f2bc71df747e4959653..deebbb26ee8768eee0320cee76471194e9d155b6 100644 (file)
--- a/queue-2.6.21/fix-roundup_pow_of_two.patch
+++ b/queue-2.6.21/fix-roundup_pow_of_two.patch
@@ -20,8 +20,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  include/linux/log2.h |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- linux-2.6.21.3.orig/include/linux/log2.h
-+++ linux-2.6.21.3/include/linux/log2.h
+--- linux-2.6.21.4.orig/include/linux/log2.h
++++ linux-2.6.21.4/include/linux/log2.h
 @@ -159,7 +159,7 @@ unsigned long __roundup_pow_of_two(unsig
  #define roundup_pow_of_two(n)                 \
  (                                             \

diff --git a/queue-2.6.21/fuse-fix-mknod-of-regular-file.patch b/queue-2.6.21/fuse-fix-mknod-of-regular-file.patch
index bec39b5213f73da917677c353c19aacaf0300583..0084c061d82156eefadbab375e74594198c9375d 100644 (file)
--- a/queue-2.6.21/fuse-fix-mknod-of-regular-file.patch
+++ b/queue-2.6.21/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.21.3.orig/fs/fuse/dir.c
-+++ linux-2.6.21.3/fs/fuse/dir.c
+--- linux-2.6.21.4.orig/fs/fuse/dir.c
++++ linux-2.6.21.4/fs/fuse/dir.c
 @@ -485,7 +485,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.21/hpt366-don-t-check-enablebits-for-hpt36x.patch b/queue-2.6.21/hpt366-don-t-check-enablebits-for-hpt36x.patch
index ba602864916ea194820de62df5a72d4592855813..6f2f86787730706173fe6a3d19c1becda6772b0c 100644 (file)
--- a/queue-2.6.21/hpt366-don-t-check-enablebits-for-hpt36x.patch
+++ b/queue-2.6.21/hpt366-don-t-check-enablebits-for-hpt36x.patch
@@ -19,8 +19,8 @@ This has been an issue since 2.6.21-rc1...
  drivers/ide/pci/hpt366.c |    7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
---- linux-2.6.21.3.orig/drivers/ide/pci/hpt366.c
-+++ linux-2.6.21.3/drivers/ide/pci/hpt366.c
+--- linux-2.6.21.4.orig/drivers/ide/pci/hpt366.c
++++ linux-2.6.21.4/drivers/ide/pci/hpt366.c
 @@ -1,5 +1,5 @@
  /*
 - * linux/drivers/ide/pci/hpt366.c             Version 1.02    Apr 18, 2007

diff --git a/queue-2.6.21/i386-fix-k8-core2-oprofile-on-multiple-cpus.patch b/queue-2.6.21/i386-fix-k8-core2-oprofile-on-multiple-cpus.patch
index ed8708b9fee17ed105b96b1236effa4630389dad..02afa7b457b0cabe668ba75138f66d08c1a9caf0 100644 (file)
--- a/queue-2.6.21/i386-fix-k8-core2-oprofile-on-multiple-cpus.patch
+++ b/queue-2.6.21/i386-fix-k8-core2-oprofile-on-multiple-cpus.patch
@@ -18,8 +18,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  arch/i386/oprofile/nmi_int.c |    9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
 
---- linux-2.6.21.3.orig/arch/i386/oprofile/nmi_int.c
-+++ linux-2.6.21.3/arch/i386/oprofile/nmi_int.c
+--- linux-2.6.21.4.orig/arch/i386/oprofile/nmi_int.c
++++ linux-2.6.21.4/arch/i386/oprofile/nmi_int.c
 @@ -131,7 +131,6 @@ static void nmi_save_registers(void * du
  {
        int cpu = smp_processor_id();

diff --git a/queue-2.6.21/i386-hpet-check-if-the-counter-works.patch b/queue-2.6.21/i386-hpet-check-if-the-counter-works.patch
index c5c80e67a8a2a315857eacea6414472290a1d8bb..8d825e4d60f90fab3bcd740ab61f0716bf4e220c 100644 (file)
--- a/queue-2.6.21/i386-hpet-check-if-the-counter-works.patch
+++ b/queue-2.6.21/i386-hpet-check-if-the-counter-works.patch
@@ -18,8 +18,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  arch/i386/kernel/hpet.c |   24 +++++++++++++++++++++++-
  1 file changed, 23 insertions(+), 1 deletion(-)
 
---- linux-2.6.21.3.orig/arch/i386/kernel/hpet.c
-+++ linux-2.6.21.3/arch/i386/kernel/hpet.c
+--- linux-2.6.21.4.orig/arch/i386/kernel/hpet.c
++++ linux-2.6.21.4/arch/i386/kernel/hpet.c
 @@ -226,7 +226,8 @@ int __init hpet_enable(void)
  {
        unsigned long id;

diff --git a/queue-2.6.21/icmp-fix-icmp_errors_use_inbound_ifaddr-sysctl.patch b/queue-2.6.21/icmp-fix-icmp_errors_use_inbound_ifaddr-sysctl.patch
index 15eb558779b9763a23c483f4a7eb9b2245f1b059..3160aab4b0510029940b551d2d5c3b09752c7f99 100644 (file)
--- a/queue-2.6.21/icmp-fix-icmp_errors_use_inbound_ifaddr-sysctl.patch
+++ b/queue-2.6.21/icmp-fix-icmp_errors_use_inbound_ifaddr-sysctl.patch
@@ -22,8 +22,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  net/ipv4/icmp.c |   12 +++++++++---
  1 file changed, 9 insertions(+), 3 deletions(-)
 
---- linux-2.6.21.3.orig/net/ipv4/icmp.c
-+++ linux-2.6.21.3/net/ipv4/icmp.c
+--- linux-2.6.21.4.orig/net/ipv4/icmp.c
++++ linux-2.6.21.4/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.21/ieee1394-eth1394-bring-back-a-parent-device.patch b/queue-2.6.21/ieee1394-eth1394-bring-back-a-parent-device.patch
index 0dedaf9a49e0c2ebe495cd4bd91af916e348b752..6e18f0ec4b4bf8e18a32e658e3e12d54720913bd 100644 (file)
--- a/queue-2.6.21/ieee1394-eth1394-bring-back-a-parent-device.patch
+++ b/queue-2.6.21/ieee1394-eth1394-bring-back-a-parent-device.patch
@@ -29,8 +29,8 @@ Same as commit ef50a6c59dc66f22eba67704e291d709f21e0456.
  drivers/ieee1394/eth1394.c |    7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
 
---- linux-2.6.21.3.orig/drivers/ieee1394/eth1394.c
-+++ linux-2.6.21.3/drivers/ieee1394/eth1394.c
+--- linux-2.6.21.4.orig/drivers/ieee1394/eth1394.c
++++ linux-2.6.21.4/drivers/ieee1394/eth1394.c
 @@ -584,10 +584,9 @@ static void ether1394_add_host (struct h
          }
  

diff --git a/queue-2.6.21/ignore-bogus-acpi-info-for-offline-cpus.patch b/queue-2.6.21/ignore-bogus-acpi-info-for-offline-cpus.patch
index 1f3e9145f7eecbfd67ca564315f71caeec380fc6..f1e0eafab6c64e662c47a1af1f51be6321fb4e0c 100644 (file)
--- a/queue-2.6.21/ignore-bogus-acpi-info-for-offline-cpus.patch
+++ b/queue-2.6.21/ignore-bogus-acpi-info-for-offline-cpus.patch
@@ -24,8 +24,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  kernel/time/tick-broadcast.c |   17 ++++++++++++-----
  1 file changed, 12 insertions(+), 5 deletions(-)
 
---- linux-2.6.21.3.orig/kernel/time/tick-broadcast.c
-+++ linux-2.6.21.3/kernel/time/tick-broadcast.c
+--- linux-2.6.21.4.orig/kernel/time/tick-broadcast.c
++++ linux-2.6.21.4/kernel/time/tick-broadcast.c
 @@ -243,11 +243,18 @@ void tick_broadcast_on_off(unsigned long
  {
        int cpu = get_cpu();

diff --git a/queue-2.6.21/input-i8042-fix-aux-port-detection-with-some-chips.patch b/queue-2.6.21/input-i8042-fix-aux-port-detection-with-some-chips.patch
index add22e30d333da4b84a85b0297bb10148fbe5d22..0aa5007366503ddd874984a3c3a51de7462802ec 100644 (file)
--- a/queue-2.6.21/input-i8042-fix-aux-port-detection-with-some-chips.patch
+++ b/queue-2.6.21/input-i8042-fix-aux-port-detection-with-some-chips.patch
@@ -24,8 +24,8 @@ X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.
  drivers/input/serio/i8042.c |   35 +++++++++++++++++++++++++++++------
  1 file changed, 29 insertions(+), 6 deletions(-)
 
---- linux-2.6.21.3.orig/drivers/input/serio/i8042.c
-+++ linux-2.6.21.3/drivers/input/serio/i8042.c
+--- linux-2.6.21.4.orig/drivers/input/serio/i8042.c
++++ linux-2.6.21.4/drivers/input/serio/i8042.c
 @@ -526,6 +526,33 @@ static irqreturn_t __devinit i8042_aux_t
        return IRQ_HANDLED;
  }

diff --git a/queue-2.6.21/ipsec-fix-panic-when-using-inter-address-familiy-ipsec-on-loopback.patch b/queue-2.6.21/ipsec-fix-panic-when-using-inter-address-familiy-ipsec-on-loopback.patch
index 8b76c47fb8d07b3c317d623b9646da20d1bcfc8d..1c7fc89b25fcdc28f7dc49699000a5fe2c9c2fc1 100644 (file)
--- a/queue-2.6.21/ipsec-fix-panic-when-using-inter-address-familiy-ipsec-on-loopback.patch
+++ b/queue-2.6.21/ipsec-fix-panic-when-using-inter-address-familiy-ipsec-on-loopback.patch
@@ -20,8 +20,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  net/ipv6/xfrm6_mode_tunnel.c |    1 +
  4 files changed, 7 insertions(+), 8 deletions(-)
 
---- linux-2.6.21.3.orig/net/ipv4/xfrm4_input.c
-+++ linux-2.6.21.3/net/ipv4/xfrm4_input.c
+--- linux-2.6.21.4.orig/net/ipv4/xfrm4_input.c
++++ linux-2.6.21.4/net/ipv4/xfrm4_input.c
 @@ -138,10 +138,8 @@ int xfrm4_rcv_encap(struct sk_buff *skb,
        nf_reset(skb);
  
@@ -35,8 +35,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
                netif_rx(skb);
                return 0;
        } else {
---- linux-2.6.21.3.orig/net/ipv4/xfrm4_mode_tunnel.c
-+++ linux-2.6.21.3/net/ipv4/xfrm4_mode_tunnel.c
+--- linux-2.6.21.4.orig/net/ipv4/xfrm4_mode_tunnel.c
++++ linux-2.6.21.4/net/ipv4/xfrm4_mode_tunnel.c
 @@ -84,6 +84,8 @@ static int xfrm4_tunnel_output(struct xf
        top_iph->saddr = x->props.saddr.a4;
        top_iph->daddr = x->id.daddr.a4;
@@ -46,8 +46,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
        memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options));
        return 0;
  }
---- linux-2.6.21.3.orig/net/ipv6/xfrm6_input.c
-+++ linux-2.6.21.3/net/ipv6/xfrm6_input.c
+--- linux-2.6.21.4.orig/net/ipv6/xfrm6_input.c
++++ linux-2.6.21.4/net/ipv6/xfrm6_input.c
 @@ -104,10 +104,8 @@ int xfrm6_rcv_spi(struct sk_buff *skb, _
        nf_reset(skb);
  
@@ -61,8 +61,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
                netif_rx(skb);
                return -1;
        } else {
---- linux-2.6.21.3.orig/net/ipv6/xfrm6_mode_tunnel.c
-+++ linux-2.6.21.3/net/ipv6/xfrm6_mode_tunnel.c
+--- linux-2.6.21.4.orig/net/ipv6/xfrm6_mode_tunnel.c
++++ linux-2.6.21.4/net/ipv6/xfrm6_mode_tunnel.c
 @@ -80,6 +80,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.21/ipv4-correct-rp_filter-help-text.patch b/queue-2.6.21/ipv4-correct-rp_filter-help-text.patch
index 90acefe3c5177a14ba2d6cb6832d6e6f86db48aa..39920c12a7050480a6711a0ceffe849ed93c079d 100644 (file)
--- a/queue-2.6.21/ipv4-correct-rp_filter-help-text.patch
+++ b/queue-2.6.21/ipv4-correct-rp_filter-help-text.patch
@@ -22,8 +22,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  net/ipv4/Kconfig |    6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
---- linux-2.6.21.3.orig/net/ipv4/Kconfig
-+++ linux-2.6.21.3/net/ipv4/Kconfig
+--- linux-2.6.21.4.orig/net/ipv4/Kconfig
++++ linux-2.6.21.4/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.21/ipv6-route-no-longer-handle-0-specially.patch b/queue-2.6.21/ipv6-route-no-longer-handle-0-specially.patch
index 8f130eddf212fa0ba45feca9a094c2960ffe794f..159cf4735574bda93784ef57326a2ce033d36dd5 100644 (file)
--- a/queue-2.6.21/ipv6-route-no-longer-handle-0-specially.patch
+++ b/queue-2.6.21/ipv6-route-no-longer-handle-0-specially.patch
@@ -21,8 +21,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  net/ipv6/ip6_fib.c |    8 --------
  1 file changed, 8 deletions(-)
 
---- linux-2.6.21.3.orig/net/ipv6/ip6_fib.c
-+++ linux-2.6.21.3/net/ipv6/ip6_fib.c
+--- linux-2.6.21.4.orig/net/ipv6/ip6_fib.c
++++ linux-2.6.21.4/net/ipv6/ip6_fib.c
 @@ -619,14 +619,6 @@ static int fib6_add_rt2node(struct fib6_
  
        ins = &fn->leaf;

diff --git a/queue-2.6.21/make-freezeable-workqueues-singlethread.patch b/queue-2.6.21/make-freezeable-workqueues-singlethread.patch
index 764cfdcaa995df7435a09fc3212f4f7b5b1ee758..4096baea6426ec770f5de1526b772368abb939e0 100644 (file)
--- a/queue-2.6.21/make-freezeable-workqueues-singlethread.patch
+++ b/queue-2.6.21/make-freezeable-workqueues-singlethread.patch
@@ -25,8 +25,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  include/linux/workqueue.h |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- linux-2.6.21.3.orig/include/linux/workqueue.h
-+++ linux-2.6.21.3/include/linux/workqueue.h
+--- linux-2.6.21.4.orig/include/linux/workqueue.h
++++ linux-2.6.21.4/include/linux/workqueue.h
 @@ -162,7 +162,7 @@ extern struct workqueue_struct *__create
                                                    int singlethread,
                                                    int freezeable);

diff --git a/queue-2.6.21/md-avoid-overflow-in-raid0-calculation-with-large-components.patch b/queue-2.6.21/md-avoid-overflow-in-raid0-calculation-with-large-components.patch
index 60f4a9e156c8e252230f48256ab78144e4670152..cd9a56bbf7e34137bfbed9e23fad621a380db710 100644 (file)
--- a/queue-2.6.21/md-avoid-overflow-in-raid0-calculation-with-large-components.patch
+++ b/queue-2.6.21/md-avoid-overflow-in-raid0-calculation-with-large-components.patch
@@ -25,8 +25,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff .prev/drivers/md/raid0.c ./drivers/md/raid0.c
---- linux-2.6.21.3.orig/drivers/md/raid0.c
-+++ linux-2.6.21.3/drivers/md/raid0.c
+--- linux-2.6.21.4.orig/drivers/md/raid0.c
++++ linux-2.6.21.4/drivers/md/raid0.c
 @@ -415,7 +415,7 @@ static int raid0_make_request (request_q
        raid0_conf_t *conf = mddev_to_conf(mddev);
        struct strip_zone *zone;

diff --git a/queue-2.6.21/md-don-t-write-more-than-is-required-of-the-last-page-of-a-bitmap.patch b/queue-2.6.21/md-don-t-write-more-than-is-required-of-the-last-page-of-a-bitmap.patch
index 236d13f5708b3d07451bc97fd9595daae190804c..65f2041a9789e7614cb668ac8b0aa315f85c3614 100644 (file)
--- a/queue-2.6.21/md-don-t-write-more-than-is-required-of-the-last-page-of-a-bitmap.patch
+++ b/queue-2.6.21/md-don-t-write-more-than-is-required-of-the-last-page-of-a-bitmap.patch
@@ -22,8 +22,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  2 files changed, 13 insertions(+), 5 deletions(-)
 
 diff .prev/drivers/md/bitmap.c ./drivers/md/bitmap.c
---- linux-2.6.21.3.orig/drivers/md/bitmap.c
-+++ linux-2.6.21.3/drivers/md/bitmap.c
+--- linux-2.6.21.4.orig/drivers/md/bitmap.c
++++ linux-2.6.21.4/drivers/md/bitmap.c
 @@ -255,19 +255,25 @@ static struct page *read_sb_page(mddev_t
  
  }
@@ -71,8 +71,8 @@ diff .prev/drivers/md/bitmap.c ./drivers/md/bitmap.c
                }
                paddr = kmap_atomic(page, KM_USER0);
                if (bitmap->flags & BITMAP_HOSTENDIAN)
---- linux-2.6.21.3.orig/include/linux/raid/bitmap.h
-+++ linux-2.6.21.3/include/linux/raid/bitmap.h
+--- linux-2.6.21.4.orig/include/linux/raid/bitmap.h
++++ linux-2.6.21.4/include/linux/raid/bitmap.h
 @@ -232,6 +232,7 @@ struct bitmap {
        struct page **filemap; /* list of cache pages for the file */
        unsigned long *filemap_attr; /* attributes associated w/ filemap pages */

diff --git a/queue-2.6.21/neofb-fix-pseudo_palette-array-overrun-in-neofb_setcolreg.patch b/queue-2.6.21/neofb-fix-pseudo_palette-array-overrun-in-neofb_setcolreg.patch
index 0c29baf2f8e6d994aadcf61e86d942267b120ab7..e99d0becfb1d354ae507592b5af7db05ec33aec7 100644 (file)
--- a/queue-2.6.21/neofb-fix-pseudo_palette-array-overrun-in-neofb_setcolreg.patch
+++ b/queue-2.6.21/neofb-fix-pseudo_palette-array-overrun-in-neofb_setcolreg.patch
@@ -30,8 +30,8 @@ Tony
  drivers/video/neofb.c |   30 ++++++++++++++++--------------
  1 file changed, 16 insertions(+), 14 deletions(-)
 
---- linux-2.6.21.3.orig/drivers/video/neofb.c
-+++ linux-2.6.21.3/drivers/video/neofb.c
+--- linux-2.6.21.4.orig/drivers/video/neofb.c
++++ linux-2.6.21.4/drivers/video/neofb.c
 @@ -1285,34 +1285,36 @@ static int neofb_setcolreg(u_int regno, 
        if (regno >= fb->cmap.len || regno > 255)
                return -EINVAL;

diff --git a/queue-2.6.21/net-fix-bmsr_100-half-full-2-defines-in-linux-mii.h.patch b/queue-2.6.21/net-fix-bmsr_100-half-full-2-defines-in-linux-mii.h.patch
index cf2ddc02259f9b56336a64ed5d0a72d47d02e775..3b61b310f7133354328fb9015e5813c2bdbfdd09 100644 (file)
--- a/queue-2.6.21/net-fix-bmsr_100-half-full-2-defines-in-linux-mii.h.patch
+++ b/queue-2.6.21/net-fix-bmsr_100-half-full-2-defines-in-linux-mii.h.patch
@@ -16,8 +16,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  include/linux/mii.h |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
---- linux-2.6.21.3.orig/include/linux/mii.h
-+++ linux-2.6.21.3/include/linux/mii.h
+--- linux-2.6.21.4.orig/include/linux/mii.h
++++ linux-2.6.21.4/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.21/net-fix-race-condition-about-network-device-name-allocation.patch b/queue-2.6.21/net-fix-race-condition-about-network-device-name-allocation.patch
index 7052e5e0f56376431a57cf44af2c10d649cf683b..f3a8c241d8494ffc8f31b2d2fc7e8204eb4e5932 100644 (file)
--- a/queue-2.6.21/net-fix-race-condition-about-network-device-name-allocation.patch
+++ b/queue-2.6.21/net-fix-race-condition-about-network-device-name-allocation.patch
@@ -28,8 +28,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  net/core/net-sysfs.c |    8 +++++++-
  2 files changed, 13 insertions(+), 5 deletions(-)
 
---- linux-2.6.21.3.orig/net/core/dev.c
-+++ linux-2.6.21.3/net/core/dev.c
+--- linux-2.6.21.4.orig/net/core/dev.c
++++ linux-2.6.21.4/net/core/dev.c
 @@ -3135,7 +3135,6 @@ void netdev_run_todo(void)
                        continue;
                }
@@ -63,8 +63,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
        /* Finish processing unregister after unlock */
        net_set_todo(dev);
  
---- linux-2.6.21.3.orig/net/core/net-sysfs.c
-+++ linux-2.6.21.3/net/core/net-sysfs.c
+--- linux-2.6.21.4.orig/net/core/net-sysfs.c
++++ linux-2.6.21.4/net/core/net-sysfs.c
 @@ -451,9 +451,15 @@ static struct class net_class = {
  #endif
  };

diff --git a/queue-2.6.21/net-parse-ip-port-strings-correctly-in-in4_pton.patch b/queue-2.6.21/net-parse-ip-port-strings-correctly-in-in4_pton.patch
index 5787a5a123a2b2a44b17fefef184aa30c6b68c53..518b25023a4e9c620d1fe9fe1110e63875a68db0 100644 (file)
--- a/queue-2.6.21/net-parse-ip-port-strings-correctly-in-in4_pton.patch
+++ b/queue-2.6.21/net-parse-ip-port-strings-correctly-in-in4_pton.patch
@@ -28,8 +28,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  net/core/utils.c |    6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
---- linux-2.6.21.3.orig/net/core/utils.c
-+++ linux-2.6.21.3/net/core/utils.c
+--- linux-2.6.21.4.orig/net/core/utils.c
++++ linux-2.6.21.4/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.21/net-wrong-timeout-value-in-sk_wait_data-v2.patch b/queue-2.6.21/net-wrong-timeout-value-in-sk_wait_data-v2.patch
index b7da91f9d85d47ca94baff8cb7d2f5a82e35eb78..2e97671557fa490f4b0094f8204c34031b412ee9 100644 (file)
--- a/queue-2.6.21/net-wrong-timeout-value-in-sk_wait_data-v2.patch
+++ b/queue-2.6.21/net-wrong-timeout-value-in-sk_wait_data-v2.patch
@@ -31,8 +31,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  net/core/sock.c |   12 ++++++++++++
  1 file changed, 12 insertions(+)
 
---- linux-2.6.21.3.orig/net/core/sock.c
-+++ linux-2.6.21.3/net/core/sock.c
+--- linux-2.6.21.4.orig/net/core/sock.c
++++ linux-2.6.21.4/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.21/netfilter-ip-nf-_conntrack_sctp-fix-remotely-triggerable-null-ptr-dereference.patch b/queue-2.6.21/netfilter-ip-nf-_conntrack_sctp-fix-remotely-triggerable-null-ptr-dereference.patch
deleted file mode 100644 (file)
index e799828..0000000
--- a/queue-2.6.21/netfilter-ip-nf-_conntrack_sctp-fix-remotely-triggerable-null-ptr-dereference.patch
+++ /dev/null
@@ -1,52 +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>
-
----
- 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
-@@ -460,7 +460,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
-@@ -469,7 +469,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.21/nohz-rate-limit-the-local-softirq-pending-warning-output.patch b/queue-2.6.21/nohz-rate-limit-the-local-softirq-pending-warning-output.patch
index 5259c074b29b9ff40d42502916dd15fb518fdb13..39b4259f0a36c9b1f551231486c6439670691669 100644 (file)
--- a/queue-2.6.21/nohz-rate-limit-the-local-softirq-pending-warning-output.patch
+++ b/queue-2.6.21/nohz-rate-limit-the-local-softirq-pending-warning-output.patch
@@ -21,8 +21,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  kernel/time/tick-sched.c |   12 +++++++++---
  1 file changed, 9 insertions(+), 3 deletions(-)
 
---- linux-2.6.21.3.orig/kernel/time/tick-sched.c
-+++ linux-2.6.21.3/kernel/time/tick-sched.c
+--- linux-2.6.21.4.orig/kernel/time/tick-sched.c
++++ linux-2.6.21.4/kernel/time/tick-sched.c
 @@ -167,9 +167,15 @@ void tick_nohz_stop_sched_tick(void)
                goto end;
  

diff --git a/queue-2.6.21/ntfs_init_locked_inode-fix-array-indexing.patch b/queue-2.6.21/ntfs_init_locked_inode-fix-array-indexing.patch
index 8b08cc492f3a589e945b869ab1f1f5d9cababe72..ab1d4110ea6274cb5e2ed94f1d4dd4830e034a69 100644 (file)
--- a/queue-2.6.21/ntfs_init_locked_inode-fix-array-indexing.patch
+++ b/queue-2.6.21/ntfs_init_locked_inode-fix-array-indexing.patch
@@ -19,8 +19,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  fs/ntfs/inode.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- linux-2.6.21.3.orig/fs/ntfs/inode.c
-+++ linux-2.6.21.3/fs/ntfs/inode.c
+--- linux-2.6.21.4.orig/fs/ntfs/inode.c
++++ linux-2.6.21.4/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.21/pci-quirk-disable-msi-on-via-vt3351.patch b/queue-2.6.21/pci-quirk-disable-msi-on-via-vt3351.patch
index 844041f7b9d08dc30864cd552ac9cb5311a5bd4a..9ca5b3dd820c1788c72d880f6c088100b0ccf13d 100644 (file)
--- a/queue-2.6.21/pci-quirk-disable-msi-on-via-vt3351.patch
+++ b/queue-2.6.21/pci-quirk-disable-msi-on-via-vt3351.patch
@@ -22,8 +22,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  include/linux/pci_ids.h |    1 +
  2 files changed, 2 insertions(+)
 
---- linux-2.6.21.3.orig/drivers/pci/quirks.c
-+++ linux-2.6.21.3/drivers/pci/quirks.c
+--- linux-2.6.21.4.orig/drivers/pci/quirks.c
++++ linux-2.6.21.4/drivers/pci/quirks.c
 @@ -1751,6 +1751,7 @@ static void __init quirk_disable_all_msi
  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_GCNB_LE, quirk_disable_all_msi);
  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS400_200, quirk_disable_all_msi);
@@ -32,8 +32,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  
  /* Disable MSI on chipsets that are known to not support it */
  static void __devinit quirk_disable_msi(struct pci_dev *dev)
---- linux-2.6.21.3.orig/include/linux/pci_ids.h
-+++ linux-2.6.21.3/include/linux/pci_ids.h
+--- linux-2.6.21.4.orig/include/linux/pci_ids.h
++++ linux-2.6.21.4/include/linux/pci_ids.h
 @@ -1287,6 +1287,7 @@
  #define PCI_DEVICE_ID_VIA_P4M800CE    0x0314
  #define PCI_DEVICE_ID_VIA_P4M890      0x0327

diff --git a/queue-2.6.21/pci_ids-update-patch-for-intel-ich9m.patch b/queue-2.6.21/pci_ids-update-patch-for-intel-ich9m.patch
index efab669453b6c295e5f4c8a8fe77b2b3a347e5a1..6f8727063d1affcb23042653140deceabb8d19be 100644 (file)
--- a/queue-2.6.21/pci_ids-update-patch-for-intel-ich9m.patch
+++ b/queue-2.6.21/pci_ids-update-patch-for-intel-ich9m.patch
@@ -18,8 +18,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  include/linux/pci_ids.h |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
---- linux-2.6.21.3.orig/include/linux/pci_ids.h
-+++ linux-2.6.21.3/include/linux/pci_ids.h
+--- linux-2.6.21.4.orig/include/linux/pci_ids.h
++++ linux-2.6.21.4/include/linux/pci_ids.h
 @@ -2260,11 +2260,11 @@
  #define PCI_DEVICE_ID_INTEL_ICH8_5    0x283e
  #define PCI_DEVICE_ID_INTEL_ICH8_6    0x2850

diff --git a/queue-2.6.21/prevent-going-idle-with-softirq-pending.patch b/queue-2.6.21/prevent-going-idle-with-softirq-pending.patch
index a9151b728fa11c275e9a4a289fdaa5d1c3d64c9b..7402608d5440c0c9b96fec8e3213d5fb757677c2 100644 (file)
--- a/queue-2.6.21/prevent-going-idle-with-softirq-pending.patch
+++ b/queue-2.6.21/prevent-going-idle-with-softirq-pending.patch
@@ -43,8 +43,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  kernel/sched.c |    4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
 
---- linux-2.6.21.3.orig/kernel/sched.c
-+++ linux-2.6.21.3/kernel/sched.c
+--- linux-2.6.21.4.orig/kernel/sched.c
++++ linux-2.6.21.4/kernel/sched.c
 @@ -4545,9 +4545,7 @@ int __sched cond_resched_softirq(void)
        BUG_ON(!in_softirq());
  

diff --git a/queue-2.6.21/series b/queue-2.6.21/series
index c9f0ac1590478339b8ef88300dcb3602d8d04871..f308544117f7f02470449e5d98d25ea368675a9c 100644 (file)
--- a/queue-2.6.21/series
+++ b/queue-2.6.21/series
@@ -37,7 +37,6 @@ acpi-fix-potential-call-to-a-freed-memory-section.patch
 aacraid-correct-sa-platform-support.patch
 cciss-fix-pci_driver.shutdown-while-device-is-still-active.patch
 work-around-dell-e520-bios-reboot-bug.patch
-netfilter-ip-nf-_conntrack_sctp-fix-remotely-triggerable-null-ptr-dereference.patch
 fix-af_unix-oops.patch
 icmp-fix-icmp_errors_use_inbound_ifaddr-sysctl.patch
 net-parse-ip-port-strings-correctly-in-in4_pton.patch

diff --git a/queue-2.6.21/sparc-linux-always-started-with-9600-8n1.patch b/queue-2.6.21/sparc-linux-always-started-with-9600-8n1.patch
index 6d5ba0e395c6bc5ed19f423798d3bfa954aceb56..be583438cf1406f9416ff0b4dc149b7afd1d9311 100644 (file)
--- a/queue-2.6.21/sparc-linux-always-started-with-9600-8n1.patch
+++ b/queue-2.6.21/sparc-linux-always-started-with-9600-8n1.patch
@@ -28,8 +28,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  drivers/serial/suncore.c |    6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
---- linux-2.6.21.3.orig/drivers/serial/suncore.c
-+++ linux-2.6.21.3/drivers/serial/suncore.c
+--- linux-2.6.21.4.orig/drivers/serial/suncore.c
++++ linux-2.6.21.4/drivers/serial/suncore.c
 @@ -30,9 +30,9 @@ void
  sunserial_console_termios(struct console *con)
  {

diff --git a/queue-2.6.21/sparc64-don-t-be-picky-about-virtual-dma-values-on-sun4v.patch b/queue-2.6.21/sparc64-don-t-be-picky-about-virtual-dma-values-on-sun4v.patch
index 6a531a7cd28ce0038d0b0d8505f32edf988570b5..0f731e84b4a5395d198dfef485f89385a4096225 100644 (file)
--- a/queue-2.6.21/sparc64-don-t-be-picky-about-virtual-dma-values-on-sun4v.patch
+++ b/queue-2.6.21/sparc64-don-t-be-picky-about-virtual-dma-values-on-sun4v.patch
@@ -19,8 +19,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  arch/sparc64/kernel/pci_sun4v.c |   36 ++++++++++--------------------------
  1 file changed, 10 insertions(+), 26 deletions(-)
 
---- linux-2.6.21.3.orig/arch/sparc64/kernel/pci_sun4v.c
-+++ linux-2.6.21.3/arch/sparc64/kernel/pci_sun4v.c
+--- linux-2.6.21.4.orig/arch/sparc64/kernel/pci_sun4v.c
++++ linux-2.6.21.4/arch/sparc64/kernel/pci_sun4v.c
 @@ -12,6 +12,7 @@
  #include <linux/percpu.h>
  #include <linux/irq.h>

diff --git a/queue-2.6.21/sparc64-fix-_page_exec_4u-check-in-sun4u-i-tlb-miss-handler.patch b/queue-2.6.21/sparc64-fix-_page_exec_4u-check-in-sun4u-i-tlb-miss-handler.patch
index 470661340b5b359445f031a87e7057f1d223f720..e83c8354b2bd1df522775d6ed8def20ad8efa70c 100644 (file)
--- a/queue-2.6.21/sparc64-fix-_page_exec_4u-check-in-sun4u-i-tlb-miss-handler.patch
+++ b/queue-2.6.21/sparc64-fix-_page_exec_4u-check-in-sun4u-i-tlb-miss-handler.patch
@@ -20,8 +20,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  arch/sparc64/kernel/itlb_miss.S |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
---- linux-2.6.21.3.orig/arch/sparc64/kernel/itlb_miss.S
-+++ linux-2.6.21.3/arch/sparc64/kernel/itlb_miss.S
+--- linux-2.6.21.4.orig/arch/sparc64/kernel/itlb_miss.S
++++ linux-2.6.21.4/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.21/sparc64-fix-two-bugs-wrt.-kernel-4mb-tsb.patch b/queue-2.6.21/sparc64-fix-two-bugs-wrt.-kernel-4mb-tsb.patch
index 49dc2a62a84067ce7c9861e322ee8de181545fec..f5deb818d1c083b6101e8c439f3fc8ffa35a9974 100644 (file)
--- a/queue-2.6.21/sparc64-fix-two-bugs-wrt.-kernel-4mb-tsb.patch
+++ b/queue-2.6.21/sparc64-fix-two-bugs-wrt.-kernel-4mb-tsb.patch
@@ -26,8 +26,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  include/asm-sparc64/tsb.h  |    2 +-
  3 files changed, 32 insertions(+), 8 deletions(-)
 
---- linux-2.6.21.3.orig/arch/sparc64/kernel/head.S
-+++ linux-2.6.21.3/arch/sparc64/kernel/head.S
+--- linux-2.6.21.4.orig/arch/sparc64/kernel/head.S
++++ linux-2.6.21.4/arch/sparc64/kernel/head.S
 @@ -653,33 +653,54 @@ setup_tba:
         restore
  sparc64_boot_end:
@@ -88,8 +88,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #include "systbls.S"
  
        .data
---- linux-2.6.21.3.orig/arch/sparc64/mm/init.c
-+++ linux-2.6.21.3/arch/sparc64/mm/init.c
+--- linux-2.6.21.4.orig/arch/sparc64/mm/init.c
++++ linux-2.6.21.4/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)];
  
@@ -104,8 +104,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #endif
  
  #define MAX_BANKS     32
---- linux-2.6.21.3.orig/include/asm-sparc64/tsb.h
-+++ linux-2.6.21.3/include/asm-sparc64/tsb.h
+--- linux-2.6.21.4.orig/include/asm-sparc64/tsb.h
++++ linux-2.6.21.4/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.21/tcp-use-default-32768-61000-outgoing-port-range-in-all-cases.patch b/queue-2.6.21/tcp-use-default-32768-61000-outgoing-port-range-in-all-cases.patch
index d4e658bb6f95a7dcebdedb5e08b0fa1e01cd6de9..06381d48f21a3ad9b06170de0134d015baf860b5 100644 (file)
--- a/queue-2.6.21/tcp-use-default-32768-61000-outgoing-port-range-in-all-cases.patch
+++ b/queue-2.6.21/tcp-use-default-32768-61000-outgoing-port-range-in-all-cases.patch
@@ -26,8 +26,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  net/ipv4/tcp.c                  |    3 ---
  2 files changed, 1 insertion(+), 6 deletions(-)
 
---- linux-2.6.21.3.orig/net/ipv4/inet_connection_sock.c
-+++ linux-2.6.21.3/net/ipv4/inet_connection_sock.c
+--- linux-2.6.21.4.orig/net/ipv4/inet_connection_sock.c
++++ linux-2.6.21.4/net/ipv4/inet_connection_sock.c
 @@ -31,10 +31,8 @@ EXPORT_SYMBOL(inet_csk_timer_bug_msg);
  
  /*
@@ -40,8 +40,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  int inet_csk_bind_conflict(const struct sock *sk,
                           const struct inet_bind_bucket *tb)
---- linux-2.6.21.3.orig/net/ipv4/tcp.c
-+++ linux-2.6.21.3/net/ipv4/tcp.c
+--- linux-2.6.21.4.orig/net/ipv4/tcp.c
++++ linux-2.6.21.4/net/ipv4/tcp.c
 @@ -2445,13 +2445,10 @@ void __init tcp_init(void)
                        order++)
                ;

diff --git a/queue-2.6.21/tg3-fix-link-problem-on-dell-s-onboard-5906.patch b/queue-2.6.21/tg3-fix-link-problem-on-dell-s-onboard-5906.patch
index e53e013110e61e05c6abdcd69759a0ea5beba055..2c1dbeb0946df09580bf0eec0d94b22cb4887f7e 100644 (file)
--- a/queue-2.6.21/tg3-fix-link-problem-on-dell-s-onboard-5906.patch
+++ b/queue-2.6.21/tg3-fix-link-problem-on-dell-s-onboard-5906.patch
@@ -28,8 +28,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  drivers/net/tg3.c |    5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
---- linux-2.6.21.3.orig/drivers/net/tg3.c
-+++ linux-2.6.21.3/drivers/net/tg3.c
+--- linux-2.6.21.4.orig/drivers/net/tg3.c
++++ linux-2.6.21.4/drivers/net/tg3.c
 @@ -64,8 +64,8 @@
  
  #define DRV_MODULE_NAME               "tg3"

diff --git a/queue-2.6.21/timer-statistics-fix-race.patch b/queue-2.6.21/timer-statistics-fix-race.patch
index 3ae8d2ccc2d5f11f25a6e54e7526af8bccda2ccb..fe2ce5a6f69ab720aad65ddb0fd63f6fb875a379 100644 (file)
--- a/queue-2.6.21/timer-statistics-fix-race.patch
+++ b/queue-2.6.21/timer-statistics-fix-race.patch
@@ -24,8 +24,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  kernel/time/timer_stats.c |   37 +++++++++++++++++++++----------------
  1 file changed, 21 insertions(+), 16 deletions(-)
 
---- linux-2.6.21.3.orig/kernel/time/timer_stats.c
-+++ linux-2.6.21.3/kernel/time/timer_stats.c
+--- linux-2.6.21.4.orig/kernel/time/timer_stats.c
++++ linux-2.6.21.4/kernel/time/timer_stats.c
 @@ -117,21 +117,6 @@ static struct entry entries[MAX_ENTRIES]
  
  static atomic_t overflow_count;

diff --git a/queue-2.6.21/timer-stats-speedups.patch b/queue-2.6.21/timer-stats-speedups.patch
index 41f2cfb59c9e419f2be19d8b2ad97b6851ac57d6..8b0e55ef7ce135c127c7d8b0660162e6b42a0083 100644 (file)
--- a/queue-2.6.21/timer-stats-speedups.patch
+++ b/queue-2.6.21/timer-stats-speedups.patch
@@ -32,8 +32,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  lib/Kconfig.debug                     |    5 ++++-
  3 files changed, 14 insertions(+), 5 deletions(-)
 
---- linux-2.6.21.3.orig/Documentation/hrtimer/timer_stats.txt
-+++ linux-2.6.21.3/Documentation/hrtimer/timer_stats.txt
+--- linux-2.6.21.4.orig/Documentation/hrtimer/timer_stats.txt
++++ linux-2.6.21.4/Documentation/hrtimer/timer_stats.txt
 @@ -2,9 +2,10 @@ timer_stats - timer usage statistics
  ------------------------------------
  
@@ -48,8 +48,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  timer_stats should be used by kernel and userspace developers to verify that
  their code does not make unduly use of timers. This helps to avoid unnecessary
---- linux-2.6.21.3.orig/kernel/time/timer_stats.c
-+++ linux-2.6.21.3/kernel/time/timer_stats.c
+--- linux-2.6.21.4.orig/kernel/time/timer_stats.c
++++ linux-2.6.21.4/kernel/time/timer_stats.c
 @@ -236,10 +236,15 @@ void timer_stats_update_stats(void *time
        /*
         * It doesnt matter which lock we take:
@@ -67,8 +67,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
        input.timer = timer;
        input.start_func = startf;
        input.expire_func = timerf;
---- linux-2.6.21.3.orig/lib/Kconfig.debug
-+++ linux-2.6.21.3/lib/Kconfig.debug
+--- linux-2.6.21.4.orig/lib/Kconfig.debug
++++ linux-2.6.21.4/lib/Kconfig.debug
 @@ -143,7 +143,10 @@ config TIMER_STATS
          reprogrammed. The statistics can be read from /proc/timer_stats.
          The statistics collection is started by writing 1 to /proc/timer_stats,

diff --git a/queue-2.6.21/tty-fix-leakage-of-erestartsys-to-userland.patch b/queue-2.6.21/tty-fix-leakage-of-erestartsys-to-userland.patch
index 884891ed4d6059e577a0922daa47f29a233a0518..02e5b048f8b965c3262211d4570e71f19d8f3c82 100644 (file)
--- a/queue-2.6.21/tty-fix-leakage-of-erestartsys-to-userland.patch
+++ b/queue-2.6.21/tty-fix-leakage-of-erestartsys-to-userland.patch
@@ -29,8 +29,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  drivers/char/tty_io.c |    3 ++-
  2 files changed, 3 insertions(+), 1 deletion(-)
 
---- linux-2.6.21.3.orig/drivers/char/n_tty.c
-+++ linux-2.6.21.3/drivers/char/n_tty.c
+--- linux-2.6.21.4.orig/drivers/char/n_tty.c
++++ linux-2.6.21.4/drivers/char/n_tty.c
 @@ -1191,6 +1191,7 @@ static int job_control(struct tty_struct
                            is_current_pgrp_orphaned())
                                return -EIO;
@@ -39,8 +39,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
                        return -ERESTARTSYS;
                }
        }
---- linux-2.6.21.3.orig/drivers/char/tty_io.c
-+++ linux-2.6.21.3/drivers/char/tty_io.c
+--- linux-2.6.21.4.orig/drivers/char/tty_io.c
++++ linux-2.6.21.4/drivers/char/tty_io.c
 @@ -1121,7 +1121,8 @@ int tty_check_change(struct tty_struct *
                return 0;
        if (is_current_pgrp_orphaned())

diff --git a/queue-2.6.21/uml-improve-host-ptrace_sysemu-check.patch b/queue-2.6.21/uml-improve-host-ptrace_sysemu-check.patch
index 4dbf82511d8046b669ef2d9e90b81f213e4c7fac..424ece5b420a88c7395b1d9d652cfcd3392de6eb 100644 (file)
--- a/queue-2.6.21/uml-improve-host-ptrace_sysemu-check.patch
+++ b/queue-2.6.21/uml-improve-host-ptrace_sysemu-check.patch
@@ -19,8 +19,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  arch/um/os-Linux/start_up.c |   24 ++++++++++++++++--------
  1 file changed, 16 insertions(+), 8 deletions(-)
 
---- linux-2.6.21.3.orig/arch/um/os-Linux/start_up.c
-+++ linux-2.6.21.3/arch/um/os-Linux/start_up.c
+--- linux-2.6.21.4.orig/arch/um/os-Linux/start_up.c
++++ linux-2.6.21.4/arch/um/os-Linux/start_up.c
 @@ -144,9 +144,7 @@ static int stop_ptraced_child(int pid, v
                int exit_with = WEXITSTATUS(status);
                if (exit_with == 2)

diff --git a/queue-2.6.21/usb-set-the-correct-interrupt-interval-in-usb_bulk_msg.patch b/queue-2.6.21/usb-set-the-correct-interrupt-interval-in-usb_bulk_msg.patch
index 7de8e2d13ac18f26346d66f75e69db6f2e38b1fc..acc39518f8044910e59f6f5d42cd9da6fc5754a6 100644 (file)
--- a/queue-2.6.21/usb-set-the-correct-interrupt-interval-in-usb_bulk_msg.patch
+++ b/queue-2.6.21/usb-set-the-correct-interrupt-interval-in-usb_bulk_msg.patch
@@ -18,8 +18,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  drivers/usb/core/message.c |    9 ++-------
  1 file changed, 2 insertions(+), 7 deletions(-)
 
---- a/drivers/usb/core/message.c
-+++ b/drivers/usb/core/message.c
+--- linux-2.6.21.4.orig/drivers/usb/core/message.c
++++ linux-2.6.21.4/drivers/usb/core/message.c
 @@ -221,15 +221,10 @@ int usb_bulk_msg(struct usb_device *usb_
  
        if ((ep->desc.bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==

diff --git a/queue-2.6.21/v4l-dvb-budget-ci-fix-tuning-for-tdm-1316.patch b/queue-2.6.21/v4l-dvb-budget-ci-fix-tuning-for-tdm-1316.patch
index c04037de0518e208e0be7e375b658f4f2140c22b..bcda1c062b7faf8a8d68dcdf7ea39a9e7ef78b5c 100644 (file)
--- a/queue-2.6.21/v4l-dvb-budget-ci-fix-tuning-for-tdm-1316.patch
+++ b/queue-2.6.21/v4l-dvb-budget-ci-fix-tuning-for-tdm-1316.patch
@@ -28,8 +28,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  drivers/media/dvb/ttpci/budget-ci.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- linux-2.6.21.3.orig/drivers/media/dvb/ttpci/budget-ci.c
-+++ linux-2.6.21.3/drivers/media/dvb/ttpci/budget-ci.c
+--- linux-2.6.21.4.orig/drivers/media/dvb/ttpci/budget-ci.c
++++ linux-2.6.21.4/drivers/media/dvb/ttpci/budget-ci.c
 @@ -926,7 +926,7 @@ static int dvbc_philips_tdm1316l_tuner_s
                band = 1;
        } else if (tuner_frequency < 200000000) {

diff --git a/queue-2.6.21/work-around-dell-e520-bios-reboot-bug.patch b/queue-2.6.21/work-around-dell-e520-bios-reboot-bug.patch
index e4f70faa19368b0b5c29dd818ced1ffec31c9ac0..468b379202655cb1225a4bfbf2b0bb2df03dfcbf 100644 (file)
--- a/queue-2.6.21/work-around-dell-e520-bios-reboot-bug.patch
+++ b/queue-2.6.21/work-around-dell-e520-bios-reboot-bug.patch
@@ -29,8 +29,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  arch/i386/kernel/reboot.c |    8 ++++++++
  1 file changed, 8 insertions(+)
 
---- a/arch/i386/kernel/reboot.c
-+++ b/arch/i386/kernel/reboot.c
+--- linux-2.6.21.4.orig/arch/i386/kernel/reboot.c
++++ linux-2.6.21.4/arch/i386/kernel/reboot.c
 @@ -88,6 +88,14 @@ static int __init set_bios_reboot(struct
  }
  

diff --git a/queue-2.6.21/x86-fix-oprofile-double-free.patch b/queue-2.6.21/x86-fix-oprofile-double-free.patch
index 1dd2e3bb9fb7b174180f97fd574c6c4f2a2b42b5..0d5be781a71f1221d5b64f02f470f454b832b937 100644 (file)
--- a/queue-2.6.21/x86-fix-oprofile-double-free.patch
+++ b/queue-2.6.21/x86-fix-oprofile-double-free.patch
@@ -28,8 +28,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  arch/i386/oprofile/nmi_int.c |   12 +++++++++---
  1 file changed, 9 insertions(+), 3 deletions(-)
 
---- linux-2.6.21.3.orig/arch/i386/oprofile/nmi_int.c
-+++ linux-2.6.21.3/arch/i386/oprofile/nmi_int.c
+--- linux-2.6.21.4.orig/arch/i386/oprofile/nmi_int.c
++++ linux-2.6.21.4/arch/i386/oprofile/nmi_int.c
 @@ -154,7 +154,7 @@ static int allocate_msrs(void)
        size_t counters_size = sizeof(struct op_msr) * model->num_counters;
  

diff --git a/queue-2.6.21/x86_64-allocate-sparsemem-memmap-above-4g.patch b/queue-2.6.21/x86_64-allocate-sparsemem-memmap-above-4g.patch
index fbd1b01ba5a1dd0e4b23c609da31a3a65f93de75..eba7fd1746190d4a939116083ae0138e843049ed 100644 (file)
--- a/queue-2.6.21/x86_64-allocate-sparsemem-memmap-above-4g.patch
+++ b/queue-2.6.21/x86_64-allocate-sparsemem-memmap-above-4g.patch
@@ -29,8 +29,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  mm/sparse.c             |   11 +++++++++++
  3 files changed, 18 insertions(+)
 
---- linux-2.6.21.3.orig/arch/x86_64/mm/init.c
-+++ linux-2.6.21.3/arch/x86_64/mm/init.c
+--- linux-2.6.21.4.orig/arch/x86_64/mm/init.c
++++ linux-2.6.21.4/arch/x86_64/mm/init.c
 @@ -776,3 +776,9 @@ int in_gate_area_no_task(unsigned long a
  {
        return (addr >= VSYSCALL_START) && (addr < VSYSCALL_END);
@@ -41,8 +41,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +      return __alloc_bootmem_core(pgdat->bdata, size,
 +                      SMP_CACHE_BYTES, (4UL*1024*1024*1024), 0);
 +}
---- linux-2.6.21.3.orig/include/linux/bootmem.h
-+++ linux-2.6.21.3/include/linux/bootmem.h
+--- linux-2.6.21.4.orig/include/linux/bootmem.h
++++ linux-2.6.21.4/include/linux/bootmem.h
 @@ -59,6 +59,7 @@ extern void *__alloc_bootmem_core(struct
                                  unsigned long align,
                                  unsigned long goal,
@@ -51,8 +51,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE
  extern void reserve_bootmem(unsigned long addr, unsigned long size);
---- linux-2.6.21.3.orig/mm/sparse.c
-+++ linux-2.6.21.3/mm/sparse.c
+--- linux-2.6.21.4.orig/mm/sparse.c
++++ linux-2.6.21.4/mm/sparse.c
 @@ -209,6 +209,12 @@ static int sparse_init_one_section(struc
        return 1;
  }

diff --git a/queue-2.6.21/zd1211rw-add-al2230s-rf-support.patch b/queue-2.6.21/zd1211rw-add-al2230s-rf-support.patch
index a6c1a14965b87082f1c8246224b932b42faa8a65..a1d564c8264324cb182ca36f4c4d08be69039e76 100644 (file)
--- a/queue-2.6.21/zd1211rw-add-al2230s-rf-support.patch
+++ b/queue-2.6.21/zd1211rw-add-al2230s-rf-support.patch
@@ -31,8 +31,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  drivers/net/wireless/zd1211rw/zd_rf_al2230.c |   89 ++++++++++++++++++++++-----
  4 files changed, 78 insertions(+), 20 deletions(-)
 
---- linux-2.6.21.3.orig/drivers/net/wireless/zd1211rw/zd_chip.c
-+++ linux-2.6.21.3/drivers/net/wireless/zd1211rw/zd_chip.c
+--- linux-2.6.21.4.orig/drivers/net/wireless/zd1211rw/zd_chip.c
++++ linux-2.6.21.4/drivers/net/wireless/zd1211rw/zd_chip.c
 @@ -67,11 +67,12 @@ static int scnprint_id(struct zd_chip *c
        i += scnprint_mac_oui(chip->e2p_mac, buffer+i, size-i);
        i += scnprintf(buffer+i, size-i, " ");
@@ -48,8 +48,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
        return i;
  }
  
---- linux-2.6.21.3.orig/drivers/net/wireless/zd1211rw/zd_rf.c
-+++ linux-2.6.21.3/drivers/net/wireless/zd1211rw/zd_rf.c
+--- linux-2.6.21.4.orig/drivers/net/wireless/zd1211rw/zd_rf.c
++++ linux-2.6.21.4/drivers/net/wireless/zd1211rw/zd_rf.c
 @@ -34,7 +34,7 @@ static const char *rfs[] = {
        [AL2210_RF]     = "AL2210_RF",
        [MAXIM_NEW_RF]  = "MAXIM_NEW_RF",
@@ -59,8 +59,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
        [RALINK_RF]     = "RALINK_RF",
        [INTERSIL_RF]   = "INTERSIL_RF",
        [RF2959_RF]     = "RF2959_RF",
---- linux-2.6.21.3.orig/drivers/net/wireless/zd1211rw/zd_rf.h
-+++ linux-2.6.21.3/drivers/net/wireless/zd1211rw/zd_rf.h
+--- linux-2.6.21.4.orig/drivers/net/wireless/zd1211rw/zd_rf.h
++++ linux-2.6.21.4/drivers/net/wireless/zd1211rw/zd_rf.h
 @@ -26,7 +26,7 @@
  #define AL2210_RF                     0x7
  #define MAXIM_NEW_RF                  0x8
@@ -70,8 +70,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #define RALINK_RF                     0xb
  #define INTERSIL_RF                   0xc
  #define RF2959_RF                     0xd
---- linux-2.6.21.3.orig/drivers/net/wireless/zd1211rw/zd_rf_al2230.c
-+++ linux-2.6.21.3/drivers/net/wireless/zd1211rw/zd_rf_al2230.c
+--- linux-2.6.21.4.orig/drivers/net/wireless/zd1211rw/zd_rf_al2230.c
++++ linux-2.6.21.4/drivers/net/wireless/zd1211rw/zd_rf_al2230.c
 @@ -59,6 +59,18 @@ static const struct zd_ioreq16 zd1211b_i
        { CR240, 0x57 }, { CR9,   0xe0 },
  };