Merge branch 'topic/virt-dma' into for-linus