Re: linux-next: manual merge of the swiotlb tree with the powerpc tree

Stephen Rothwell writes: > Hi all, > > Today's linux-next merge of the swiotlb tree got a conflict in: > > kernel/dma/swiotlb.c > > between commit: > > feee96440c9c ("swiotlb: remove swiotlb_dma_supported") > > from the powerpc tree and commit: > > 71602fe6d4e9 ("swiotlb: add debugfs to trac

linux-next: manual merge of the swiotlb tree with the powerpc tree

Hi all, Today's linux-next merge of the swiotlb tree got a conflict in: kernel/dma/swiotlb.c 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 tre