Merge branch '6.13/scsi-fixes' into 6.14/scsi-staging

Pull in fixes branch to resolve merge conflict in ufs-qcom.c.

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