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

Hi all, Today's linux-next merge of the dma-mapping tree got a conflict in: arch/alpha/Kconfig between commit: 6630a8e50105 ("eisa: consolidate EISA Kconfig entry in drivers/eisa") from the kbuild tree and commit: 3731c3d4774e ("dma-mapping: always build the direct mapping code") from

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

Hi all, On Fri, 3 Aug 2018 08:08:56 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the dma-mapping tree got a conflict in: > > arch/nios2/Kconfig > > between commit: > > 17c46a6aff5c ("kconfig: remove duplicate SWAP symbol defintions") > > from the kbuild tree and commit:

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

Hi all, Today's linux-next merge of the dma-mapping tree got a conflict in: arch/nios2/Kconfig between commit: 17c46a6aff5c ("kconfig: remove duplicate SWAP symbol defintions") from the kbuild tree and commit: 25622e045a6a ("nios2: use generic dma_noncoherent_ops") from the dma-mapping