[SCSI] Merge branch 'linus'