remove .38 libata patch that shouldn't be there

diff --git a/queue-2.6.38/libata-use-maximum-write-same-length-to-report-discard-size.patch b/queue-2.6.38/libata-use-maximum-write-same-length-to-report-discard-size.patch
deleted file mode 100644 (file)
index 4749654..0000000
--- a/queue-2.6.38/libata-use-maximum-write-same-length-to-report-discard-size.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 5f4e206666f834340b69ddb43f86de3851c8675a Mon Sep 17 00:00:00 2001
-From: "Martin K. Petersen" <martin.petersen@oracle.com>
-Date: Tue, 17 May 2011 22:13:23 -0400
-Subject: libata: Use Maximum Write Same Length to report discard size
- limit
-
-From: "Martin K. Petersen" <martin.petersen@oracle.com>
-
-commit 5f4e206666f834340b69ddb43f86de3851c8675a upstream.
-
-Previously we used Maximum Unmap LBA Count in the Block Limits VPD to
-signal the maximum number of sectors we could handle in a single Write
-Same command.
-
-Starting with SBC3r26 the Block Limits VPD has an explicit limit on the
-number of blocks in a Write Same. This means we can stop abusing a field
-related to the Unmap command and let our SAT use the proper value in the
-VPD (Maximum Write Same Length).
-
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/ata/libata-scsi.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/ata/libata-scsi.c
-+++ b/drivers/ata/libata-scsi.c
-@@ -2127,7 +2127,7 @@ static unsigned int ata_scsiop_inq_b0(st
-        * with the unmap bit set.
-        */
-       if (ata_id_has_trim(args->id)) {
--              put_unaligned_be32(65535 * 512 / 8, &rbuf[20]);
-+              put_unaligned_be64(65535 * 512 / 8, &rbuf[36]);
-               put_unaligned_be32(1, &rbuf[28]);
-       }
- 

diff --git a/queue-2.6.38/series b/queue-2.6.38/series
index 4ee51c89724dd5273da9be6b124190c3bd8a0bd6..e041aa73a41eb952bddac657be3ff56849b6b4af 100644 (file)
--- a/queue-2.6.38/series
+++ b/queue-2.6.38/series
@@ -30,7 +30,6 @@ block-always-allocate-genhd-ev-if-check_events-is.patch
 mtd-mtdconcat-fix-nand-oob-write.patch
 mtd-return-badblockbits-back.patch
 x86-64-bit-fix-copy__user-checks-for-the.patch
-libata-use-maximum-write-same-length-to-report-discard-size.patch
 iwlwifi-fix-bugs-in-change_interface.patch
 nl80211-fix-set_key-regression-with-some-drivers.patch
 mac80211-fix-a-few-rcu-issues.patch