Merge remote-tracking branch 'scsi-mkp/for-next'

diff --cc drivers/infiniband/ulp/srp/ib_srp.c
Simple merge

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

diff --cc drivers/scsi/ufs/ufs-mediatek.c
Simple merge

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

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

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