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>