Merge branch '5.14/scsi-fixes' into 5.15/scsi-staging
authorMartin K. Petersen <martin.petersen@oracle.com>
Thu, 12 Aug 2021 02:37:22 +0000 (22:37 -0400)
committerMartin K. Petersen <martin.petersen@oracle.com>
Thu, 12 Aug 2021 02:37:22 +0000 (22:37 -0400)
commit315480209b8e1032e63c70dafc8f4133b3c9a333
treea99d5b3c2c1afb3d2ab47f77ecf4e933cd00715d
parent4cc0096e2d54bc31ead127be59e3a2d02a187ac9
parentf0f82e2476f6adb9c7a0135cfab8091456990c99
Merge branch '5.14/scsi-fixes' into 5.15/scsi-staging

Resolve mpt3sas conflict between 5.14/scsi-fixes and 5.15/scsi-staging
reported by sfr.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/ibmvscsi/ibmvfc.c
drivers/scsi/mpt3sas/mpt3sas_base.c
drivers/scsi/mpt3sas/mpt3sas_base.h
drivers/scsi/mpt3sas/mpt3sas_scsih.c
drivers/scsi/scsi_scan.c
drivers/scsi/scsi_sysfs.c
drivers/scsi/sr.c
drivers/target/target_core_transport.c