[gentoo-commits] linux-patches r2481 - genpatches-2.6/trunk/3.10

[gentoo-commits] linux-patches r2481 - genpatches-2.6/trunk/3.10

[Tom Wijsman (tomwij)]

Author: tomwij
Date: 2013-08-15 23:52:23 +0000 (Thu, 15 Aug 2013)
New Revision: 2481

Removed:
   genpatches-2.6/trunk/3.10/2300_USB-mount-extd-inq-cmd-fix.patch
Modified:
   genpatches-2.6/trunk/3.10/0000_README
Log:
Removed 2300_USB-mount-extd-inq-cmd-fix.patch to avoid inconsistent behavior when trying to apply it twice, as it is already applied upstream in 0ac10bd036f0f3b8ce7ac2390446eab9531c72eb; thanks to Bertrand Jacquin (beber) to report this on the gentoo-kernel ML.

Modified: genpatches-2.6/trunk/3.10/0000_README
===================================================================
--- genpatches-2.6/trunk/3.10/0000_README	2013-08-15 21:54:59 UTC (rev 2480)
+++ genpatches-2.6/trunk/3.10/0000_README	2013-08-15 23:52:23 UTC (rev 2481)
@@ -91,10 +91,6 @@
 From:   http://algo.ing.unimo.it/people/paolo/disk_sched/
 Desc:   BFQ v6r2 patch 3 for 3.10: Early Queue Merge (EQM)
 
-Patch:  2300_USB-mount-extd-inq-cmd-fix.patch
-From:   https://bugs.gentoo.org/show_bug.cgi?id=478698
-Desc:   USB Mount fix: Don't attempt to send extended INQUIRY command if skip_vpd_pages is set
-
 Patch:  2400_kcopy-patch-for-infiniband-driver.patch
 From:   Alexey Shvetsov <alexxy@gentoo.org>
 Desc:   Zero copy for infiniband psm userspace driver

Deleted: genpatches-2.6/trunk/3.10/2300_USB-mount-extd-inq-cmd-fix.patch
===================================================================
--- genpatches-2.6/trunk/3.10/2300_USB-mount-extd-inq-cmd-fix.patch	2013-08-15 21:54:59 UTC (rev 2480)
+++ genpatches-2.6/trunk/3.10/2300_USB-mount-extd-inq-cmd-fix.patch	2013-08-15 23:52:23 UTC (rev 2481)
@@ -1,12 +0,0 @@
---- a/drivers/scsi/scsi.c	2013-08-06 11:06:38.358141689 -0400
-+++ b/drivers/scsi/scsi.c	2013-08-06 11:08:27.455094545 -0400
-@@ -1031,6 +1031,9 @@ int scsi_get_vpd_page(struct scsi_device
- {
- 	int i, result;
- 
-+	if (sdev->skip_vpd_pages)
-+		goto fail;
-+
- 	/* Ask for all the pages supported by this device */
- 	result = scsi_vpd_inquiry(sdev, buf, 0, buf_len);
- 	if (result)