projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 605ae38 258aad7)
Merge branch '5.15/scsi-fixes' into 5.16/scsi-staging
authorMartin K. Petersen <martin.petersen@oracle.com>
Tue, 12 Oct 2021 15:58:12 +0000 (11:58 -0400)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 12 Oct 2021 15:58:12 +0000 (11:58 -0400)
commitec65e6beb02e09e34f3811dd85f7247da35edafc
treeecaa55e109261b04d00d81add853f1ba20838523tree | snapshot
parent605ae389ea0243344713648294cd86b442d255eecommit | diff
parent258aad75c62146453d03028a44f2f1590d58e1f6commit | diff
Merge branch '5.15/scsi-fixes' into 5.16/scsi-staging

Merge the 5.15/scsi-fixes branch into the staging tree to resolve UFS
conflict reported by sfr.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
16 files changed:
drivers/scsi/elx/efct/efct_lio.c diff1 | diff2 | blob | history
drivers/scsi/elx/efct/efct_scsi.c diff1 | diff2 | blob | history
drivers/scsi/elx/libefc/efc_fabric.c diff1 | diff2 | blob | history
drivers/scsi/libiscsi.c diff1 | diff2 | blob | history
drivers/scsi/lpfc/lpfc_els.c diff1 | diff2 | blob | history
drivers/scsi/lpfc/lpfc_hw4.h diff1 | diff2 | blob | history
drivers/scsi/lpfc/lpfc_init.c diff1 | diff2 | blob | history
drivers/scsi/lpfc/lpfc_nvme.c diff1 | diff2 | blob | history
drivers/scsi/lpfc/lpfc_scsi.c diff1 | diff2 | blob | history
drivers/scsi/lpfc/lpfc_sli.c diff1 | diff2 | blob | history
drivers/scsi/qla2xxx/qla_init.c diff1 | diff2 | blob | history
drivers/scsi/sd.c diff1 | diff2 | blob | history
drivers/scsi/ufs/ufshcd.c diff1 | diff2 | blob | history
drivers/scsi/ufs/ufshcd.h diff1 | diff2 | blob | history
drivers/scsi/ufs/ufshpb.c diff1 | diff2 | blob | history
drivers/target/target_core_configfs.c diff1 | diff2 | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git