Merge branch 'jejb-scsi' into misc