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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:

  arch/arm/Kconfig

between commit:

  936376f88ff1 ("arm: select the dma-noncoherent symbols for all swiotlb builds")

from the dma-mapping tree and commit:

  83286f0dcb91 ("arm: use generic mmap top-down layout and brk randomization")

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/arm/Kconfig
index dcf46f0e45c2,81b08b027e4e..000000000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -7,9 -7,6 +7,8 @@@ config AR
  	select ARCH_HAS_BINFMT_FLAT
  	select ARCH_HAS_DEBUG_VIRTUAL if MMU
  	select ARCH_HAS_DEVMEM_IS_ALLOWED
 +	select ARCH_HAS_DMA_COHERENT_TO_PFN if SWIOTLB
 +	select ARCH_HAS_DMA_MMAP_PGPROT if SWIOTLB
- 	select ARCH_HAS_ELF_RANDOMIZE
  	select ARCH_HAS_FORTIFY_SOURCE
  	select ARCH_HAS_KEEPINITRD
  	select ARCH_HAS_KCOV

Attachment: pgpozGhhhJz72.pgp
Description: OpenPGP digital signature