From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752368AbdGaQNo (ORCPT ); Mon, 31 Jul 2017 12:13:44 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:53617 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752059AbdGaQNn (ORCPT ); Mon, 31 Jul 2017 12:13:43 -0400 Date: Mon, 31 Jul 2017 09:13:41 -0700 From: "Paul E. McKenney" To: Stephen Rothwell Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Linux-Next Mailing List , Linux Kernel Mailing List , Andy Lutomirski , Mathieu Desnoyers Subject: Re: linux-next: manual merge of the rcu tree with the tip tree Reply-To: paulmck@linux.vnet.ibm.com References: <20170731135029.479025ea@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170731135029.479025ea@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) X-TM-AS-GCONF: 00 x-cbid: 17073116-0056-0000-0000-000003AF7419 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00007459; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000214; SDB=6.00895588; UDB=6.00447936; IPR=6.00675775; BA=6.00005503; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00016467; XFM=3.00000015; UTC=2017-07-31 16:13:41 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17073116-0057-0000-0000-000007E59C7A Message-Id: <20170731161341.GG3730@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-07-31_06:,, 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-1706020000 definitions=main-1707310275 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jul 31, 2017 at 01:50:29PM +1000, Stephen Rothwell wrote: > Hi Paul, > > Today's linux-next merge of the rcu tree got a conflict in: > > arch/x86/mm/tlb.c > > between commit: > > 94b1b03b519b ("x86/mm: Rework lazy TLB mode and TLB freshness tracking") > > from the tip tree and commit: > > d7713e8f8b23 ("membarrier: Expedited private command") > > from the rcu tree. > > I fixed it up (the former removed the comment and the load_cr3(), so I > just dropped the commend change in the latter) 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. Thank you, Stephen! Mathieu, Peter, our commit log reads as if removal of load_cr3() would simply result in relying on the ordering provided by the atomic ops in switch_mm() for mm_cpumask(), so that only the commit log and the comment need changing. Please let me know if I am missing something here. Thanx, Paul