linux-next: manual merge of the m68knommu tree with the m68k tree

[Stephen Rothwell]

Hi all,

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

  arch/m68k/Kconfig

between commits:

  34dc63a5fb9b ("m68k: Use the generic dma coherent remap allocator")
  69878ef47562 ("m68k: Implement arch_dma_prep_coherent()")

from the m68k tree and commit:

  bdd15a288492 ("binfmt_flat: replace flat_argvp_envp_on_stack with a Kconfig variable")
  aef0f78e7460 ("binfmt_flat: add a ARCH_HAS_BINFMT_FLAT option")

from the m68knommu 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/m68k/Kconfig
index 00f5c98a5e05,c0c43c624afa..000000000000
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@@ -3,13 -3,12 +3,15 @@@ config M68
  	bool
  	default y
  	select ARCH_32BIT_OFF_T
+ 	select ARCH_HAS_BINFMT_FLAT
 +	select ARCH_HAS_DMA_MMAP_PGPROT if MMU && !COLDFIRE
 +	select ARCH_HAS_DMA_PREP_COHERENT
  	select ARCH_HAS_SYNC_DMA_FOR_DEVICE if HAS_DMA
  	select ARCH_MIGHT_HAVE_PC_PARPORT if ISA
  	select ARCH_NO_COHERENT_DMA_MMAP if !MMU
  	select ARCH_NO_PREEMPT if !COLDFIRE
+ 	select BINFMT_FLAT_ARGVP_ENVP_ON_STACK
 +	select DMA_DIRECT_REMAP if HAS_DMA && MMU && !COLDFIRE
  	select HAVE_IDE
  	select HAVE_AOUT if MMU
  	select HAVE_DEBUG_BUGVERBOSE

Attachment: pgpensi8kRJjW.pgp
Description: OpenPGP digital signature