This is a few driver updates (iscsi, mpt3sas) that were still in the staging queue when the merge window opened (all committed on or before 8 Feb) and some small bug fixes which came in during the merge window (all committed on 22 Feb). The patch is available here: git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-misc The short changelog of the bug fixes is: Aleksandr Miloserdov (2): scsi: target: core: Add cmd length set before cmd complete scsi: target: core: Prevent underflow for service actions Avri Altman (1): scsi: ufs: Fix a duplicate dev quirk number Bart Van Assche (1): scsi: sd: Fix Opal support Bhaskar Chowdhury (1): scsi: aic79xx: Fix spelling of version Bodo Stroesser (2): scsi: target: tcmu: Move some functions without code change scsi: target: tcmu: Fix memory leak caused by wrong uio usage Chen Lin (1): scsi: aic7xxx: Remove unused function pointer typedef ahc_bus_suspend/resume_t Don Brace (1): scsi: hpsa: Correct dev cmds outstanding for retried cmds Johannes Thumshirn (1): scsi: sd: sd_zbc: Don't pass GFP_NOIO to kvcalloc Randy Dunlap (1): scsi: bnx2fc: Fix Kconfig warning & CNIC build errors The short changelog of the staging updates is: Arnd Bergmann (1): scsi: pmcraid: Fix 'ioarcb' alignment warning Damien Le Moal (1): scsi: sd: Warn if unsupported ZBC device is probed DooHyun Hwang (1): scsi: ufs: Print the counter of each event history Jiapeng Chong (1): scsi: qla2xxx: Simplify if statement Mike Christie (9): scsi: iscsi: Drop session lock in iscsi_session_chkready() scsi: qla4xxx: Use iscsi_is_session_online() scsi: libiscsi: Reset max/exp cmdsn during recovery scsi: iscsi_tcp: Fix shost can_queue initialization scsi: libiscsi: Add helper to calculate max SCSI cmds per session scsi: libiscsi: Fix iSCSI host workq destruction scsi: libiscsi: Fix iscsi_task use after free() scsi: libiscsi: Drop taskqueuelock scsi: libiscsi: Fix iscsi_prep_scsi_cmd_pdu() error handling Sreekanth Reddy (2): scsi: mpt3sas: Add support for shared host tagset for CPU hotplug scsi: mpt3sas: Fix ReplyPostFree pool allocation Suganath Prabu S (2): scsi: mpt3sas: Update driver version to 37.100.00.00 scsi: mpt3sas: Additional diagnostic buffer query interface Yang Li (2): scsi: isci: Remove redundant initialization of variable 'status' scsi: target: sbp: Remove unneeded semicolon And the diffstat: drivers/scsi/aic7xxx/aic79xx.h | 2 +- drivers/scsi/aic7xxx/aic7xxx.h | 2 - drivers/scsi/bnx2fc/Kconfig | 1 + drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 - drivers/scsi/hpsa.c | 51 +++- drivers/scsi/hpsa_cmd.h | 2 +- drivers/scsi/isci/request.c | 8 +- drivers/scsi/iscsi_tcp.c | 9 +- drivers/scsi/libiscsi.c | 348 ++++++++++++++++++---------- drivers/scsi/libiscsi_tcp.c | 86 ++++--- drivers/scsi/mpt3sas/mpt3sas_base.c | 58 +++-- drivers/scsi/mpt3sas/mpt3sas_base.h | 52 ++++- drivers/scsi/mpt3sas/mpt3sas_ctl.c | 67 +++++- drivers/scsi/mpt3sas/mpt3sas_ctl.h | 22 ++ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 44 +++- drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c | 38 ++- drivers/scsi/pmcraid.h | 6 +- drivers/scsi/qla2xxx/qla_target.c | 3 +- drivers/scsi/qla4xxx/ql4_os.c | 2 +- drivers/scsi/scsi_transport_iscsi.c | 3 - drivers/scsi/sd.c | 14 +- drivers/scsi/sd_zbc.c | 6 +- drivers/scsi/ufs/ufshcd.c | 6 +- drivers/scsi/ufs/ufshcd.h | 2 +- drivers/target/sbp/sbp_target.c | 2 +- drivers/target/target_core_pr.c | 15 +- drivers/target/target_core_transport.c | 15 +- drivers/target/target_core_user.c | 189 ++++++++------- include/scsi/libiscsi.h | 6 +- include/target/target_core_backend.h | 1 + 30 files changed, 746 insertions(+), 316 deletions(-) James