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

Pull in the fixes branch to resolve conflict in UFS core.

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