This series is all the stragglers that didn't quite make the first merge window pull. It's mostly minor updates and bug fixes of merge window code. The patch is available here: git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-misc The short changelog is: Ajish Koshy (1): scsi: pm80xx: Port reset timeout error handling correction Christophe JAILLET (7): scsi: efct: Remove useless DMA-32 fallback configuration scsi: message: fusion: mptctl: Use dma_alloc_coherent() scsi: message: fusion: mptsas: Use dma_alloc_coherent() scsi: message: fusion: Use dma_alloc_coherent() in mptsas_exp_repmanufacture_info() scsi: message: fusion: mptbase: Use dma_alloc_coherent() scsi: message: fusion: Use dma_alloc_coherent() in mpt_alloc_fw_memory() scsi: message: fusion: Remove usage of the deprecated "pci-dma-compat.h" API Colin Ian King (1): scsi: mpi3mr: Fix some spelling mistakes Damien Le Moal (1): scsi: core: Fix scsi_mode_select() interface Jiasheng Jiang (2): scsi: nsp_cs: Check of ioremap return value scsi: qedf: Fix potential dereference of NULL pointer Kees Cook (1): scsi: megaraid: Avoid mismatched storage type sizes Miaoqian Lin (1): scsi: ufs: ufs-mediatek: Fix error checking in ufs_mtk_init_va09_pwr_ctrl() Minghao Chi (1): scsi: aic79xx: Remove redundant error variable Randy Dunlap (1): scsi: aacraid: Fix spelling of "its" SEO HOYOUNG (1): scsi: ufs: Modify Tactive time setting conditions Suganath Prabu S (1): scsi: mpt3sas: Update persistent trigger pages from sysfs interface Xiang Chen (1): scsi: hisi_sas: Remove unused variable and check in hisi_sas_send_ata_reset_each_phy() Yang Li (1): scsi: mpi3mr: Fix formatting problems in some kernel-doc comments And the diffstat: drivers/message/fusion/mptbase.c | 149 +++++++++++++++++++--------------- drivers/message/fusion/mptctl.c | 82 +++++++++++-------- drivers/message/fusion/mptlan.c | 90 ++++++++++---------- drivers/message/fusion/mptsas.c | 94 ++++++++++----------- drivers/scsi/aacraid/aachba.c | 2 +- drivers/scsi/aic7xxx/aic79xx_osm.c | 6 +- drivers/scsi/elx/efct/efct_driver.c | 11 +-- drivers/scsi/hisi_sas/hisi_sas_main.c | 5 -- drivers/scsi/megaraid.c | 84 ++++++++----------- drivers/scsi/mpi3mr/mpi3mr_fw.c | 11 ++- drivers/scsi/mpt3sas/mpt3sas_base.h | 4 +- drivers/scsi/mpt3sas/mpt3sas_ctl.c | 87 +++++++++++++++++++- drivers/scsi/pcmcia/nsp_cs.c | 3 + drivers/scsi/pm8001/pm8001_sas.c | 7 +- drivers/scsi/pm8001/pm8001_sas.h | 3 + drivers/scsi/pm8001/pm80xx_hwi.c | 7 +- drivers/scsi/qedf/qedf_main.c | 2 + drivers/scsi/scsi_lib.c | 8 +- drivers/scsi/sd.c | 2 +- drivers/scsi/ufs/ufs-mediatek.c | 2 +- drivers/scsi/ufs/ufshcd.c | 2 +- include/scsi/scsi_device.h | 5 +- 22 files changed, 386 insertions(+), 280 deletions(-) James