drop scsi patch from 3.18

diff --git a/queue-3.18/scsi-aic94xx-fix-module-loading.patch b/queue-3.18/scsi-aic94xx-fix-module-loading.patch
deleted file mode 100644 (file)
index 7e4e081..0000000
--- a/queue-3.18/scsi-aic94xx-fix-module-loading.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 42caa0edabd6a0a392ec36a5f0943924e4954311 Mon Sep 17 00:00:00 2001
-From: James Bottomley <James.Bottomley@HansenPartnership.com>
-Date: Wed, 30 Jan 2019 16:42:12 -0800
-Subject: scsi: aic94xx: fix module loading
-
-From: James Bottomley <James.Bottomley@HansenPartnership.com>
-
-commit 42caa0edabd6a0a392ec36a5f0943924e4954311 upstream.
-
-The aic94xx driver is currently failing to load with errors like
-
-sysfs: cannot create duplicate filename '/devices/pci0000:00/0000:00:03.0/0000:02:00.3/0000:07:02.0/revision'
-
-Because the PCI code had recently added a file named 'revision' to every
-PCI device.  Fix this by renaming the aic94xx revision file to
-aic_revision.  This is safe to do for us because as far as I can tell,
-there's nothing in userspace relying on the current aic94xx revision file
-so it can be renamed without breaking anything.
-
-Fixes: 702ed3be1b1b (PCI: Create revision file in sysfs)
-Cc: stable@vger.kernel.org
-Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/scsi/aic94xx/aic94xx_init.c |    8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/drivers/scsi/aic94xx/aic94xx_init.c
-+++ b/drivers/scsi/aic94xx/aic94xx_init.c
-@@ -294,7 +294,7 @@ static ssize_t asd_show_dev_rev(struct d
-       return snprintf(buf, PAGE_SIZE, "%s\n",
-                       asd_dev_rev[asd_ha->revision_id]);
- }
--static DEVICE_ATTR(revision, S_IRUGO, asd_show_dev_rev, NULL);
-+static DEVICE_ATTR(aic_revision, S_IRUGO, asd_show_dev_rev, NULL);
- 
- static ssize_t asd_show_dev_bios_build(struct device *dev,
-                                      struct device_attribute *attr,char *buf)
-@@ -491,7 +491,7 @@ static int asd_create_dev_attrs(struct a
- {
-       int err;
- 
--      err = device_create_file(&asd_ha->pcidev->dev, &dev_attr_revision);
-+      err = device_create_file(&asd_ha->pcidev->dev, &dev_attr_aic_revision);
-       if (err)
-               return err;
- 
-@@ -513,13 +513,13 @@ err_update_bios:
- err_biosb:
-       device_remove_file(&asd_ha->pcidev->dev, &dev_attr_bios_build);
- err_rev:
--      device_remove_file(&asd_ha->pcidev->dev, &dev_attr_revision);
-+      device_remove_file(&asd_ha->pcidev->dev, &dev_attr_aic_revision);
-       return err;
- }
- 
- static void asd_remove_dev_attrs(struct asd_ha_struct *asd_ha)
- {
--      device_remove_file(&asd_ha->pcidev->dev, &dev_attr_revision);
-+      device_remove_file(&asd_ha->pcidev->dev, &dev_attr_aic_revision);
-       device_remove_file(&asd_ha->pcidev->dev, &dev_attr_bios_build);
-       device_remove_file(&asd_ha->pcidev->dev, &dev_attr_pcba_sn);
-       device_remove_file(&asd_ha->pcidev->dev, &dev_attr_update_bios);

diff --git a/queue-3.18/series b/queue-3.18/series
index 966376e9471216119a7772762e70b119d430b188..66c4232dd97558ff86a429a7ee6f1779f7cf9022 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -66,7 +66,6 @@ fuse-handle-zero-sized-retrieve-correctly.patch
 dmaengine-imx-dma-fix-wrong-callback-invoke.patch
 usb-phy-am335x-fix-race-condition-in-_probe.patch
 usb-gadget-udc-net2272-fix-bitwise-and-boolean-operations.patch
-scsi-aic94xx-fix-module-loading.patch
 kvm-x86-work-around-leak-of-uninitialized-stack-contents-cve-2019-7222.patch
 kvm-nvmx-unconditionally-cancel-preemption-timer-in-free_nested-cve-2019-7221.patch
 perf-x86-intel-uncore-add-node-id-mask.patch