Merge branch '6.10/scsi-fixes' into 6.11/scsi-staging
authorMartin K. Petersen <martin.petersen@oracle.com>
Thu, 11 Jul 2024 02:23:30 +0000 (22:23 -0400)
committerMartin K. Petersen <martin.petersen@oracle.com>
Thu, 11 Jul 2024 02:23:30 +0000 (22:23 -0400)
commit5e9a522b0779fa67928b7726374e60461e8aa5c5
tree69d560c649c0768577590a3b27d21b6391269b63
parent6cd48c8f62ade6260ff9a13724e49b3854392fe4
parent7a6bbc2829d4ab592c7e440a6f6f5deb3cd95db4
Merge branch '6.10/scsi-fixes' into 6.11/scsi-staging

Pull in my fixes branch to resolve an mpi3mr merge conflict reported
by sfr.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/mpi3mr/mpi3mr_app.c
drivers/scsi/mpi3mr/mpi3mr_transport.c
drivers/ufs/core/ufs-mcq.c
drivers/ufs/core/ufshcd.c