Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull first round of SCSI updates from James Bottomley:
 "This is a large set of updates, mostly for drivers (qla2xxx [including
  support for new 83xx based card], qla4xxx, mpt2sas, bfa, zfcp, hpsa,
  be2iscsi, isci, lpfc, ipr, ibmvfc, ibmvscsi, megaraid_sas).

  There's also a rework for tape adding virtually unlimited numbers of
  tape drives plus a set of dif fixes for sd and a fix for a live lock
  on hot remove of SCSI devices.

  This round includes a signed tag pull of isci-for-3.6

  Signed-off-by: James Bottomley <JBottomley@Parallels.com>"

Fix up trivial conflict in drivers/scsi/qla2xxx/qla_nx.c due to new PCI
helper function use in a function that was removed by this pull.

* tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (198 commits)
  [SCSI] st: remove st_mutex
  [SCSI] sd: Ensure we correctly disable devices with unknown protection type
  [SCSI] hpsa: gen8plus Smart Array IDs
  [SCSI] qla4xxx: Update driver version to 5.03.00-k1
  [SCSI] qla4xxx: Disable generating pause frames for ISP83XX
  [SCSI] qla4xxx: Fix double clearing of risc_intr for ISP83XX
  [SCSI] qla4xxx: IDC implementation for Loopback
  [SCSI] qla4xxx: update copyrights in LICENSE.qla4xxx
  [SCSI] qla4xxx: Fix panic while rmmod
  [SCSI] qla4xxx: Fail probe_adapter if IRQ allocation fails
  [SCSI] qla4xxx: Prevent MSI/MSI-X falling back to INTx for ISP82XX
  [SCSI] qla4xxx: Update idc reg in case of PCI AER
  [SCSI] qla4xxx: Fix double IDC locking in qla4_8xxx_error_recovery
  [SCSI] qla4xxx: Clear interrupt while unloading driver for ISP83XX
  [SCSI] qla4xxx: Print correct IDC version
  [SCSI] qla4xxx: Added new mbox cmd to pass driver version to FW
  [SCSI] scsi_dh_alua: Enable STPG for unavailable ports
  [SCSI] scsi_remove_target: fix softlockup regression on hot remove
  [SCSI] ibmvscsi: Fix host config length field overflow
  [SCSI] ibmvscsi: Remove backend abstraction
  ...

1 files changed, 8 insertions, 18 deletions

diff --git a/drivers/scsi/device_handler/scsi_dh_rdac.c b/drivers/scsi/device_handler/scsi_dh_rdac.c
index 20c4557f5abd..69c915aa77c2 100644
--- a/drivers/scsi/device_handler/scsi_dh_rdac.c
+++ b/drivers/scsi/device_handler/scsi_dh_rdac.c
@@ -790,29 +790,19 @@ static const struct scsi_dh_devlist rdac_dev_list[] = {
         {"IBM", "1815"},
         {"IBM", "1818"},
         {"IBM", "3526"},
-        {"SGI", "TP9400"},
-        {"SGI", "TP9500"},
-        {"SGI", "TP9700"},
+        {"SGI", "TP9"},
         {"SGI", "IS"},
         {"STK", "OPENstorage D280"},
-        {"SUN", "CSM200_R"},
-        {"SUN", "LCSM100_I"},
-        {"SUN", "LCSM100_S"},
-        {"SUN", "LCSM100_E"},
-        {"SUN", "LCSM100_F"},
-        {"DELL", "MD3000"},
-        {"DELL", "MD3000i"},
-        {"DELL", "MD32xx"},
-        {"DELL", "MD32xxi"},
-        {"DELL", "MD36xxi"},
-        {"DELL", "MD36xxf"},
-        {"LSI", "INF-01-00"},
-        {"ENGENIO", "INF-01-00"},
         {"STK", "FLEXLINE 380"},
-        {"SUN", "CSM100_R_FC"},
+        {"SUN", "CSM"},
+        {"SUN", "LCSM100"},
         {"SUN", "STK6580_6780"},
         {"SUN", "SUN_6180"},
         {"SUN", "ArrayStorage"},
+        {"DELL", "MD3"},
+        {"NETAPP", "INF-01-00"},
+        {"LSI", "INF-01-00"},
+        {"ENGENIO", "INF-01-00"},
         {NULL, NULL},
 };
 
@@ -863,7 +853,7 @@ static int rdac_bus_attach(struct scsi_device *sdev)
         if (!scsi_dh_data) {
                 sdev_printk(KERN_ERR, sdev, "%s: Attach failed\n",
                             RDAC_NAME);
-                return 0;
+                return -ENOMEM;
         }
 
         scsi_dh_data->scsi_dh = &rdac_dh;