Merge branch 'misc' into for-next

diff --cc drivers/scsi/ibmvscsi/ibmvfc.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_debugfs.c
Simple merge

diff --cc drivers/scsi/mpt3sas/mpt3sas_base.c
Simple merge

diff --cc drivers/scsi/mpt3sas/mpt3sas_scsih.c
Simple merge

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

diff --cc drivers/scsi/qla2xxx/qla_target.c
Simple merge

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

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

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