Merge branch '5.19/scsi-fixes' into 5.20/scsi-staging

Bring in fixes to resolve a merge conflict in the lpfc driver update.

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

diff --cc drivers/scsi/mpt3sas/mpt3sas_base.c
Simple merge

diff --cc drivers/scsi/scsi_transport_iscsi.c
Simple merge

diff --cc drivers/scsi/sd.c
Simple merge

diff --cc drivers/ufs/core/ufshcd.c
Simple merge