Merge branch 'scsi-fixes'