r1689 - in trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian: . patches patches/series

[Joshua Kwan]

Author: joshk
Date: 2004-10-19 20:15:41 -0600 (Tue, 19 Oct 2004)
New Revision: 1689

Added:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/091_disambiguate_sym53c8xx.diff
Removed:
   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/series/2.4.27-6
Log:
add 091_disambiguate_sym53c8xx to help initrds
nuke 085_cpqarray_init-2.diff, it was wrong


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-10-19 21:54:10 UTC (rev 1688)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2004-10-20 02:15:41 UTC (rev 1689)
@@ -13,7 +13,7 @@
     (closes: #272719) (Simon Horman)
     . net/key/af_key.c
 
- -- Simon Horman <horms@debian.org>  Mon, 18 Oct 2004 18:50:46 +0900
+ -- Joshua Kwan <joshk@triplehelix.org>  Tue, 19 Oct 2004 19:14:40 -0700
 
 kernel-source-2.4.27 (2.4.27-5) unstable; urgency=high
 

Deleted: 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-10-19 21:54:10 UTC (rev 1688)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/085_cpqarray_init-2.diff	2004-10-20 02:15:41 UTC (rev 1689)
@@ -1,23 +0,0 @@
-# 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;
- }
- 

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/091_disambiguate_sym53c8xx.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/091_disambiguate_sym53c8xx.diff	2004-10-19 21:54:10 UTC (rev 1688)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/091_disambiguate_sym53c8xx.diff	2004-10-20 02:15:41 UTC (rev 1689)
@@ -0,0 +1,17 @@
+# origin: Debian (joshk)
+# cset: n/a
+# inclusion: submitted upstream (2004-10-02)
+# description: change sym53c8xx_2's proc_name to sym53c8xx_2 to fix initrds
+# revision date: 2004-10-02
+
+--- kernel-source-2.4.27-2.4.27/drivers/scsi/sym53c8xx_2/sym_glue.c~	2004-10-02 17:35:22.000000000 -0700
++++ kernel-source-2.4.27-2.4.27/drivers/scsi/sym53c8xx_2/sym_glue.c	2004-10-02 17:35:38.000000000 -0700
+@@ -55,7 +55,7 @@
+ #include "sym_glue.h"
+ 
+ #define NAME53C		"sym53c"
+-#define NAME53C8XX	"sym53c8xx"
++#define NAME53C8XX	"sym53c8xx_2"
+ 
+ /*
+  *  Simple Wrapper to kernel PCI bus interface.

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-10-19 21:54:10 UTC (rev 1688)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-6	2004-10-20 02:15:41 UTC (rev 1689)
@@ -11,12 +11,11 @@
 - 023_jbd_commit_interval.diff
 - 059_ea_acl.diff
 + 084_ea_acl-2.diff 
-- 019_cpqarray_init.diff
-+ 085_cpqarray_init-2.diff
 - 003_kbuild_fixes.diff
 + 086_ver_linux_ld.diff
 + 087_mkdep_xargs.diff
 + 088_dont_use_infobox.diff
 + 089_alpha_include_ptrace.diff
 + 090_setkey_spddelete.diff
++ 091_disambiguate_sym53c8xx.diff
 + 092_sparc64_hme_lockup.diff