Messages in this thread | | | Date | Fri, 3 Aug 2018 08:08:56 +1000 | From | Stephen Rothwell <> | Subject | 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 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.
-- Cheers, Stephen Rothwell
diff --cc arch/nios2/Kconfig index cbe1844b0657,92035042cf62..000000000000 --- a/arch/nios2/Kconfig +++ b/arch/nios2/Kconfig @@@ -1,7 -1,9 +1,10 @@@ # SPDX-License-Identifier: GPL-2.0 config NIOS2 def_bool y + select ARCH_NO_SWAP + select ARCH_HAS_SYNC_DMA_FOR_CPU + select ARCH_HAS_SYNC_DMA_FOR_DEVICE + select DMA_NONCOHERENT_OPS select TIMER_OF select GENERIC_ATOMIC64 select GENERIC_CLOCKEVENTS [unhandled content-type:application/pgp-signature] | |