Merge branch '6.3/scsi-fixes' into 6.4/scsi-staging
authorMartin K. Petersen <martin.petersen@oracle.com>
Sat, 1 Apr 2023 01:45:14 +0000 (21:45 -0400)
committerMartin K. Petersen <martin.petersen@oracle.com>
Sat, 1 Apr 2023 01:45:14 +0000 (21:45 -0400)
commitf467b865cf5b25aac3feee3fb5e25b90f5df35c4
treeee99dbe821c841c979152486537420f13286d3f4
parent882f4adac9a8411ba9993810132add18896b82c1
parentd684a7a26f7d2c7122a4581ac966ed64e88fb29c
Merge branch '6.3/scsi-fixes' into 6.4/scsi-staging

Pull in the fixes branch to resolve an mpi3mr conflict reported by
sfr.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
15 files changed:
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
drivers/scsi/hosts.c
drivers/scsi/lpfc/lpfc_init.c
drivers/scsi/lpfc/lpfc_sli.c
drivers/scsi/megaraid/megaraid_sas_base.c
drivers/scsi/mpi3mr/mpi3mr.h
drivers/scsi/mpi3mr/mpi3mr_app.c
drivers/scsi/mpi3mr/mpi3mr_fw.c
drivers/scsi/mpi3mr/mpi3mr_os.c
drivers/scsi/mpi3mr/mpi3mr_transport.c
drivers/scsi/mpt3sas/mpt3sas_base.c
drivers/scsi/qla2xxx/qla_gbl.h
drivers/scsi/qla2xxx/qla_os.c
drivers/ufs/core/ufshcd.c
drivers/ufs/host/ufs-qcom.c