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

Pull SCSI updates from James Bottomley:
 "Updates to the usual drivers (qla2xxx, lpfc, ufs, hisi_sas, mpi3mr,
  mpt3sas, target). The biggest change (from my biased viewpoint) being
  that the mpi3mr now attached to the SAS transport class, making it the
  first fusion type device to do so.

  Beyond the usual bug fixing and security class reworks, there aren't a
  huge number of core changes"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (141 commits)
  scsi: iscsi: iscsi_tcp: Fix null-ptr-deref while calling getpeername()
  scsi: mpi3mr: Remove unnecessary cast
  scsi: stex: Properly zero out the passthrough command structure
  scsi: mpi3mr: Update driver version to 8.2.0.3.0
  scsi: mpi3mr: Fix scheduling while atomic type bug
  scsi: mpi3mr: Scan the devices during resume time
  scsi: mpi3mr: Free enclosure objects during driver unload
  scsi: mpi3mr: Handle 0xF003 Fault Code
  scsi: mpi3mr: Graceful handling of surprise removal of PCIe HBA
  scsi: mpi3mr: Schedule IRQ kthreads only on non-RT kernels
  scsi: mpi3mr: Support new power management framework
  scsi: mpi3mr: Update mpi3 header files
  scsi: mpt3sas: Revert "scsi: mpt3sas: Fix ioc->base_readl() use"
  scsi: mpt3sas: Revert "scsi: mpt3sas: Fix writel() use"
  scsi: wd33c93: Remove dead code related to the long-gone config WD33C93_PIO
  scsi: core: Add I/O timeout count for SCSI device
  scsi: qedf: Populate sysfs attributes for vport
  scsi: pm8001: Replace one-element array with flexible-array member
  scsi: 3w-xxxx: Replace one-element array with flexible-array member
  scsi: hptiop: Replace one-element array with flexible-array member in struct hpt_iop_request_ioctl_command()
  ...

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

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

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

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

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

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

diff --cc drivers/scsi/mpi3mr/mpi3mr_os.c
Simple merge

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

diff --cc drivers/scsi/qedf/qedf_main.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_os.c
index 87a9389,c437ac5..2c85f3c
--- 1/drivers/scsi/qla2xxx/qla_os.c
--- 2/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@@ -338,19 -347,9 +347,9 @@@ module_param(ql2xdelay_before_pci_error
  MODULE_PARM_DESC(ql2xdelay_before_pci_error_handling,
        "Number of seconds delayed before qla begin PCI error self-handling (default: 5).\n");
  
- int ql2xrspq_follow_inptr = 1;
- module_param(ql2xrspq_follow_inptr, int, 0644);
- MODULE_PARM_DESC(ql2xrspq_follow_inptr,
-                "Follow RSP IN pointer for RSP updates for HBAs 27xx and newer (default: 1).");
- 
- int ql2xrspq_follow_inptr_legacy = 1;
- module_param(ql2xrspq_follow_inptr_legacy, int, 0644);
- MODULE_PARM_DESC(ql2xrspq_follow_inptr_legacy,
-                "Follow RSP IN pointer for RSP updates for HBAs older than 27XX. (default: 1).");
- 
  static void qla2x00_clear_drv_active(struct qla_hw_data *);
  static void qla2x00_free_device(scsi_qla_host_t *);
 -static int qla2xxx_map_queues(struct Scsi_Host *shost);
 +static void qla2xxx_map_queues(struct Scsi_Host *shost);
  static void qla2x00_destroy_deferred_work(struct qla_hw_data *);
  
  u32 ql2xnvme_queues = DEF_NVME_HW_QUEUES;

diff --cc drivers/scsi/qla2xxx/qla_target.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/scsi_priv.h
Simple merge

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

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

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

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

diff --cc drivers/target/target_core_pscsi.c
Simple merge

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

diff --cc drivers/xen/xen-scsiback.c
Simple merge

diff --cc include/scsi/scsi_device.h
Simple merge