Hi all, Today's linux-next merge of the akpm-current tree got a conflict in:
arch/hexagon/Kconfig between commit: e0a9317d9004 ("hexagon: use generic dma_noncoherent_ops") from the dma-mapping tree and commit: 365c1f4922a4 ("hexagon: switch to NO_BOOTMEM") from the akpm-current 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/hexagon/Kconfig index 6cee842a9b44,f7934998913a..000000000000 --- a/arch/hexagon/Kconfig +++ b/arch/hexagon/Kconfig @@@ -30,7 -29,9 +30,10 @@@ config HEXAGO select GENERIC_CLOCKEVENTS_BROADCAST select MODULES_USE_ELF_RELA select GENERIC_CPU_DEVICES + select DMA_NONCOHERENT_OPS + select HAVE_MEMBLOCK + select ARCH_DISCARD_MEMBLOCK + select NO_BOOTMEM ---help--- Qualcomm Hexagon is a processor architecture designed for high performance and low power across a wide variety of applications.
pgppr7_m2I4eD.pgp
Description: OpenPGP digital signature