Hi all,

On Thu, 10 Sep 2020 09:34:37 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the m68knommu tree got a conflict in:
> 
>   arch/m68k/Kconfig
> 
> between commit:
> 
>   dc072012bc94 ("m68k: Sort selects in main Kconfig")
> 
> from the m68k tree and commit:
> 
>   ef03e4545eac ("m68knommu: switch to using asm-generic/uaccess.h")
> 
> 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.
> 
> diff --cc arch/m68k/Kconfig
> index 93bbb74ea876,aefffebc0afa..000000000000
> --- a/arch/m68k/Kconfig
> +++ b/arch/m68k/Kconfig
> @@@ -6,32 -6,33 +6,33 @@@ config M68
>   	select ARCH_HAS_BINFMT_FLAT
>   	select ARCH_HAS_DMA_PREP_COHERENT if HAS_DMA && MMU && !COLDFIRE
>   	select ARCH_HAS_SYNC_DMA_FOR_DEVICE if HAS_DMA
>  +	select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS
>   	select ARCH_MIGHT_HAVE_PC_PARPORT if ISA
>   	select ARCH_NO_PREEMPT if !COLDFIRE
>  +	select ARCH_WANT_IPC_PARSE_VERSION
>   	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_ASM_MODVERSIONS
>  -	select HAVE_DEBUG_BUGVERBOSE
>  -	select GENERIC_IRQ_SHOW
>   	select GENERIC_ATOMIC64
>  -	select NO_DMA if !MMU && !COLDFIRE
>  -	select HAVE_UID16
>  -	select VIRT_TO_BUS
>  -	select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS
>   	select GENERIC_CPU_DEVICES
>   	select GENERIC_IOMAP
>  +	select GENERIC_IRQ_SHOW
>   	select GENERIC_STRNCPY_FROM_USER if MMU
>   	select GENERIC_STRNLEN_USER if MMU
>  -	select UACCESS_MEMCPY if !MMU
>  -	select ARCH_WANT_IPC_PARSE_VERSION
>  +	select HAVE_AOUT if MMU
>  +	select HAVE_ASM_MODVERSIONS
>  +	select HAVE_DEBUG_BUGVERBOSE
>   	select HAVE_FUTEX_CMPXCHG if MMU && FUTEX
>  +	select HAVE_IDE
>   	select HAVE_MOD_ARCH_SPECIFIC
>  +	select HAVE_UID16
>  +	select MMU_GATHER_NO_RANGE if MMU
>   	select MODULES_USE_ELF_REL
>   	select MODULES_USE_ELF_RELA
>  -	select OLD_SIGSUSPEND3
>  +	select NO_DMA if !MMU && !COLDFIRE
>   	select OLD_SIGACTION
>  -	select MMU_GATHER_NO_RANGE if MMU
>  +	select OLD_SIGSUSPEND3
> ++	select UACCESS_MEMCPY if !MMU
>  +	select VIRT_TO_BUS
>   
>   config CPU_BIG_ENDIAN
>   	def_bool y

This is now a conflict between the m68knommu tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell