From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936315AbdIZD0g (ORCPT ); Mon, 25 Sep 2017 23:26:36 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:34528 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933685AbdIZD0e (ORCPT ); Mon, 25 Sep 2017 23:26:34 -0400 Date: Mon, 25 Sep 2017 20:26:28 -0700 From: "Paul E. McKenney" To: Stephen Rothwell Cc: Linux-Next Mailing List , Linux Kernel Mailing List , "Steven Rostedt (VMware)" Subject: Re: linux-next: manual merge of the rcu tree with Linus' tree Reply-To: paulmck@linux.vnet.ibm.com References: <20170926130018.421ed780@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170926130018.421ed780@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) X-TM-AS-GCONF: 00 x-cbid: 17092603-0052-0000-0000-000002677BC0 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00007793; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000231; SDB=6.00922435; UDB=6.00463633; IPR=6.00702577; BA=6.00005606; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00017276; XFM=3.00000015; UTC=2017-09-26 03:26:31 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17092603-0053-0000-0000-000052200FCD Message-Id: <20170926032628.GT3521@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-09-26_01:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000 definitions=main-1709260052 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Sep 26, 2017 at 01:00:18PM +1000, Stephen Rothwell wrote: > Hi Paul, > > Today's linux-next merge of the rcu tree got a conflict in: > > kernel/rcu/tree.c > > between commit: > > 28585a832602 ("rcu: Allow for page faults in NMI handlers") > > from Linus' tree and commit: > > 3e2baa988b9c ("rcu: Allow for page faults in NMI handlers") > > from the rcu tree. > > I fixed it up (I just used the rcu tree version) 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. Hello, Stephen, This conflict will disappear tomorrow, as I have merged the commit from Linus's tree in place of mine and have added another commit that removes the READ_ONCE()s. Same result, but no conflict. ;-) Thanx, Paul