From 3cea11fb349d801ee2b7b09b765b303daa373aad Mon Sep 17 00:00:00 2001 From: Greg KH Date: Fri, 20 May 2005 09:39:18 -0700 Subject: [PATCH] updated the queue patches to have proper diffstats --- queue/3c59x-d3-fix.patch | 12 ++-------- queue/ebtables-fix-smp-race.patch | 9 +++++--- queue/ext3-fix-race.patch | 15 +++++++----- queue/fix-lpar-iommu-on-p630.patch | 23 +++++++++++-------- queue/fix-matroxfb-on-big-endian.patch | 15 +++++++----- queue/ide-dma-fix.patch | 14 ++++++----- queue/rose-minor-security-fix.patch | 9 +++++--- .../usbaudio-prevent-oops-on-usb-unplug.patch | 16 ++++++------- .../usbusx2y-prevent-oops-on-usb-unplug.patch | 14 +++++------ queue/visor-oops-fix.patch | 9 +++++--- 10 files changed, 72 insertions(+), 64 deletions(-) diff --git a/queue/3c59x-d3-fix.patch b/queue/3c59x-d3-fix.patch index 2c038349ccf..bbdd4985577 100644 --- a/queue/3c59x-d3-fix.patch +++ b/queue/3c59x-d3-fix.patch @@ -11,19 +11,11 @@ Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- -commit 3c8fad1829cc33e903500b41d989fa50ab196378 -tree 1e958eebf19fb59b67e51d6bb51303fbee2b84e9 -parent 1922163c8dfe717c089bdcc18ade4a65350a09c8 -author Daniel Ritz Thu, 05 May 2005 16:15:44 -0700 -committer Linus Torvalds Thu, 05 May 2005 16:36:40 -0700 - drivers/net/3c59x.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) -Index: drivers/net/3c59x.c -=================================================================== ---- be95a8f0df16e71f41dce26e8e530a900a4173a2/drivers/net/3c59x.c (mode:100644) -+++ 1e958eebf19fb59b67e51d6bb51303fbee2b84e9/drivers/net/3c59x.c (mode:100644) +--- linux-2.6.11.10.orig/drivers/net/3c59x.c 2005-05-20 09:34:18.788560304 -0700 ++++ linux-2.6.11.10/drivers/net/3c59x.c 2005-05-20 09:34:22.644974040 -0700 @@ -1581,7 +1581,8 @@ if (VORTEX_PCI(vp)) { diff --git a/queue/ebtables-fix-smp-race.patch b/queue/ebtables-fix-smp-race.patch index e4ef332c365..492962a5160 100644 --- a/queue/ebtables-fix-smp-race.patch +++ b/queue/ebtables-fix-smp-race.patch @@ -14,9 +14,12 @@ Signed-off-by: Bart De Schuymer Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman -diff -Nru a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c ---- a/net/bridge/netfilter/ebtables.c 2005-05-11 21:24:50 -07:00 -+++ b/net/bridge/netfilter/ebtables.c 2005-05-11 21:24:50 -07:00 +--- + net/bridge/netfilter/ebtables.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletion(-) + +--- linux-2.6.11.10.orig/net/bridge/netfilter/ebtables.c 2005-05-20 09:36:00.942030616 -0700 ++++ linux-2.6.11.10/net/bridge/netfilter/ebtables.c 2005-05-20 09:36:18.350384144 -0700 @@ -179,9 +179,10 @@ struct ebt_chainstack *cs; struct ebt_entries *chaininfo; diff --git a/queue/ext3-fix-race.patch b/queue/ext3-fix-race.patch index fa659d02a55..1cec11fa629 100644 --- a/queue/ext3-fix-race.patch +++ b/queue/ext3-fix-race.patch @@ -21,8 +21,8 @@ CPU 1 try to allocate a block in group1 with given reservation window my_rsv ext3_try_to_allocate_with_rsv(group ----copy reservation window my_rsv into local rsv_copy - ext3_try_to_allocate(...rsv_copy) - ----no free block in existing reservation window, + ext3_try_to_allocate(...rsv_copy) + ----no free block in existing reservation window, ----need a new reservation window spin_lock(&rsv_lock); @@ -51,7 +51,7 @@ CPU 2 rsv_remove_window () ---------------break, trying to remove a unlinked node from the tree .... - + CPU 1: ext3_try_to_allocate_with_rsv(group, my_rsv) @@ -67,9 +67,12 @@ Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman -diff -Nru a/fs/ext3/balloc.c b/fs/ext3/balloc.c ---- a/fs/ext3/balloc.c 2005-05-11 21:18:50 -07:00 -+++ b/fs/ext3/balloc.c 2005-05-11 21:18:50 -07:00 +--- + fs/ext3/balloc.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletion(-) + +--- linux-2.6.11.10.orig/fs/ext3/balloc.c 2005-05-16 10:50:46.000000000 -0700 ++++ linux-2.6.11.10/fs/ext3/balloc.c 2005-05-20 09:36:22.628733736 -0700 @@ -268,7 +268,8 @@ if (!rsv_is_empty(&rsv->rsv_window)) { diff --git a/queue/fix-lpar-iommu-on-p630.patch b/queue/fix-lpar-iommu-on-p630.patch index 30dfdd189e9..212bc64101c 100644 --- a/queue/fix-lpar-iommu-on-p630.patch +++ b/queue/fix-lpar-iommu-on-p630.patch @@ -16,10 +16,13 @@ Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman -diff -Nru a/arch/ppc64/kernel/pSeries_iommu.c b/arch/ppc64/kernel/pSeries_iommu.c ---- a/arch/ppc64/kernel/pSeries_iommu.c 2005-05-12 09:31:21 -07:00 -+++ b/arch/ppc64/kernel/pSeries_iommu.c 2005-05-12 09:31:21 -07:00 -@@ -402,6 +402,8 @@ +--- + arch/ppc64/kernel/pSeries_iommu.c | 55 +++++++++++++++++++++++++++++++++++++- + 1 files changed, 54 insertions(+), 1 deletion(-) + +--- linux-2.6.11.10.orig/arch/ppc64/kernel/pSeries_iommu.c 2005-05-16 10:50:31.000000000 -0700 ++++ linux-2.6.11.10/arch/ppc64/kernel/pSeries_iommu.c 2005-05-20 09:36:25.091359360 -0700 +@@ -401,6 +401,8 @@ struct device_node *dn, *pdn; unsigned int *dma_window = NULL; @@ -28,9 +31,9 @@ diff -Nru a/arch/ppc64/kernel/pSeries_iommu.c b/arch/ppc64/kernel/pSeries_iommu. dn = pci_bus_to_OF_node(bus); /* Find nearest ibm,dma-window, walking up the device tree */ -@@ -478,6 +480,56 @@ - .notifier_call = iommu_reconfig_notifier, - }; +@@ -455,6 +457,56 @@ + } + } +static void iommu_dev_setup_pSeriesLP(struct pci_dev *dev) +{ @@ -85,7 +88,7 @@ diff -Nru a/arch/ppc64/kernel/pSeries_iommu.c b/arch/ppc64/kernel/pSeries_iommu. static void iommu_bus_setup_null(struct pci_bus *b) { } static void iommu_dev_setup_null(struct pci_dev *d) { } -@@ -502,13 +554,14 @@ +@@ -479,13 +531,14 @@ ppc_md.tce_free = tce_free_pSeriesLP; } ppc_md.iommu_bus_setup = iommu_bus_setup_pSeriesLP; @@ -99,5 +102,5 @@ diff -Nru a/arch/ppc64/kernel/pSeries_iommu.c b/arch/ppc64/kernel/pSeries_iommu. - ppc_md.iommu_dev_setup = iommu_dev_setup_pSeries; - pSeries_reconfig_notifier_register(&iommu_reconfig_nb); - + pci_iommu_init(); + } diff --git a/queue/fix-matroxfb-on-big-endian.patch b/queue/fix-matroxfb-on-big-endian.patch index 35dbf1898fb..2ef5aeb72e2 100644 --- a/queue/fix-matroxfb-on-big-endian.patch +++ b/queue/fix-matroxfb-on-big-endian.patch @@ -17,9 +17,13 @@ Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman -diff -Nru a/drivers/video/matrox/matroxfb_accel.c b/drivers/video/matrox/matroxfb_accel.c ---- a/drivers/video/matrox/matroxfb_accel.c 2005-05-12 09:26:38 -07:00 -+++ b/drivers/video/matrox/matroxfb_accel.c 2005-05-12 09:26:38 -07:00 +--- + drivers/video/matrox/matroxfb_accel.c | 14 +++++++++++--- + drivers/video/matrox/matroxfb_base.h | 4 ++-- + 2 files changed, 13 insertions(+), 5 deletions(-) + +--- linux-2.6.11.10.orig/drivers/video/matrox/matroxfb_accel.c 2005-05-16 10:50:40.000000000 -0700 ++++ linux-2.6.11.10/drivers/video/matrox/matroxfb_accel.c 2005-05-20 09:36:29.666663808 -0700 @@ -438,13 +438,21 @@ } else if (step == 1) { /* Special case for 1..8bit widths */ @@ -53,9 +57,8 @@ diff -Nru a/drivers/video/matrox/matroxfb_accel.c b/drivers/video/matrox/matroxf } chardata += step; } -diff -Nru a/drivers/video/matrox/matroxfb_base.h b/drivers/video/matrox/matroxfb_base.h ---- a/drivers/video/matrox/matroxfb_base.h 2005-05-12 09:26:38 -07:00 -+++ b/drivers/video/matrox/matroxfb_base.h 2005-05-12 09:26:38 -07:00 +--- linux-2.6.11.10.orig/drivers/video/matrox/matroxfb_base.h 2005-05-16 10:50:40.000000000 -0700 ++++ linux-2.6.11.10/drivers/video/matrox/matroxfb_base.h 2005-05-20 09:36:29.680661680 -0700 @@ -170,14 +170,14 @@ if ((unsigned long)src & 3) { diff --git a/queue/ide-dma-fix.patch b/queue/ide-dma-fix.patch index 95b13973f48..2e3aaeaf297 100644 --- a/queue/ide-dma-fix.patch +++ b/queue/ide-dma-fix.patch @@ -16,10 +16,13 @@ From: Bartlomiej Zolnierkiewicz Signed-off-by: Greg Kroah-Hartman -diff -urNpX dontdiff linux-2.6.11-gentoo-r8/drivers/ide/ide-disk.c linux-dsd/drivers/ide/ide-disk.c ---- linux-2.6.11-gentoo-r8/drivers/ide/ide-disk.c 2005-03-02 07:38:07.000000000 +0000 -+++ linux-dsd/drivers/ide/ide-disk.c 2005-05-09 01:29:49.000000000 +0100 -@@ -133,6 +133,8 @@ static ide_startstop_t __ide_do_rw_disk( +--- + drivers/ide/ide-disk.c | 4 +++- + 1 files changed, 3 insertions(+), 1 deletion(-) + +--- linux-2.6.11.10.orig/drivers/ide/ide-disk.c 2005-05-16 10:50:31.000000000 -0700 ++++ linux-2.6.11.10/drivers/ide/ide-disk.c 2005-05-20 09:36:31.933319224 -0700 +@@ -133,6 +133,8 @@ if (hwif->no_lba48_dma && lba48 && dma) { if (block + rq->nr_sectors > 1ULL << 28) dma = 0; @@ -28,7 +31,7 @@ diff -urNpX dontdiff linux-2.6.11-gentoo-r8/drivers/ide/ide-disk.c linux-dsd/dri } if (!dma) { -@@ -146,7 +148,7 @@ static ide_startstop_t __ide_do_rw_disk( +@@ -146,7 +148,7 @@ /* FIXME: SELECT_MASK(drive, 0) ? */ if (drive->select.b.lba) { @@ -37,4 +40,3 @@ diff -urNpX dontdiff linux-2.6.11-gentoo-r8/drivers/ide/ide-disk.c linux-dsd/dri task_ioreg_t tasklets[10]; pr_debug("%s: LBA=0x%012llx\n", drive->name, block); - diff --git a/queue/rose-minor-security-fix.patch b/queue/rose-minor-security-fix.patch index 8d0ac1640fb..303851abfaa 100644 --- a/queue/rose-minor-security-fix.patch +++ b/queue/rose-minor-security-fix.patch @@ -11,9 +11,12 @@ minor security hole. Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman -diff -Nru a/net/rose/rose_route.c b/net/rose/rose_route.c ---- a/net/rose/rose_route.c 2005-05-12 09:20:45 -07:00 -+++ b/net/rose/rose_route.c 2005-05-12 09:20:45 -07:00 +--- + net/rose/rose_route.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletion(-) + +--- linux-2.6.11.10.orig/net/rose/rose_route.c 2005-05-16 10:52:02.000000000 -0700 ++++ linux-2.6.11.10/net/rose/rose_route.c 2005-05-20 09:36:34.381946976 -0700 @@ -727,7 +727,8 @@ } if (rose_route.mask > 10) /* Mask can't be more than 10 digits */ diff --git a/queue/usbaudio-prevent-oops-on-usb-unplug.patch b/queue/usbaudio-prevent-oops-on-usb-unplug.patch index 3f6e3b647c1..708dd84a76c 100644 --- a/queue/usbaudio-prevent-oops-on-usb-unplug.patch +++ b/queue/usbaudio-prevent-oops-on-usb-unplug.patch @@ -20,9 +20,13 @@ Signed-off-by: Karsten Wiese Signed-off-by: Greg Kroah-Hartman ---- a/sound/usb/usbaudio.c 2005/03/24 07:17:17 1.119 -+++ b/sound/usb/usbaudio.c 2005/04/20 09:12:35 1.120 -@@ -3289,7 +3289,7 @@ +--- + sound/usb/usbaudio.c | 2 +- + 1 files changed, 1 insertion(+), 1 deletion(-) + +--- linux-2.6.11.10.orig/sound/usb/usbaudio.c 2005-05-16 10:52:18.000000000 -0700 ++++ linux-2.6.11.10/sound/usb/usbaudio.c 2005-05-20 09:36:37.396488696 -0700 +@@ -3276,7 +3276,7 @@ } usb_chip[chip->index] = NULL; up(®ister_mutex); @@ -31,9 +35,3 @@ Signed-off-by: Greg Kroah-Hartman } else { up(®ister_mutex); } - -_______________________________________________ -stable mailing list -stable@linux.kernel.org -http://linux.kernel.org/mailman/listinfo/stable - diff --git a/queue/usbusx2y-prevent-oops-on-usb-unplug.patch b/queue/usbusx2y-prevent-oops-on-usb-unplug.patch index fcf20f958ab..6e7308ca0ec 100644 --- a/queue/usbusx2y-prevent-oops-on-usb-unplug.patch +++ b/queue/usbusx2y-prevent-oops-on-usb-unplug.patch @@ -20,8 +20,12 @@ Signed-off-by: Karsten Wiese Signed-off-by: Greg Kroah-Hartman ---- a/sound/usb/usx2y/usbusx2y.c 2005/01/28 10:21:48 1.9 -+++ b/sound/usb/usx2y/usbusx2y.c 2005/04/20 09:12:35 1.10 +--- + sound/usb/usx2y/usbusx2y.c | 11 +++++++---- + 1 files changed, 7 insertions(+), 4 deletions(-) + +--- linux-2.6.11.10.orig/sound/usb/usx2y/usbusx2y.c 2005-05-16 10:52:18.000000000 -0700 ++++ linux-2.6.11.10/sound/usb/usx2y/usbusx2y.c 2005-05-20 09:36:42.067778552 -0700 @@ -1,6 +1,11 @@ /* * usbusy2y.c - ALSA USB US-428 Driver @@ -61,9 +65,3 @@ Signed-off-by: Greg Kroah-Hartman } } - -_______________________________________________ -stable mailing list -stable@linux.kernel.org -http://linux.kernel.org/mailman/listinfo/stable - diff --git a/queue/visor-oops-fix.patch b/queue/visor-oops-fix.patch index 6e03a332e1b..ccb2ed03487 100644 --- a/queue/visor-oops-fix.patch +++ b/queue/visor-oops-fix.patch @@ -8,9 +8,12 @@ Thanks to Mark Lord for reporting this and helping with testin Signed-off-by: Greg Kroah-Hartman -diff -Nru a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c ---- a/drivers/usb/serial/visor.c 2005-05-11 00:52:29 -07:00 -+++ b/drivers/usb/serial/visor.c 2005-05-11 00:52:29 -07:00 +--- + drivers/usb/serial/visor.c | 38 +++++++++++++++++++++++++++----------- + 1 files changed, 27 insertions(+), 11 deletions(-) + +--- linux-2.6.11.10.orig/drivers/usb/serial/visor.c 2005-05-16 10:50:37.000000000 -0700 ++++ linux-2.6.11.10/drivers/usb/serial/visor.c 2005-05-20 09:36:44.139463608 -0700 @@ -386,6 +386,7 @@ int bytes_in; int bytes_out; -- 2.47.3