This is actually just a small set of mainly bug fixes for the original merge window code plus a few trivial updates and qedi boot from SAN support feature patch. The patch is available here: git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes The short changelog is: Colin Ian King (4): scsi: hisi_sas: make several const arrays static scsi: qedf: fix spelling mistake: "offlading" -> "offloading" scsi: qedi: fix another spelling mistake: "alloction" -> "allocation" scsi: isci: fix typo in function names Dan Carpenter (3): scsi: libfc: pass an error pointer to fc_disc_error() scsi: qla2xxx: Off by one in qlt_ctio_to_cmd() scsi: cxlflash: return -EFAULT if copy_from_user() fails Johannes Thumshirn (1): scsi: sg: fix SG_DXFER_FROM_DEV transfers Nilesh Javali (1): scsi: qedi: Add support for Boot from SAN over iSCSI offload Paolo Bonzini (1): scsi: virtio_scsi: always read VPD pages for multiqueue too And the diffstat: drivers/scsi/cxlflash/main.c | 11 +- drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 10 +- drivers/scsi/isci/request.c | 14 +- drivers/scsi/libfc/fc_disc.c | 2 +- drivers/scsi/qedf/qedf_main.c | 2 +- drivers/scsi/qedi/qedi.h | 17 ++ drivers/scsi/qedi/qedi_fw.c | 2 +- drivers/scsi/qedi/qedi_main.c | 419 +++++++++++++++++++++++++++++++++ drivers/scsi/qedi/qedi_nvm_iscsi_cfg.h | 210 +++++++++++++++++ drivers/scsi/qla2xxx/qla_target.c | 2 +- drivers/scsi/sg.c | 5 +- drivers/scsi/virtio_scsi.c | 1 + 12 files changed, 674 insertions(+), 21 deletions(-) create mode 100644 drivers/scsi/qedi/qedi_nvm_iscsi_cfg.h James