Merge tag 'v3.4' with SCSI updates, needed for subsequent firewire-sbp2 changes