From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752638AbcF2FYi (ORCPT ); Wed, 29 Jun 2016 01:24:38 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:47228 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750756AbcF2FYg (ORCPT ); Wed, 29 Jun 2016 01:24:36 -0400 X-IBM-Helo: d23dlp01.au.ibm.com X-IBM-MailFrom: naveen.n.rao@linux.vnet.ibm.com X-IBM-RcptTo: linux-kernel@vger.kernel.org;linux-next@vger.kernel.org Date: Wed, 29 Jun 2016 10:54:26 +0530 From: "Naveen N. Rao" To: Stephen Rothwell Cc: Michael Ellerman , Benjamin Herrenschmidt , linuxppc-dev@lists.ozlabs.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Thadeu Lima de Souza Cascardo Subject: Re: linux-next: manual merge of the powerpc tree with Linus' tree References: <20160629103507.52c60714@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160629103507.52c60714@canb.auug.org.au> User-Agent: Mutt/1.6.0 (2016-04-01) X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16062905-0052-0000-0000-000001A854F5 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16062905-0053-0000-0000-0000064808CA Message-Id: <20160629052426.GB14508@naverao1-tp.localdomain> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-06-29_02:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=8 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1606290050 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 >