Re: linux-next: manual merge of the sparc-next tree with the dma-mapping tree

[Christoph Hellwig]

On Wed, Dec 12, 2018 at 08:44:20AM +0100, Christoph Hellwig wrote:
> Dave, Sam:
> 
> should I just apply a version of Rob's tree that takes the refactoring
> into account to the dma-mapping tree?  That way we should get the right
> result independent of the merge order.

E.g. something like the patch below:

--