Merge branch 'misc' into for-next

Conflicts:
	drivers/scsi/arcmsr/arcmsr_hba.c
	drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
	drivers/scsi/lpfc/lpfc_nvme.c
	drivers/scsi/qla2xxx/qla_init.c