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

Pull SCSI updates from James Bottomley:
 "The usual driver updates (ufs, qla2xxx, tcmu, ibmvfc, lpfc, smartpqi,
  hisi_sas, qedi, qedf, mpt3sas) and minor bug fixes.

  There are only three core changes: adding sense codes, cleaning up
  noretry and adding an option for limitless retries"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (226 commits)
  scsi: hisi_sas: Recover PHY state according to the status before reset
  scsi: hisi_sas: Filter out new PHY up events during suspend
  scsi: hisi_sas: Add device link between SCSI devices and hisi_hba
  scsi: hisi_sas: Add check for methods _PS0 and _PR0
  scsi: hisi_sas: Add controller runtime PM support for v3 hw
  scsi: hisi_sas: Switch to new framework to support suspend and resume
  scsi: hisi_sas: Use hisi_hba->cq_nvecs for calling calling synchronize_irq()
  scsi: qedf: Remove redundant assignment to variable 'rc'
  scsi: lpfc: Remove unneeded variable 'status' in lpfc_fcp_cpu_map_store()
  scsi: snic: Convert to use DEFINE_SEQ_ATTRIBUTE macro
  scsi: qla4xxx: Delete unneeded variable 'status' in qla4xxx_process_ddb_changed
  scsi: sun_esp: Use module_platform_driver to simplify the code
  scsi: sun3x_esp: Use module_platform_driver to simplify the code
  scsi: sni_53c710: Use module_platform_driver to simplify the code
  scsi: qlogicpti: Use module_platform_driver to simplify the code
  scsi: mac_esp: Use module_platform_driver to simplify the code
  scsi: jazz_esp: Use module_platform_driver to simplify the code
  scsi: mvumi: Fix error return in mvumi_io_attach()
  scsi: lpfc: Drop nodelist reference on error in lpfc_gen_req()
  scsi: be2iscsi: Fix a theoretical leak in beiscsi_create_eqs()
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/message/fusion/mptscsih.c
Simple merge

diff --cc drivers/scsi/aacraid/aachba.c
Simple merge

diff --cc drivers/scsi/aacraid/commsup.c
Simple merge

diff --cc drivers/scsi/aacraid/linit.c
Simple merge

diff --cc drivers/scsi/aic7xxx/aic79xx_core.c
Simple merge

diff --cc drivers/scsi/aic7xxx/aic79xx_osm.c
Simple merge

diff --cc drivers/scsi/aic7xxx/aic7xxx_core.c
Simple merge

diff --cc drivers/scsi/be2iscsi/be_main.c
Simple merge

diff --cc drivers/scsi/csiostor/csio_hw.c
Simple merge

diff --cc drivers/scsi/hisi_sas/hisi_sas.h
Simple merge

diff --cc drivers/scsi/hisi_sas/hisi_sas_main.c
Simple merge

diff --cc drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index b6f75a1764dff21f9c089c4ddac9add790313bea,dfabfb4f7ef3202a8e8eae163ab0d85eb30ced44..7133ca859b5e8217247c45882ef4484bb3871419
--- 1/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
--- 2/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@@ -3056,10 -3141,9 +3118,10 @@@ static struct scsi_host_template sht_v3
        .queuecommand           = sas_queuecommand,
        .dma_need_drain         = ata_scsi_dma_need_drain,
        .target_alloc           = sas_target_alloc,
-       .slave_configure        = hisi_sas_slave_configure,
+       .slave_configure        = slave_configure_v3_hw,
        .scan_finished          = hisi_sas_scan_finished,
        .scan_start             = hisi_sas_scan_start,
 +      .map_queues             = hisi_sas_map_queues,
        .change_queue_depth     = sas_change_queue_depth,
        .bios_param             = sas_bios_param,
        .this_id                = -1,

diff --cc drivers/scsi/hpsa.c
Simple merge

diff --cc drivers/scsi/ibmvscsi/ibmvfc.c
Simple merge

diff --cc drivers/scsi/isci/phy.c
Simple merge

diff --cc drivers/scsi/libsas/sas_ata.c
Simple merge

diff --cc drivers/scsi/libsas/sas_discover.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_ct.c
Simple merge

diff --cc drivers/scsi/megaraid.c
Simple merge

diff --cc drivers/scsi/megaraid/megaraid_sas_base.c
Simple merge

diff --cc drivers/scsi/mpt3sas/mpt3sas_base.c
Simple merge

diff --cc drivers/scsi/mpt3sas/mpt3sas_ctl.c
Simple merge

diff --cc drivers/scsi/mpt3sas/mpt3sas_scsih.c
Simple merge

diff --cc drivers/scsi/myrb.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_gs.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_init.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_iocb.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_isr.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_target.c
Simple merge

diff --cc drivers/scsi/qla4xxx/ql4_os.c
Simple merge

diff --cc drivers/scsi/qlogicpti.c
Simple merge

diff --cc drivers/scsi/scsi_debug.c
Simple merge

diff --cc drivers/scsi/scsi_error.c
Simple merge

diff --cc drivers/scsi/scsi_lib.c
Simple merge

diff --cc drivers/scsi/sd.c
Simple merge

diff --cc drivers/scsi/sd.h
Simple merge

diff --cc drivers/scsi/smartpqi/smartpqi_init.c
Simple merge

diff --cc drivers/scsi/sym53c8xx_2/sym_fw.c
Simple merge

diff --cc drivers/scsi/ufs/ufshcd.c
Simple merge

diff --cc drivers/scsi/virtio_scsi.c
Simple merge

diff --cc drivers/target/iscsi/iscsi_target.c
Simple merge