r2611 - in trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches: . series
Sven Luther
luther@costa.debian.org
Sat, 05 Mar 2005 10:52:01 +0100
Author: luther
Date: 2005-03-05 10:52:00 +0100 (Sat, 05 Mar 2005)
New Revision: 2611
Added:
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/TODO
Modified:
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/fbdev-radeon-noaccel.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/fix-alpha-ext3-oops.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/ia64-irq-affinity-upfix.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/sparc32-hypersparc-srmmu.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/sparc64-hme-lockup.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/tty-locking-fixes9.dpatch
Log:
Rediffed another bunch of dpatches. All missing ones are in TODO.
Would appreciate if someone looks the already okeyed ones over though.
Added: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/TODO
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/TODO 2005-03-05 09:34:01 UTC (rev 2610)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/TODO 2005-03-05 09:52:00 UTC (rev 2611)
@@ -0,0 +1,17 @@
+# + modular-ide-pnp.dpatch # OK, needs rediff
+# + modular-ide.dpatch # FAILED
+# + drivers-net-8139too-locking.dpatch # FAILED
+# + drivers-net-tg3-readd.dpatch # OK, needs rediff
+# + drivers-scsi_changer.dpatch # OK, needs rediff
+# + remove-references-to-removed-drivers.dpatch # FAILED
+# + x86-i486_emu.dpatch # OK, needs rediff
+# + sparc32-initrd-memcpy.dpatch # FAILED
+# + drm-locking-fixes.dpatch # FAILED
+# + ia64-generic-no-smp.dpatch # FAILED
+# + ia64-generic-no-smp-1-to-2.dpatch # FAILED
+# + 029-random_poolsize_overflow.dpatch # FAILED
+# + 030-moxa_user_copy_checking.dpatch # FAILED
+# + drivers-ide-__devinit.dpatch # FAILED
+# + amd64-int3-fix.dpatch # PARTIALLY REVERSED, needs investigating.
+# + ipv4-fragment-queues-2.dpatch # FAILED
+# + amd64-noexec32-backport.dpatch # FAILED
Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/fbdev-radeon-noaccel.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/fbdev-radeon-noaccel.dpatch 2005-03-05 09:34:01 UTC (rev 2610)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/fbdev-radeon-noaccel.dpatch 2005-03-05 09:52:00 UTC (rev 2611)
@@ -11,9 +11,9 @@
. $(dirname $0)/DPATCH
@DPATCH@
---- kernel-source-2.6.10/drivers/video/aty/radeon_base.c.orig 2005-02-07 14:03:53.987985344 +0100
-+++ kernel-source-2.6.10/drivers/video/aty/radeon_base.c 2005-02-07 14:04:47.152903048 +0100
-@@ -1778,8 +1778,12 @@
+--- kernel-source-2.6.11-2.6.11-orig/drivers/video/aty/radeon_base.c 2005-03-02 08:37:54.000000000 +0100
++++ kernel-source-2.6.11-2.6.11/drivers/video/aty/radeon_base.c 2005-03-05 10:37:19.668812008 +0100
+@@ -1832,8 +1832,12 @@
fb_alloc_cmap(&info->cmap, 256, 0);
Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/fix-alpha-ext3-oops.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/fix-alpha-ext3-oops.dpatch 2005-03-05 09:34:01 UTC (rev 2610)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/fix-alpha-ext3-oops.dpatch 2005-03-05 09:52:00 UTC (rev 2611)
@@ -1,6 +1,6 @@
---- kernel-source-2.6.8-2.6.8/fs/ext3/super.c~ 2004-08-14 07:37:41.000000000 +0200
-+++ kernel-source-2.6.8-2.6.8/fs/ext3/super.c 2005-01-09 21:44:51.449409783 +0100
-@@ -2337,6 +2337,10 @@
+--- kernel-source-2.6.11-2.6.11-orig/fs/ext3/super.c 2005-03-02 08:38:38.000000000 +0100
++++ kernel-source-2.6.11-2.6.11/fs/ext3/super.c 2005-03-05 10:41:47.530090904 +0100
+@@ -2487,6 +2487,10 @@
static int __init init_ext3_fs(void)
{
int err = init_ext3_xattr();
Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/ia64-irq-affinity-upfix.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/ia64-irq-affinity-upfix.dpatch 2005-03-05 09:34:01 UTC (rev 2610)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/ia64-irq-affinity-upfix.dpatch 2005-03-05 09:52:00 UTC (rev 2611)
@@ -11,22 +11,17 @@
Signed-off-by: dann frazier <dannf@hp.com>
---- linux-2.6.10.orig/arch/ia64/kernel/irq.c 2004-12-24 14:35:27.000000000 -0700
-+++ linux-2.6.10/arch/ia64/kernel/irq.c 2005-01-07 18:56:16.819383593 -0700
-@@ -1040,6 +1040,11 @@
+--- kernel-source-2.6.11-2.6.11-orig/arch/ia64/kernel/irq.c 2005-03-02 08:38:25.000000000 +0100
++++ kernel-source-2.6.11-2.6.11/arch/ia64/kernel/irq.c 2005-03-05 10:45:07.250728752 +0100
+@@ -133,7 +133,10 @@
}
}
+-
+#else /* !CONFIG_SMP */
-+
+void set_irq_affinity_info (unsigned int irq, int hwid, int redir)
+{
+}
-
#endif /* CONFIG_SMP */
--
-To unsubscribe from this list: send the line "unsubscribe linux-ia64" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at http://vger.kernel.org/majordomo-info.html
-
+ #ifdef CONFIG_HOTPLUG_CPU
Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1 2005-03-05 09:34:01 UTC (rev 2610)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1 2005-03-05 09:52:00 UTC (rev 2611)
@@ -34,27 +34,9 @@
+ sparc64-sb1500-clock-2.6.dpatch
+ powerpc-g3-750cxe.dpatch
+ powerpc-calibrate-tau.dpatch
-
-# + modular-ide-pnp.dpatch # OK, needs rediff
-# + modular-ide.dpatch # FAILED
-# + drivers-net-8139too-locking.dpatch # FAILED
-# + drivers-net-tg3-readd.dpatch # OK, needs rediff
-# + drivers-scsi_changer.dpatch # OK, needs rediff
-# + remove-references-to-removed-drivers.dpatch # FAILED
-# + x86-i486_emu.dpatch # OK, needs rediff
-# + sparc64-hme-lockup.dpatch # OK, needs rediff
-# + tty-locking-fixes9.dpatch # OK, needs rediff
-# + sparc32-initrd-memcpy.dpatch # FAILED
-# + drm-locking-fixes.dpatch # FAILED
-# + ia64-generic-no-smp.dpatch # FAILED
-# + ia64-generic-no-smp-1-to-2.dpatch # FAILED
-# + 029-random_poolsize_overflow.dpatch # FAILED
-# + 030-moxa_user_copy_checking.dpatch # FAILED
-# + ia64-irq-affinity-upfix.dpatch # OK, needs rediff
-# + drivers-ide-__devinit.dpatch # FAILED
-# + fix-alpha-ext3-oops.dpatch # OK, needs rediff
-# + amd64-int3-fix.dpatch # PARTIALLY REVERSED, needs investigating.
-# + fbdev-radeon-noaccel.dpatch # OK, needs rediff
-# + sparc32-hypersparc-srmmu.dpatch # OK, needs rediff
-# + ipv4-fragment-queues-2.dpatch # FAILED
-# + amd64-noexec32-backport.dpatch # FAILED
++ fbdev-radeon-noaccel.dpatch
++ sparc32-hypersparc-srmmu.dpatch
++ fix-alpha-ext3-oops.dpatch
++ ia64-irq-affinity-upfix.dpatch
++ tty-locking-fixes9.dpatch
++ sparc64-hme-lockup.dpatch
Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/sparc32-hypersparc-srmmu.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/sparc32-hypersparc-srmmu.dpatch 2005-03-05 09:34:01 UTC (rev 2610)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/sparc32-hypersparc-srmmu.dpatch 2005-03-05 09:52:00 UTC (rev 2611)
@@ -1,6 +1,6 @@
---- a/arch/sparc/mm/srmmu.c 2004-12-24 16:34:58.000000000 -0500
-+++ b/arch/sparc/mm/srmmu.c 2005-02-17 02:03:31.000000000 -0500
-@@ -1463,7 +1463,6 @@
+--- kernel-source-2.6.11-2.6.11-orig//arch/sparc/mm/srmmu.c 2005-03-02 08:38:10.000000000 +0100
++++ kernel-source-2.6.11-2.6.11/arch/sparc/mm/srmmu.c 2005-03-05 10:39:38.677679448 +0100
+@@ -1464,7 +1464,6 @@
static void __init init_hypersparc(void)
{
srmmu_name = "ROSS HyperSparc";
Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/sparc64-hme-lockup.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/sparc64-hme-lockup.dpatch 2005-03-05 09:34:01 UTC (rev 2610)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/sparc64-hme-lockup.dpatch 2005-03-05 09:52:00 UTC (rev 2611)
@@ -8,9 +8,9 @@
that requires a reboot to fix. This one-liner is a band-aid that seems
to take care of it... a possible weirdo timing bug. --Uzi
---- linux/drivers/net/sunhme.c.orig Mon Jul 15 02:38:27 2002
-+++ linux/drivers/net/sunhme.c Mon Jul 15 03:09:03 2002
-@@ -1983,6 +1983,7 @@
+--- kernel-source-2.6.11-2.6.11-orig/drivers/net/sunhme.c 2005-03-02 08:37:55.000000000 +0100
++++ kernel-source-2.6.11-2.6.11/drivers/net/sunhme.c 2005-03-05 10:48:16.704927336 +0100
+@@ -1990,6 +1990,7 @@
}
hp->tx_old = elem;
TXD((">"));
Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/tty-locking-fixes9.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/tty-locking-fixes9.dpatch 2005-03-05 09:34:01 UTC (rev 2610)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/tty-locking-fixes9.dpatch 2005-03-05 09:52:00 UTC (rev 2611)
@@ -1,6 +1,6 @@
---- kernel-source-2.6.8-2.6.8/drivers/serial/serial_core.c~ 2004-11-24 11:56:39.000000000 -0800
-+++ kernel-source-2.6.8-2.6.8/drivers/serial/serial_core.c 2004-11-24 11:56:50.000000000 -0800
-@@ -107,7 +107,8 @@
+--- kernel-source-2.6.11-2.6.11-orig/drivers/serial/serial_core.c 2005-03-02 08:37:50.000000000 +0100
++++ kernel-source-2.6.11-2.6.11/drivers/serial/serial_core.c 2005-03-05 10:46:43.417109240 +0100
+@@ -108,7 +108,8 @@
static void uart_tasklet_action(unsigned long data)
{
struct uart_state *state = (struct uart_state *)data;