Re: linux-next: manual merge of the powerpc tree with Linus' tree

["Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com>]

On 2016/06/29 10:35AM, Stephen Rothwell wrote:
> Hi all,

Hi Stephen,

> 
> Today's linux-next merge of the powerpc tree got a conflict in:
> 
>   arch/powerpc/Kconfig
> 
> between commit:
> 
>   844e3be47693 ("powerpc/bpf/jit: Disable classic BPF JIT on ppc64le")

Ah, I see that the above commit is not part of powerpc next tree, which 
explains the conflict.

> 
> from Linus' tree and commit:
> 
>   156d0e290e96 ("powerpc/ebpf/jit: Implement JIT compiler for extended BPF")
> 
> from the powerpc tree.
> 
> I fixed it up (see below - I am not sure this entirely correct) 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/powerpc/Kconfig
> index 0a9d439bcda6,ee82f9a09a85..000000000000
> --- a/arch/powerpc/Kconfig
> +++ b/arch/powerpc/Kconfig
> @@@ -128,7 -128,8 +128,8 @@@ config PP
>   	select IRQ_FORCED_THREADING
>   	select HAVE_RCU_TABLE_FREE if SMP
>   	select HAVE_SYSCALL_TRACEPOINTS
> - 	select HAVE_CBPF_JIT if CPU_BIG_ENDIAN
>  -	select HAVE_CBPF_JIT if !PPC64
> ++	select HAVE_CBPF_JIT if !PPC64 && CPU_BIG_ENDIAN

'if !PPC64' condition is sufficient, though having the BIG_ENDIAN check 
should be ok too.

Thanks,
Naveen

> + 	select HAVE_EBPF_JIT if PPC64
>   	select HAVE_ARCH_JUMP_LABEL
>   	select ARCH_HAVE_NMI_SAFE_CMPXCHG
>   	select ARCH_HAS_GCOV_PROFILE_ALL
>