From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932548AbcFIP7K (ORCPT ); Thu, 9 Jun 2016 11:59:10 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:50566 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932410AbcFIP7I (ORCPT ); Thu, 9 Jun 2016 11:59:08 -0400 X-IBM-Helo: d01dlp03.pok.ibm.com X-IBM-MailFrom: paulmck@linux.vnet.ibm.com X-IBM-RcptTo: linux-kernel@vger.kernel.org;linux-next@vger.kernel.org Date: Thu, 9 Jun 2016 08:59:07 -0700 From: "Paul E. McKenney" To: Stephen Rothwell Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: manual merge of the rcu tree with the tip tree Reply-To: paulmck@linux.vnet.ibm.com References: <20160609151441.7b4ff455@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160609151441.7b4ff455@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16060915-0044-0000-0000-00000056943C X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16060915-0045-0000-0000-0000046B8FF2 Message-Id: <20160609155907.GB3758@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-06-09_05:,, 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-1604210000 definitions=main-1606090174 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jun 09, 2016 at 03:14:41PM +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: > > 6428671bae97 ("locking/mutex: Optimize mutex_trylock() fast-path") > > from the tip tree and commit: > > 3991b105efd5 ("rcu: Move expedited code from tree.c to tree_exp.h") > > from the rcu tree. > > I fixed it up (I used tree.c from the rcu tree and then applied the > following fic up patch) 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. > > From: Stephen Rothwell > Date: Thu, 9 Jun 2016 15:01:10 +1000 > Subject: [PATCH] rcu: merge fix for kernel/rcu/tree_exp.h > > Signed-off-by: Stephen Rothwell Looks correct to me, thank you! Thanx, Paul > --- > kernel/rcu/tree_exp.h | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/kernel/rcu/tree_exp.h b/kernel/rcu/tree_exp.h > index d400434af6b2..6d86ab6ec2c9 100644 > --- a/kernel/rcu/tree_exp.h > +++ b/kernel/rcu/tree_exp.h > @@ -253,7 +253,6 @@ static bool exp_funnel_lock(struct rcu_state *rsp, unsigned long s) > if (ULONG_CMP_LT(READ_ONCE(rnp->exp_seq_rq), s) && > (rnp == rnp_root || > ULONG_CMP_LT(READ_ONCE(rnp_root->exp_seq_rq), s)) && > - !mutex_is_locked(&rsp->exp_mutex) && > mutex_trylock(&rsp->exp_mutex)) > goto fastpath; > > -- > 2.8.1 > > -- > Cheers, > Stephen Rothwell >