r1553 - in trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian: . patches patches/series
Joshua Kwan
joshk@haydn.debian.org
Sat, 04 Sep 2004 21:51:52 -0600
Author: joshk
Date: 2004-09-04 21:51:45 -0600 (Sat, 04 Sep 2004)
New Revision: 1553
Added:
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/085_cpqarray_init-2.diff
Modified:
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/008_DAC960_alpha_fw.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/009_scsi_changer.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/010_tex_heading.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/011_double_request_region.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/012_8139too_deadlock.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/013_mpparse_cries_wolf.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/014_nm256xl_plus.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/015_amd8111e_fp.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/016_disable_non-free.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/017_modularize_vesafb.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/018_core_cia_1G.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/019_cpqarray_init.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-6
Log:
more annotations
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog 2004-09-05 03:11:21 UTC (rev 1552)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog 2004-09-05 03:51:45 UTC (rev 1553)
@@ -1,9 +1,8 @@
kernel-source-2.4.27 (2.4.27-6) UNRELEASED; urgency=low
- * 024_isofs_fixes.diff: split into
- 076_isofs_acorn_support.diff,
- 077_isofs_ignore_volseqno.diff,
- 078_isofs_nodot_execute.diff.
+ * Split out many monolithic diffs into smaller diffs for easy submission
+ to upstream.
+ * Annotate all diffs for the same purpose.
-- Joshua Kwan <joshk@triplehelix.org> Sat, 4 Sep 2004 13:08:07 -0700
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/008_DAC960_alpha_fw.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/008_DAC960_alpha_fw.diff 2004-09-05 03:11:21 UTC (rev 1552)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/008_DAC960_alpha_fw.diff 2004-09-05 03:51:45 UTC (rev 1553)
@@ -1,3 +1,9 @@
+# origin: Debian, #244585
+# cset: n/a
+# inclusion: not submitted
+# description: Require firmware 2.70 on Alpha for DAC960
+# revision date: 2004-09-04
+
diff -urN kernel-source-2.4.26-1/drivers/block/DAC960.c kernel-source-2.4.26-2/drivers/block/DAC960.c
--- kernel-source-2.4.26-1/drivers/block/DAC960.c 2002-11-30 15:49:38.000000000 +1100
+++ kernel-source-2.4.26-2/drivers/block/DAC960.c 2004-04-20 09:14:09.000000000 +1000
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/009_scsi_changer.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/009_scsi_changer.diff 2004-09-05 03:11:21 UTC (rev 1552)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/009_scsi_changer.diff 2004-09-05 03:51:45 UTC (rev 1553)
@@ -1,4 +1,9 @@
-10-scsi-media-changer
+# origin: Gerd Knorr
+# cset: n/a
+# inclusion: not suitable for mainline
+# description: SCSI changer support
+# revision date: 2004-09-04
+
diff -up linux-2.4.26/Documentation/Configure.help linux/Documentation/Configure.help
--- linux-2.4.26/Documentation/Configure.help 2004-04-21 13:46:10.000000000 +0200
+++ linux/Documentation/Configure.help 2004-04-21 14:11:32.000000000 +0200
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/010_tex_heading.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/010_tex_heading.diff 2004-09-05 03:11:21 UTC (rev 1552)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/010_tex_heading.diff 2004-09-05 03:51:45 UTC (rev 1553)
@@ -1,3 +1,9 @@
+# origin: Debian, #174554
+# cset: n/a
+# inclusion: not submitted
+# description: comment out leading comment in smp.tex
+# revision date: 2004-09-04
+
diff -urN kernel-source-2.4.26/Documentation/smp.tex kernel-source-2.4.26-1/Documentation/smp.tex
--- kernel-source-2.4.26/Documentation/smp.tex 1998-06-25 07:30:07.000000000 +1000
+++ kernel-source-2.4.26-1/Documentation/smp.tex 2003-01-26 14:11:55.000000000 +1100
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/011_double_request_region.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/011_double_request_region.diff 2004-09-05 03:11:21 UTC (rev 1552)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/011_double_request_region.diff 2004-09-05 03:51:45 UTC (rev 1553)
@@ -1,3 +1,9 @@
+# origin: Debian, #210289
+# cset: n/a
+# inclusion: not submitted
+# description: fix double call of request_region in arcnet
+# revision date: 2004-09-04
+
--- kernel-source-2.4.26/drivers/net/arcnet/com20020-isa.c 2002-08-03 10:39:44.000000000 +1000
+++ kernel-source-2.4.26-1/drivers/net/arcnet/com20020-isa.c 2003-09-27 13:32:55.000000000 +1000
@@ -53,6 +53,7 @@
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/012_8139too_deadlock.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/012_8139too_deadlock.diff 2004-09-05 03:11:21 UTC (rev 1552)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/012_8139too_deadlock.diff 2004-09-05 03:51:45 UTC (rev 1553)
@@ -1,3 +1,9 @@
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: not submitted
+# description: misnomer - restore mdio_sem that replaces rtnl_lock in 8139too
+# revision date: 2004-09-04
+
diff -urN kernel-source-2.4.26/drivers/net/8139too.c kernel-source-2.4.26-1/drivers/net/8139too.c
--- kernel-source-2.4.26/drivers/net/8139too.c 2004-04-14 23:05:30.000000000 +1000
+++ kernel-source-2.4.26-1/drivers/net/8139too.c 2004-04-17 14:23:48.000000000 +1000
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/013_mpparse_cries_wolf.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/013_mpparse_cries_wolf.diff 2004-09-05 03:11:21 UTC (rev 1552)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/013_mpparse_cries_wolf.diff 2004-09-05 03:51:45 UTC (rev 1553)
@@ -1,3 +1,9 @@
+# origin: Debian (Jochen Voss)
+# cset: n/a
+# inclusion: not submitted
+# description: don't panic on bad mptable signature
+# revision date: 2004-09-04
+
diff -urN kernel-source-2.4.26/arch/i386/kernel/mpparse.c kernel-source-2.4.26-1/arch/i386/kernel/mpparse.c
--- kernel-source-2.4.26/arch/i386/kernel/mpparse.c 2004-04-14 23:05:25.000000000 +1000
+++ kernel-source-2.4.26-1/arch/i386/kernel/mpparse.c 2004-04-17 14:23:36.000000000 +1000
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/014_nm256xl_plus.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/014_nm256xl_plus.diff 2004-09-05 03:11:21 UTC (rev 1552)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/014_nm256xl_plus.diff 2004-09-05 03:51:45 UTC (rev 1553)
@@ -1,3 +1,9 @@
+# origin: Debian, #116378
+# cset: n/a
+# inclusion: not submitted
+# description: NM256XL+ support for nm256_audio driver
+# revision date: 2004-09-04
+
diff -urN kernel-source-2.4.26/drivers/sound/nm256.h kernel-source-2.4.26-1/drivers/sound/nm256.h
--- kernel-source-2.4.26/drivers/sound/nm256.h 2000-12-12 08:02:32.000000000 +1100
+++ kernel-source-2.4.26-1/drivers/sound/nm256.h 2001-10-20 16:47:17.000000000 +1000
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/015_amd8111e_fp.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/015_amd8111e_fp.diff 2004-09-05 03:11:21 UTC (rev 1552)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/015_amd8111e_fp.diff 2004-09-05 03:51:45 UTC (rev 1553)
@@ -1,3 +1,9 @@
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: not submitted
+# description: don't perform FP operations in amd8111e time calculations
+# revision date: 2004-09-04
+
diff -urN kernel-source-2.4.26/drivers/net/amd8111e.h kernel-source-2.4.26-1/drivers/net/amd8111e.h
--- kernel-source-2.4.26/drivers/net/amd8111e.h 2003-08-25 21:44:42.000000000 +1000
+++ kernel-source-2.4.26-1/drivers/net/amd8111e.h 2003-10-19 20:40:36.000000000 +1000
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/016_disable_non-free.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/016_disable_non-free.diff 2004-09-05 03:11:21 UTC (rev 1552)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/016_disable_non-free.diff 2004-09-05 03:51:45 UTC (rev 1553)
@@ -1,3 +1,9 @@
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: not suitable for mainline
+# description: disable non-free config options (source files removed in p-n-f)
+# revision date: 2004-09-04
+
diff -urN kernel-source-2.4.26/drivers/net/Config.in kernel-source-2.4.26-1/drivers/net/Config.in
--- kernel-source-2.4.26/drivers/net/Config.in 2004-04-14 23:05:30.000000000 +1000
+++ kernel-source-2.4.26-1/drivers/net/Config.in 2004-02-22 20:28:19.000000000 +1100
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/017_modularize_vesafb.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/017_modularize_vesafb.diff 2004-09-05 03:11:21 UTC (rev 1552)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/017_modularize_vesafb.diff 2004-09-05 03:51:45 UTC (rev 1553)
@@ -1,3 +1,9 @@
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: probably not suitable for mainline (yet)
+# description: modular vesafb
+# revision date: 2004-09-04
+
diff -urN kernel-source-2.4.26/drivers/video/vesafb.c kernel-source-2.4.26-1/drivers/video/vesafb.c
--- kernel-source-2.4.26/drivers/video/vesafb.c 2003-11-29 05:26:21.000000000 +1100
+++ kernel-source-2.4.26-1/drivers/video/vesafb.c 2003-11-29 20:53:45.000000000 +1100
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/018_core_cia_1G.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/018_core_cia_1G.diff 2004-09-05 03:11:21 UTC (rev 1552)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/018_core_cia_1G.diff 2004-09-05 03:51:45 UTC (rev 1553)
@@ -1,3 +1,9 @@
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: incorrect patch, reverted in -3
+# description: uhh.. dunno
+# revision date: 2004-09-04
+
diff -urN kernel-source-2.4.26/arch/alpha/kernel/core_cia.c kernel-source-2.4.26-1/arch/alpha/kernel/core_cia.c
--- kernel-source-2.4.26/arch/alpha/kernel/core_cia.c 2003-08-25 21:44:39.000000000 +1000
+++ kernel-source-2.4.26-1/arch/alpha/kernel/core_cia.c 2003-09-03 20:26:49.000000000 +1000
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/019_cpqarray_init.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/019_cpqarray_init.diff 2004-09-05 03:11:21 UTC (rev 1552)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/019_cpqarray_init.diff 2004-09-05 03:51:45 UTC (rev 1553)
@@ -1,3 +1,9 @@
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: superseded by 085
+# description: superseded by 085
+# revision date: 2004-09-04
+
diff -urN kernel-source-2.4.26/drivers/block/cpqarray.c kernel-source-2.4.26-1/drivers/block/cpqarray.c
--- kernel-source-2.4.26/drivers/block/cpqarray.c 2004-02-19 00:36:31.000000000 +1100
+++ kernel-source-2.4.26-1/drivers/block/cpqarray.c 2004-02-22 20:28:13.000000000 +1100
Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/085_cpqarray_init-2.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/085_cpqarray_init-2.diff 2004-09-05 03:11:21 UTC (rev 1552)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/085_cpqarray_init-2.diff 2004-09-05 03:51:45 UTC (rev 1553)
@@ -0,0 +1,23 @@
+# origin: Debian (joshk)
+# cset: n/a
+# inclusion: not submitted
+# description: unregister cpqarray driver if ENODEV happens
+# revision date: 2004-09-04
+
+--- a/drivers/block/cpqarray.c 2004-09-04 19:47:42.000000000 -0700
++++ b/drivers/block/cpqarray.c 2004-09-04 19:48:32.000000000 -0700
+@@ -334,8 +334,12 @@
+ /* This is a bit of a hack... */
+ int __init init_cpqarray_module(void)
+ {
+- if (cpqarray_init() == 0) /* all the block dev numbers already used */
+- return -ENODEV; /* or no controllers were found */
++ if (cpqarray_init() == 0) /* all the block dev numbers already used
++ or no controllers were found */
++ {
++ pci_unregister_driver(&cpqarray_pci_driver);
++ return -ENODEV;
++ }
+ return 0;
+ }
+
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-6
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-6 2004-09-05 03:11:21 UTC (rev 1552)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-6 2004-09-05 03:51:45 UTC (rev 1553)
@@ -11,3 +11,5 @@
- 023_jbd_commit_interval.diff
- 059_ea_acl.diff
+ 084_ea_acl-2.diff
+- 019_cpqarray_init.diff
++ 085_cpqarray_init-2.diff