]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commite5c335d9fe8f26bb6bd2a2fd09d007a33367652d
tree6f990dd80caf1efee86926541b30cad9e2003cef
parent806183f01cd224c168b23c4df7bf2c780d1cc892
parenta6196b10ad87f23752e63d17b585ad728c2ce10a
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