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

Hi Stephen, On Thu, Sep 12, 2019 at 09:55:58PM +1000, Stephen Rothwell wrote: > Today's linux-next merge of the arm64 tree got a conflict in: > > arch/arm64/include/asm/dma-mapping.h > > between commit: > > 5489c8e0cf03 ("arm64: use asm-generic/dma-mapping.h") > > from the dma-mapping

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

Hi all, Today's linux-next merge of the arm64 tree got a conflict in: arch/arm64/include/asm/dma-mapping.h between commit: 5489c8e0cf03 ("arm64: use asm-generic/dma-mapping.h") from the dma-mapping tree and commit: b907b80d7ae7 ("arm64: remove pointless __KERNEL__ guards") from the