Merge branch 'topic/dmatest' into for-linus