From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ingo Molnar Subject: Re: linux-next: manual merge of the rr tree Date: Wed, 25 Jun 2008 09:47:33 +0200 Message-ID: <20080625074733.GA16692@elte.hu> References: <20080625162731.94f69298.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mx3.mail.elte.hu ([157.181.1.138]:50927 "EHLO mx3.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753365AbYFYHrz (ORCPT ); Wed, 25 Jun 2008 03:47:55 -0400 Content-Disposition: inline In-Reply-To: <20080625162731.94f69298.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Rusty Russell , linux-next@vger.kernel.org, Andrew Morton * Stephen Rothwell wrote: > Hi Rusty, > > Today's linux-next merge of the rr tree got a conflict in > kernel/stop_machine.c between commit > 961ccddd59d627b89bd3dc284b6517833bbdf25d ("sched: add new API > sched_setscheduler_nocheck: add a flag to control access") from the > sched tree (which is also in the rr tree) and commit > 179da75b083a098ba6192c0900611a92091abfc9 ("stop_machine:simplify") > from the rr tree. > > I just took the rr tree version since the former is in both trees. Rusty, there's a new -tip toy/feature i've applied when creating that commit 2 days ago, to eliminate this (predictable) conflict. Since this is a scheduler infrastructure change, i've put this change into a separate topic branch in -tip: tip/sched/new-API-sched_setscheduler This new topic branch is based off upstream -git so you can pick up that change alone via a single git-pull, without picking up any other scheduler changes. (any further enhancements to that change should be done in that topic branches as well) This topic is integrated into tip/auto-sched-next, so any changes to the topic will be propagated into linux-next as well. I think this is the right model for doing infrastructure changes - separating them into standalone trees so that other subsystem maintainers can pull them when they run into conflicts. Please use that commit and remove 179da75b083a09 so that there's no overlap in the sha1 space and no conflicts. -tip can be picked up via: http://people.redhat.com/mingo/tip.git/README . Thanks, Ingo