one more patch added to the series

diff --git a/queue-2.6.20/series b/queue-2.6.20/series
index e44a4a501d5c95f83341b0412fc525cc4fd505a3..a9e78151fc6feaa11045dd4217254385828f7db0 100644 (file)
--- a/queue-2.6.20/series
+++ b/queue-2.6.20/series
@@ -28,3 +28,4 @@ libata-clear-tf-before-doing-request-sense.patch
 revert-retries-in-ext3_prepare_write-violate-ordering-requirements.patch
 revert-retries-in-ext4_prepare_write-violate-ordering-requirements.patch
 fix-page-leak-during-core-dump.patch
+update-libata-drive-blacklist-to-the-latest-from-2.6.21.patch

diff --git a/queue-2.6.20/update-libata-drive-blacklist-to-the-latest-from-2.6.21.patch b/queue-2.6.20/update-libata-drive-blacklist-to-the-latest-from-2.6.21.patch
new file mode 100644 (file)
index 0000000..a046091
--- /dev/null
+++ b/queue-2.6.20/update-libata-drive-blacklist-to-the-latest-from-2.6.21.patch
@@ -0,0 +1,50 @@
+From stable-bounces@linux.kernel.org  Wed Apr 11 15:40:57 2007
+From: Chuck Ebbert <cebbert@redhat.com>
+Date: Wed, 11 Apr 2007 15:33:54 -0400
+Subject: Update libata drive blacklist to the latest from 2.6.21
+To: linux-stable <stable@kernel.org>
+Message-ID: <461D3822.3020502@redhat.com>
+
+Update libata drive blacklist to the latest from 2.6.21
+
+Removes one duplicate entry from blacklist table, adds several
+entries for drives with broken NCQ.
+
+[diff between 2.6.20 and 2.6.21-rc6, with one entry removed
+ that required new libata features]
+
+Signed-off-by: Chuck Ebbert <cebbert@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/ata/libata-core.c |   12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+--- a/drivers/ata/libata-core.c
++++ b/drivers/ata/libata-core.c
+@@ -3316,7 +3316,6 @@ static const struct ata_blacklist_entry 
+       { "WPI CDD-820",        NULL,           ATA_HORKAGE_NODMA },
+       { "SAMSUNG CD-ROM SC-148C", NULL,       ATA_HORKAGE_NODMA },
+       { "SAMSUNG CD-ROM SC",  NULL,           ATA_HORKAGE_NODMA },
+-      { "SanDisk SDP3B-64",   NULL,           ATA_HORKAGE_NODMA },
+       { "ATAPI CD-ROM DRIVE 40X MAXIMUM",NULL,ATA_HORKAGE_NODMA },
+       { "_NEC DV5800A",       NULL,           ATA_HORKAGE_NODMA },
+       { "SAMSUNG CD-ROM SN-124","N001",       ATA_HORKAGE_NODMA },
+@@ -3326,6 +3325,17 @@ static const struct ata_blacklist_entry 
+       /* Devices where NCQ should be avoided */
+       /* NCQ is slow */
+         { "WDC WD740ADFD-00",   NULL,         ATA_HORKAGE_NONCQ },
++      /* http://thread.gmane.org/gmane.linux.ide/14907 */
++      { "FUJITSU MHT2060BH",  NULL,           ATA_HORKAGE_NONCQ },
++      /* NCQ is broken */
++      { "Maxtor 6L250S0",     "BANC1G10",     ATA_HORKAGE_NONCQ },
++      /* NCQ hard hangs device under heavier load, needs hard power cycle */
++      { "Maxtor 6B250S0",     "BANC1B70",     ATA_HORKAGE_NONCQ },
++      /* Blacklist entries taken from Silicon Image 3124/3132
++         Windows driver .inf file - also several Linux problem reports */
++      { "HTS541060G9SA00",    "MB3OC60D",     ATA_HORKAGE_NONCQ, },
++      { "HTS541080G9SA00",    "MB4OC60D",     ATA_HORKAGE_NONCQ, },
++      { "HTS541010G9SA00",    "MBZOC60D",     ATA_HORKAGE_NONCQ, },
+ 
+       /* Devices with NCQ limits */
+