OSDN Git Service

Merge branch '5.15/scsi-fixes' into 5.16/scsi-queue
authorMartin K. Petersen <martin.petersen@oracle.com>
Thu, 4 Nov 2021 01:46:00 +0000 (21:46 -0400)
committerMartin K. Petersen <martin.petersen@oracle.com>
Thu, 4 Nov 2021 01:46:00 +0000 (21:46 -0400)
commit6266f7df38e167a2386ee2747965c4816f32b449
treeff3d243efd8c374d2c9686de4a104da71218a952
parent5ae17501bc62a49b0b193dcce003f16375f16654
parent09d9e4d041876684d33f21d02bcdaea6586734f1
Merge branch '5.15/scsi-fixes' into 5.16/scsi-queue

The partial UFS revert in 5.15 is needed for some additional fixes in
the 5.16 SCSI tree. Merge the fixes branch.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
14 files changed:
drivers/scsi/hosts.c
drivers/scsi/ibmvscsi/ibmvfc.c
drivers/scsi/mpi3mr/mpi3mr_os.c
drivers/scsi/mpt3sas/mpt3sas_scsih.c
drivers/scsi/qla2xxx/qla_bsg.c
drivers/scsi/qla2xxx/qla_os.c
drivers/scsi/qla2xxx/qla_target.c
drivers/scsi/scsi.c
drivers/scsi/scsi_sysfs.c
drivers/scsi/sd.c
drivers/scsi/storvsc_drv.c
drivers/scsi/ufs/ufs-exynos.c
drivers/scsi/ufs/ufshcd.c
drivers/scsi/ufs/ufshpb.c