Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1433381 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2016-06-29 02:40 +0200 |
| Last post | 2016-06-29 08:40 +0200 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the powerpc tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-06-29 02:40 +0200
Re: linux-next: manual merge of the powerpc tree with Linus' tree "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> - 2016-06-29 07:30 +0200
Re: linux-next: manual merge of the powerpc tree with Linus' tree Michael Ellerman <mpe@ellerman.id.au> - 2016-06-29 08:40 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-06-29 02:40 +0200 |
| Subject | linux-next: manual merge of the powerpc tree with Linus' tree |
| Message-ID | <rPbHP-5zT-9@gated-at.bofh.it> |
Hi all,
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")
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
+ select HAVE_EBPF_JIT if PPC64
select HAVE_ARCH_JUMP_LABEL
select ARCH_HAVE_NMI_SAFE_CMPXCHG
select ARCH_HAS_GCOV_PROFILE_ALL
[toc] | [next] | [standalone]
| From | "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> |
|---|---|
| Date | 2016-06-29 07:30 +0200 |
| Message-ID | <rPgez-8vr-13@gated-at.bofh.it> |
| In reply to | #1433381 |
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
>
[toc] | [prev] | [next] | [standalone]
| From | Michael Ellerman <mpe@ellerman.id.au> |
|---|---|
| Date | 2016-06-29 08:40 +0200 |
| Message-ID | <rPhke-Kk-31@gated-at.bofh.it> |
| In reply to | #1433456 |
On Wed, 2016-06-29 at 10:54 +0530, Naveen N. Rao wrote:
> On 2016/06/29 10:35AM, Stephen Rothwell wrote:
> >
> > 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.
I'll probably merge the fixes branch into next at some point, so then it will
be sorted.
> > I fixed it up (see below - I am not sure this entirely correct) and can
That resolution is fine.
cheers
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web