From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Zijlstra Subject: Re: linux-next: manual merge of the rcu tree with the tip tree Date: Wed, 05 Sep 2012 19:11:05 +0200 Message-ID: <1346865065.2600.34.camel@twins> References: <20120905135947.34ba1c8356cbfe374c6c4ea8@canb.auug.org.au> <20120905163959.GF3308@linux.vnet.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7BIT Return-path: Received: from casper.infradead.org ([85.118.1.10]:57798 "EHLO casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750841Ab2IERLT convert rfc822-to-8bit (ORCPT ); Wed, 5 Sep 2012 13:11:19 -0400 In-Reply-To: <20120905163959.GF3308@linux.vnet.ibm.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: paulmck@linux.vnet.ibm.com Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" On Wed, 2012-09-05 at 09:39 -0700, Paul E. McKenney wrote: > On Wed, Sep 05, 2012 at 01:59:47PM +1000, Stephen Rothwell wrote: > > Hi Paul, > > > > Today's linux-next merge of the rcu tree got a conflict in > > kernel/sched/core.c between commit f319da0c6894 ("sched: Fix load avg vs > > cpu-hotplug") from the tip tree and commit ead504e5600e ("sched: Fix load > > avg vs cpu-hotplug") from the rcu tree. > > > > These are 2 slightly different versions of the same patch :-( Same author > > time, different commit times ... The rcu tree version contains this > > extra bit in the commit message: > > > > " [ paulmck: Move call to calc_load_migration to CPU_DEAD to avoid > > miscounting noted by Rakib. ]" > > > > So I used it. Let me know if this is not correct. > > My guess is that Peter Zijlstra will replace my version at some point, > at which point I will drop mine. But from what I can see, the version > currently in -tip is the older version, so I will keep mine until > -tip updates. Yeah, that was a fail on my part. I'll go sort it after dinner.