]> git.ipfire.org Git - thirdparty/linux.git/commit
Merge branch 7.0/scsi-fixes into 7.1/scsi-staging
authorMartin K. Petersen <martin.petersen@oracle.com>
Fri, 3 Apr 2026 00:31:22 +0000 (20:31 -0400)
committerMartin K. Petersen <martin.petersen@oracle.com>
Fri, 3 Apr 2026 00:31:22 +0000 (20:31 -0400)
commitfc0a1d05e494fd218a51e46f6664d1e14d4327ea
tree98f186bd9f690f15e1d7006a32473410e0c196ec
parent2dfb80cc3580dc02be83246bcd5446e6f3a231b9
parent01f784fc9d0ab2a6dac45ee443620e517cb2a19b
Merge branch 7.0/scsi-fixes into 7.1/scsi-staging

Pull in fixes to resolve mpi3mr merge conflict.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/hisi_sas/hisi_sas_main.c
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
drivers/scsi/lpfc/lpfc_init.c
drivers/scsi/lpfc/lpfc_sli.c
drivers/scsi/lpfc/lpfc_sli4.h
drivers/scsi/mpi3mr/mpi3mr_fw.c
drivers/scsi/scsi_scan.c
drivers/target/loopback/tcm_loop.c
drivers/target/target_core_configfs.c
drivers/ufs/core/ufshcd.c