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

Michael Ellerman
2016-06-29T06:33:48Z

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