I've applied this to the dma-mapping for-next branch. I'd have liked a review from Robin, but as he seems to be out and the rework was to fit his comments I'd rather have us unblocked before the end of the merge window.