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)
commit556666bce111b2a758010c2a2a6bab7f3770f4de
tree3a35ea6f9a9aa43b82166afc1f329084dd55c729
parent4e2e619f3c9e3c49859f085995554a53e9fc0e02
parent9e67600ed6b8565da4b85698ec659b5879a6c1c6
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