Mostly small stragglers that missed the initial merge. Driver updates are qla2xxx and smartpqi (mp3sas has a high diffstat due to the volatile qualifier removal, fnic due to unused function removal and sd.c has a lot of code shuffling to remove forward declarations). The patch is available here: git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-misc The short changelog is: Bart Van Assche (4): scsi: ufs: Fix the build for the old ARM OABI scsi: sd: Remove the number of forward declarations scsi: core: Report error list information in debugfs scsi: core: Improve type safety of scsi_rescan_device() Bean Huo (2): scsi: ufs: core: No need to update UPIU.header.flags and lun in advanced RPMB handler scsi: ufs: core: Add advanced RPMB support where UFSHCI 4.0 does not support EHS length in UTRD Bikash Hazarika (1): scsi: qla2xxx: Add logs for SFP temperature monitoring Colin Ian King (1): scsi: qla2xxx: Fix spelling mistake "tranport" -> "transport" David Strahan (3): scsi: smartpqi: Enhance controller offline notification scsi: smartpqi: Enhance shutdown notification scsi: smartpqi: Simplify lun_number assignment Don Brace (1): scsi: smartpqi: Change driver version to 2.1.24-046 John Meneghini (1): scsi: st: Add third party poweron reset handling Juergen Gross (1): scsi: xen-scsifront: shost_priv() can never return NULL Karan Tilak Kumar (1): scsi: fnic: Replace sgreset tag with max_tag_id Kevin Barnett (3): scsi: smartpqi: Rename pciinfo to pci_info scsi: smartpqi: Rename MACRO to clarify purpose scsi: smartpqi: Add abort handler Mahesh Rajashekhara (1): scsi: smartpqi: Enhance error messages Manish Rangankar (2): scsi: qla2xxx: Remove unsupported ql2xenabledif option scsi: qla2xxx: Add Unsolicited LS Request and Response Support for NVMe Nathan Chancellor (1): scsi: qla2xxx: Fix unused variable warning in qla2xxx_process_purls_pkt() Nilesh Javali (5): scsi: qla2xxx: Remove unused variables in qla24xx_build_scsi_type_6_iocbs() scsi: qla2xxx: Fix nvme_fc_rcv_ls_req() undefined error scsi: qla2xxx: Update version to 10.02.09.100-k Revert "scsi: qla2xxx: Fix buffer overrun" scsi: qla2xxx: Fix smatch warn for qla_init_iocb_limit() Quinn Tran (5): scsi: qla2xxx: Error code did not return to upper layer scsi: qla2xxx: Fix firmware resource tracking scsi: qla2xxx: Flush mailbox commands on chip reset scsi: qla2xxx: Allow 32-byte CDBs scsi: qla2xxx: Move resource to allow code reuse Ranjan Kumar (2): scsi: mpt3sas: Remove volatile qualifier scsi: mpt3sas: Perform additional retries if doorbell read returns 0 Wenchao Hao (1): scsi: libsas: Simplify sas_queue_reset() and remove unused code Yang Li (1): scsi: fnic: Remove unused functions fnic_scsi_host_start/end_tag() Yue Haibing (2): scsi: qedi: Remove unused declarations scsi: qedf: Remove unused declaration And the diffstat: drivers/ata/libata-scsi.c | 2 +- drivers/scsi/aacraid/commsup.c | 2 +- drivers/scsi/fnic/fnic.h | 3 +- drivers/scsi/fnic/fnic_scsi.c | 53 +---- drivers/scsi/libsas/sas_scsi_host.c | 41 +--- drivers/scsi/mpt3sas/mpi/mpi2.h | 2 +- drivers/scsi/mpt3sas/mpt3sas_base.c | 50 +++-- drivers/scsi/mpt3sas/mpt3sas_base.h | 3 +- drivers/scsi/mvumi.c | 2 +- drivers/scsi/qedf/qedf.h | 1 - drivers/scsi/qedi/qedi_gbl.h | 2 - drivers/scsi/qla2xxx/qla_attr.c | 2 - drivers/scsi/qla2xxx/qla_dbg.c | 7 +- drivers/scsi/qla2xxx/qla_dbg.h | 1 + drivers/scsi/qla2xxx/qla_def.h | 57 ++++- drivers/scsi/qla2xxx/qla_dfs.c | 10 + drivers/scsi/qla2xxx/qla_gbl.h | 14 +- drivers/scsi/qla2xxx/qla_init.c | 36 ++- drivers/scsi/qla2xxx/qla_inline.h | 57 ++++- drivers/scsi/qla2xxx/qla_iocb.c | 321 ++++++++++++++++++++++++--- drivers/scsi/qla2xxx/qla_isr.c | 164 +++++++++++++- drivers/scsi/qla2xxx/qla_mbx.c | 4 - drivers/scsi/qla2xxx/qla_nvme.c | 402 +++++++++++++++++++++++++++++++++- drivers/scsi/qla2xxx/qla_nvme.h | 17 +- drivers/scsi/qla2xxx/qla_nx.h | 4 +- drivers/scsi/qla2xxx/qla_os.c | 75 ++++--- drivers/scsi/qla2xxx/qla_version.h | 6 +- drivers/scsi/scsi_debugfs.c | 26 ++- drivers/scsi/scsi_lib.c | 2 +- drivers/scsi/scsi_priv.h | 1 - drivers/scsi/scsi_scan.c | 4 +- drivers/scsi/scsi_sysfs.c | 4 +- drivers/scsi/sd.c | 66 +++--- drivers/scsi/smartpqi/smartpqi.h | 16 +- drivers/scsi/smartpqi/smartpqi_init.c | 256 +++++++++++++++++----- drivers/scsi/st.c | 2 + drivers/scsi/storvsc_drv.c | 2 +- drivers/scsi/virtio_scsi.c | 2 +- drivers/scsi/xen-scsifront.c | 6 +- drivers/ufs/core/ufs_bsg.c | 3 +- drivers/ufs/core/ufshcd.c | 14 +- include/linux/nvme-fc-driver.h | 6 +- include/scsi/scsi_host.h | 2 +- include/uapi/scsi/scsi_bsg_ufs.h | 2 +- 44 files changed, 1433 insertions(+), 319 deletions(-) James