Merge branch 'scsi-fixes' into merge-base