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

Pull SCSI updates from James Bottomley:
 "This update includes the usual round of major driver updates (hpsa,
  be2iscsi, hisi_sas, zfcp, cxlflash). There's a new incarnation of hpsa
  called smartpqi for which a driver is added, there's some cleanup work
  of the ibm vscsi target and updates to libfc, plus a whole host of
  minor fixes and updates and finally the removal of several ISA drivers
  which seem not to have been used for years"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (173 commits)
  scsi: mvsas: Mark symbols static where possible
  scsi: pm8001: Mark symbols static where possible
  scsi: arcmsr: Simplify user_len checking
  scsi: fcoe: fix off by one in eth2fc_speed()
  scsi: dtc: remove from tree
  scsi: t128: remove from tree
  scsi: pas16: remove from tree
  scsi: u14-34f: remove from tree
  scsi: ultrastor: remove from tree
  scsi: in2000: remove from tree
  scsi: wd7000: remove from tree
  scsi: scsi_dh_alua: Fix memory leak in alua_rtpg()
  scsi: lpfc: Mark symbols static where possible
  scsi: hpsa: correct call to hpsa_do_reset
  scsi: ufs: Get a TM service response from the correct offset
  scsi: ibmvfc: Fix I/O hang when port is not mapped
  scsi: megaraid_sas: clean function declarations in megaraid_sas_base.c up
  scsi: ipr: Remove redundant messages at adapter init time
  scsi: ipr: Don't log unnecessary 9084 error details
  scsi: smartpqi: raid bypass lba calculation fix
  ...

1 files changed, 17 insertions, 21 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 58c520517107..b9a0d48989ab 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7973,6 +7973,18 @@ W:	http://www.melexis.com
 S:      Supported
 F:      drivers/iio/temperature/mlx90614.c
 
+MICROSEMI SMART ARRAY SMARTPQI DRIVER (smartpqi)
+M:      Don Brace <don.brace@microsemi.com>
+L:      esc.storagedev@microsemi.com
+L:      linux-scsi@vger.kernel.org
+S:      Supported
+F:      drivers/scsi/smartpqi/smartpqi*.[ch]
+F:      drivers/scsi/smartpqi/Kconfig
+F:      drivers/scsi/smartpqi/Makefile
+F:      include/linux/cciss*.h
+F:      include/uapi/linux/cciss*.h
+F:      Documentation/scsi/smartpqi.txt
+
 MN88472 MEDIA DRIVER
 M:      Antti Palosaari <crope@iki.fi>
 L:      linux-media@vger.kernel.org
@@ -8185,20 +8197,16 @@ M:	Michael Schmitz <schmitzmic@gmail.com>
 L:      linux-scsi@vger.kernel.org
 S:      Maintained
 F:      Documentation/scsi/g_NCR5380.txt
-F:      Documentation/scsi/dtc3x80.txt
 F:      drivers/scsi/NCR5380.*
 F:      drivers/scsi/arm/cumana_1.c
 F:      drivers/scsi/arm/oak.c
 F:      drivers/scsi/atari_scsi.*
 F:      drivers/scsi/dmx3191d.c
-F:      drivers/scsi/dtc.*
 F:      drivers/scsi/g_NCR5380.*
 F:      drivers/scsi/g_NCR5380_mmio.c
 F:      drivers/scsi/mac_scsi.*
-F:      drivers/scsi/pas16.*
 F:      drivers/scsi/sun3_scsi.*
 F:      drivers/scsi/sun3_scsi_vme.c
-F:      drivers/scsi/t128.*
 
 NCR DUAL 700 SCSI DRIVER (MICROCHANNEL)
 M:      "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
@@ -10740,12 +10748,12 @@ S:	Maintained
 F:      drivers/misc/phantom.c
 F:      include/uapi/linux/phantom.h
 
-SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER
-M:      Jayamohan Kallickal <jayamohan.kallickal@avagotech.com>
-M:      Ketan Mukadam <ketan.mukadam@avagotech.com>
-M:      John Soni Jose <sony.john@avagotech.com>
+Emulex 10Gbps iSCSI - OneConnect DRIVER
+M:      Subbu Seetharaman <subbu.seetharaman@broadcom.com>
+M:      Ketan Mukadam <ketan.mukadam@broadcom.com>
+M:      Jitendra Bhivare <jitendra.bhivare@broadcom.com>
 L:      linux-scsi@vger.kernel.org
-W:      http://www.avagotech.com
+W:      http://www.broadcom.com
 S:      Supported
 F:      drivers/scsi/be2iscsi/
 
@@ -12143,12 +12151,6 @@ S:	Maintained
 F:      drivers/tc/
 F:      include/linux/tc.h
 
-U14-34F SCSI DRIVER
-M:      Dario Ballabio <ballabio_dario@emc.com>
-L:      linux-scsi@vger.kernel.org
-S:      Maintained
-F:      drivers/scsi/u14-34f.c
-
 UBI FILE SYSTEM (UBIFS)
 M:      Richard Weinberger <richard@nod.at>
 M:      Artem Bityutskiy <dedekind1@gmail.com>
@@ -12876,12 +12878,6 @@ F:	drivers/watchdog/
 F:      include/linux/watchdog.h
 F:      include/uapi/linux/watchdog.h
 
-WD7000 SCSI DRIVER
-M:      Miroslav Zagorac <zaga@fly.cc.fer.hr>
-L:      linux-scsi@vger.kernel.org
-S:      Maintained
-F:      drivers/scsi/wd7000.c
-
 WIIMOTE HID DRIVER
 M:      David Herrmann <dh.herrmann@googlemail.com>
 L:      linux-input@vger.kernel.org