Merge branch 'fixes' into for-next

author James Bottomley <James.Bottomley@HansenPartnership.com>

Fri, 26 Mar 2021 00:22:15 +0000 (17:22 -0700)

committer James Bottomley <James.Bottomley@HansenPartnership.com>

Fri, 26 Mar 2021 00:22:15 +0000 (17:22 -0700)
author James Bottomley <James.Bottomley@HansenPartnership.com>
Fri, 26 Mar 2021 00:22:15 +0000 (17:22 -0700)
committer James Bottomley <James.Bottomley@HansenPartnership.com>
Fri, 26 Mar 2021 00:22:15 +0000 (17:22 -0700)
diff --cc drivers/scsi/ibmvscsi/ibmvfc.c
Simple merge
diff --cc drivers/scsi/mpt3sas/mpt3sas_base.c
Simple merge
diff --cc drivers/scsi/qla2xxx/tcm_qla2xxx.c
Simple merge
diff --cc drivers/target/target_core_pscsi.c
Simple merge
author	James Bottomley <James.Bottomley@HansenPartnership.com>
	Fri, 26 Mar 2021 00:22:15 +0000 (17:22 -0700)
committer	James Bottomley <James.Bottomley@HansenPartnership.com>
	Fri, 26 Mar 2021 00:22:15 +0000 (17:22 -0700)
		1	2
drivers/scsi/ibmvscsi/ibmvfc.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/mpt3sas/mpt3sas_base.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla2xxx/tcm_qla2xxx.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/target/target_core_pscsi.c	patch \|	diff1 \|	diff2 \|	blob \| history