r2192 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches patches/series

[Christoph Hellwig]

Author: hch-guest
Date: 2005-01-08 13:37:59 +0100 (Sat, 08 Jan 2005)
New Revision: 2192

Added:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/scsi-blacklist-2.dpatch
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-13
Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
Log:

  * add more USB card reader blacklist entries.  Patch from Fedora via
    Otavio Salvador <otavio@debian.org>. (Christoph Hellwig) (closes: #289247)



Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2005-01-08 12:30:00 UTC (rev 2191)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2005-01-08 12:37:59 UTC (rev 2192)
@@ -1,3 +1,10 @@
+kernel-source-2.6.8 (2.6.8-13) UNRELEASED; urgency=high
+
+  * add more USB card reader blacklist entries.  Patch from Fedora via
+    Otavio Salvador <otavio@debian.org>. (Christoph Hellwig) (closes: #289247)
+ 
+ -- Christoph Hellwig <hch@lst.de>  Sat, 08 Jan 2005 13:38:12 +0100
+
 kernel-source-2.6.8 (2.6.8-12) unstable; urgency=high
 
   * [powerpc - prep] Fix bad irq assignement for pci devices on motorola

Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/scsi-blacklist-2.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/scsi-blacklist-2.dpatch	2005-01-08 12:30:00 UTC (rev 2191)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/scsi-blacklist-2.dpatch	2005-01-08 12:37:59 UTC (rev 2192)
@@ -0,0 +1,43 @@
+#! /bin/sh -e 
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: update scsi blacklist for USB multi card readers (again)
+## DP: Patch author: unknown (from Fedora) via Otavio Salvador <otavio@debian.org>
+## DP: Upstream status: unknown
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+--- kernel-source-2.6.8-orig/drivers/scsi/scsi_devinfo.c	2005-01-06 23:56:57.000000000 -0200
++++ kernel-source-2.6.8/drivers/scsi/scsi_devinfo.c	2005-01-07 00:07:23.000000000 -0200
+@@ -184,7 +184,6 @@
+ 	{"XYRATEX", "RS", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
+ 	{"Zzyzx", "RocketStor 500S", NULL, BLIST_SPARSELUN},
+ 	{"Zzyzx", "RocketStor 2000", NULL, BLIST_SPARSELUN},
+-	{ NULL, NULL, NULL, 0 },
+ 
+ 	/*
+ 	 * USB multi card readers. Only these should use BLIST_FORCELUN.
+@@ -196,16 +195,21 @@
+ 	{"Generic", "USB Storage-SMC", "0090", BLIST_FORCELUN},
+ 	{"Generic", "USB Storage-SMC", "0180", BLIST_FORCELUN},
+ 	{"Generic", "USB Storage-SMC", "0207", BLIST_FORCELUN},
++	{"IC", "USB Storage-CFC", "322E", BLIST_FORCELUN},
+ 	{"ICSI", "SD Card", "2.7C", BLIST_FORCELUN},
+ 	{"IOI", "Media Bay", "*", BLIST_FORCELUN},
+ 	{"Lexar", "Media Inc. SM/xD", "009E", BLIST_FORCELUN},
+ 	{"Medion", "Flash XL  MMC/SD", "2.6D", BLIST_FORCELUN},
++	{"OEI-USB2", "CompactFlash", "2.00", BLIST_FORCELUN},
+ 	{"SanDisk", "ImageMate CF-SD1", NULL, BLIST_FORCELUN},
+ 	{"SMSC", "223 U HS-CF", "1.95", BLIST_FORCELUN},
+ 	{"SMSC", "USB 2 HS-CF", NULL, BLIST_FORCELUN},
+ 	{"TwinMOS", "7-in-1 Card RWCF", "0100", BLIST_FORCELUN},
+ 	{"USB2.0", "SMARTMEDIA/XD", NULL, BLIST_FORCELUN},
+ 	{"Y-E DATA", "CF Card Reader", "1.03", BLIST_FORCELUN},
++	{"Zynet", "USB Storage-SMC", "I03A", BLIST_FORCELUN},
++
++	{ NULL, NULL, NULL, 0 },
+ };
+ 
+ /*

Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-13
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-13	2005-01-08 12:30:00 UTC (rev 2191)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-13	2005-01-08 12:37:59 UTC (rev 2192)
@@ -0,0 +1 @@
++ scsi-blacklist-2.dpatch