]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 826d94a cb7e509)
Merge branch '6.12/scsi-fixes' into 6.13/scsi-staging
authorMartin K. Petersen <martin.petersen@oracle.com>
Thu, 7 Nov 2024 01:37:45 +0000 (20:37 -0500)
committerMartin K. Petersen <martin.petersen@oracle.com>
Thu, 7 Nov 2024 01:37:45 +0000 (20:37 -0500)
commit4b3b5815bcf3312539be569c2ffe702aa1f42153
tree0f4b64ea36dda154b7c6453dd71c43d854b3ed39tree
parent826d94a71597338e379076800f4d1ee81c5f3856commit | diff
parentcb7e509c4e0197f63717fee54fb41c4990ba8d3acommit | diff
Merge branch '6.12/scsi-fixes' into 6.13/scsi-staging

Pull in 6.12 fixes branch to resolve a merge conflict in ufs-mcq.c.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/ufs/core/ufs-mcq.c diff1 | diff2 | blob | history
drivers/ufs/core/ufshcd.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.