From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752551AbcF2Gdt (ORCPT ); Wed, 29 Jun 2016 02:33:49 -0400 Received: from ozlabs.org ([103.22.144.67]:59269 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751020AbcF2Gds (ORCPT ); Wed, 29 Jun 2016 02:33:48 -0400 Message-ID: <1467182018.12626.1.camel@ellerman.id.au> Subject: Re: linux-next: manual merge of the powerpc tree with Linus' tree From: Michael Ellerman To: "Naveen N. Rao" , Stephen Rothwell Cc: Benjamin Herrenschmidt , linuxppc-dev@lists.ozlabs.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Thadeu Lima de Souza Cascardo Date: Wed, 29 Jun 2016 16:33:38 +1000 In-Reply-To: <20160629052426.GB14508@naverao1-tp.localdomain> References: <20160629103507.52c60714@canb.auug.org.au> <20160629052426.GB14508@naverao1-tp.localdomain> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.16.5-1ubuntu3.1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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