www.infradead.org Git - users/jedix/linux-maple.git/commit

]> www.infradead.org Git - users/jedix/linux-maple.git/commit

projects / users / jedix / linux-maple.git / commit

author	Martin K. Petersen <martin.petersen@oracle.com>
	Tue, 29 Apr 2025 00:56:57 +0000 (20:56 -0400)
committer	Martin K. Petersen <martin.petersen@oracle.com>
	Tue, 29 Apr 2025 00:56:57 +0000 (20:56 -0400)
commit	3c400df513b7c2ba9f2240eb9c325fa21aa8d950
tree	fcb623c43ea0c0538f8017a2be4d8a0805c2f081	tree
parent	37c15b72815b84815cd9700a42833ea11b11542e	commit \| diff
parent	b0b7ee3b574a72283399b9232f6190be07f220c0	commit \| diff

Merge branch '6.15/scsi-fixes' into 6.16/scsi-staging

Pull in fixes from 6.15 and resolve a few conflicts so we can have a
clean base for UFS patches.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

Documentation/ABI/testing/sysfs-driver-ufs	diff1 \|	diff2 \|	blob \| history
drivers/scsi/hisi_sas/hisi_sas_main.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c	diff1 \|	diff2 \|	blob \| history
drivers/ufs/core/ufs-sysfs.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/ufs.h	diff1 \|	diff2 \|	blob \| history
include/ufs/ufshcd.h	diff1 \|	diff2 \|	blob \| history