Merge branch '5.19/scsi-fixes' into 5.20/scsi-staging
authorMartin K. Petersen <martin.petersen@oracle.com>
Thu, 7 Jul 2022 21:20:43 +0000 (17:20 -0400)
committerMartin K. Petersen <martin.petersen@oracle.com>
Thu, 7 Jul 2022 21:20:43 +0000 (17:20 -0400)
commit11e50ed239b5b7f383874dd737283ae93f62ece3
tree6f990dd80caf1efee86926541b30cad9e2003cef
parent88f1669019bd62b3009a3cebf772fbaaa21b9f38
parentfce54ed027577517df1e74b7d54dc2b1bd536887
Merge branch '5.19/scsi-fixes' into 5.20/scsi-staging

Bring in fixes to resolve a merge conflict in the lpfc driver update.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/mpt3sas/mpt3sas_base.c
drivers/scsi/scsi_transport_iscsi.c
drivers/scsi/sd.c
drivers/ufs/core/ufshcd.c