]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
projects / thirdparty / kernel / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d102c6d 3b2f568)
Merge branch '6.13/scsi-fixes' into 6.14/scsi-staging
authorMartin K. Petersen <martin.petersen@oracle.com>
Fri, 10 Jan 2025 20:20:30 +0000 (15:20 -0500)
committerMartin K. Petersen <martin.petersen@oracle.com>
Fri, 10 Jan 2025 20:20:30 +0000 (15:20 -0500)
commit8bf10dfd7d0d8c0e6cdda176c461b3c5eba022ca
tree14bedfed6855016b4b8e7d4ba686ab68d1d59fdatree
parentd102c6d589c29c220fd11808381df11a4501647fcommit | diff
parent3b2f56860b05bf0cea86af786fd9b7faa8fe3ef3commit | diff
Merge branch '6.13/scsi-fixes' into 6.14/scsi-staging

Pull in fixes branch to resolve merge conflict in ufs-qcom.c.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
13 files changed:
drivers/message/fusion/mptfc.c diff1 | diff2 | blob | history
drivers/message/fusion/mptsas.c diff1 | diff2 | blob | history
drivers/message/fusion/mptspi.c diff1 | diff2 | blob | history
drivers/scsi/megaraid/megaraid_sas_base.c diff1 | diff2 | blob | history
drivers/scsi/mpi3mr/mpi3mr_os.c diff1 | diff2 | blob | history
drivers/scsi/mpt3sas/mpt3sas_base.c diff1 | diff2 | blob | history
drivers/scsi/qla2xxx/qla_attr.c diff1 | diff2 | blob | history
drivers/scsi/qla2xxx/qla_os.c diff1 | diff2 | blob | history
drivers/scsi/scsi_debug.c diff1 | diff2 | blob | history
drivers/scsi/storvsc_drv.c diff1 | diff2 | blob | history
drivers/ufs/core/ufshcd.c diff1 | diff2 | blob | history
drivers/ufs/host/ufs-qcom.c diff1 | diff2 | blob | history
include/ufs/ufshcd.h diff1 | diff2 | blob | history
A mirror of Linus' kernel repository