Merge remote-tracking branch 'bonzini/scsi.2' into staging