]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
Merge branch 6.18/scsi-fixes into 6.19/scsi-staging
authorMartin K. Petersen <martin.petersen@oracle.com>
Thu, 20 Nov 2025 03:59:25 +0000 (22:59 -0500)
committerMartin K. Petersen <martin.petersen@oracle.com>
Thu, 20 Nov 2025 03:59:25 +0000 (22:59 -0500)
commite54f7b4b8159d76d601788ca61267247fac67abf
tree27fd53e094b320bccf3cc38f80650126e0757544
parent13b77ed9c2a9e5a1248222df8aeaecb0c2ead9cb
parenta2b32bc1d9e359a9f90d0de6af16699facb10935
Merge branch 6.18/scsi-fixes into 6.19/scsi-staging

Pull in fixes branch to resolve UFS merge conflict.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/hosts.c
drivers/scsi/scsi_error.c
drivers/ufs/core/ufs-sysfs.c
drivers/ufs/core/ufshcd.c
drivers/ufs/host/ufs-qcom.c
include/scsi/scsi_device.h
include/ufs/ufshcd.h