Merge branch 'topic/k3dma' into for-linus