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

2017-11-12 Thread Stephen Rothwell
Hi all, On Mon, 30 Oct 2017 12:51:33 + Mark Brown wrote: > > Hi all, > > Today's linux-next merge of the powerpc tree got a conflict in: > > arch/powerpc/kvm/powerpc.c > > between commit: > > ac64115a66c1 ("KVM: PPC: Fix oops when checking KVM_CAP_PPC_HTM") > > from Linus' tree and c

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

2016-06-28 Thread Michael Ellerman
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 J

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

2016-06-28 Thread Naveen N. Rao
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 i