Re: linux-next: manual merge of the swiotlb tree with the powerpc tree
From: Michael Ellerman
Date: Thu Feb 21 2019 - 22:18:06 EST
Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> writes:
> Hi all,
> Today's linux-next merge of the swiotlb tree got a conflict in:
> between commit:
> feee96440c9c ("swiotlb: remove swiotlb_dma_supported")
> from the powerpc tree and commit:
> 71602fe6d4e9 ("swiotlb: add debugfs to track swiotlb buffer usage")
> from the swiotlb tree.
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
OK thanks. That looks pretty harmless as far as conflicts go.