]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch '5.12/scsi-fixes' into 5.13/scsi-staging
authorMartin K. Petersen <martin.petersen@oracle.com>
Tue, 6 Apr 2021 02:57:29 +0000 (22:57 -0400)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 6 Apr 2021 02:57:29 +0000 (22:57 -0400)
commit02e02594a8db6550d507b7d8f85a5b92eabb28d6
tree3a35ea6f9a9aa43b82166afc1f329084dd55c729
parent95467cb85b98bc4b3db18d423e76baeeb41efe6a
parent3806973ec3636ed79def55732a6405b11929beea
Merge branch '5.12/scsi-fixes' into 5.13/scsi-staging

Pull 5.12/scsi-fixes into the 5.13 SCSI tree to provide a baseline for
some UFS changes that would otherwise cause conflicts during the
merge.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
12 files changed:
drivers/scsi/ibmvscsi/ibmvfc.c
drivers/scsi/lpfc/lpfc_debugfs.c
drivers/scsi/mpt3sas/mpt3sas_base.c
drivers/scsi/mpt3sas/mpt3sas_scsih.c
drivers/scsi/myrs.c
drivers/scsi/qedi/qedi_main.c
drivers/scsi/qla2xxx/qla_target.c
drivers/scsi/qla2xxx/tcm_qla2xxx.c
drivers/scsi/sd_zbc.c
drivers/scsi/ufs/ufs-qcom.c
drivers/scsi/ufs/ufshcd.c
drivers/target/target_core_pscsi.c