From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751862AbcC3KaZ (ORCPT ); Wed, 30 Mar 2016 06:30:25 -0400 Received: from e18.ny.us.ibm.com ([129.33.205.208]:34792 "EHLO e18.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751733AbcC3KaW (ORCPT ); Wed, 30 Mar 2016 06:30:22 -0400 X-IBM-Helo: d01dlp01.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: Wed, 30 Mar 2016 03:30:31 -0700 From: "Paul E. McKenney" To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Gortmaker Subject: Re: linux-next: manual merge of the rcu tree with Linus' tree Message-ID: <20160330103031.GC4287@linux.vnet.ibm.com> Reply-To: paulmck@linux.vnet.ibm.com References: <20160330113214.4110cd63@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160330113214.4110cd63@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: 16033010-0045-0000-0000-000003C8E8F5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Mar 30, 2016 at 11:32:14AM +1100, Stephen Rothwell wrote: > Hi Paul, > > Today's linux-next merge of the rcu tree got a conflict in: > > kernel/rcu/tree.c > > between commit: > > abedf8e2419f ("rcu: Use simple wait queues where possible in rcutree") > > from Linus' tree and commit: > > 08cace5914ea ("DIAGS: Crude exploratory hack") > > from the rcu tree. > > I fixed it up (I 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. > > I really don't think that that rcu tree patch should be in linux-next, > right? Right you are! I will rework to get the diagnostics out of your way. -Might- have helped find one of the bugs, but don't look now... Thanx, Paul