From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754303Ab2LMLDy (ORCPT ); Thu, 13 Dec 2012 06:03:54 -0500 Received: from cantor2.suse.de ([195.135.220.15]:49883 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753580Ab2LMLDw (ORCPT ); Thu, 13 Dec 2012 06:03:52 -0500 Date: Thu, 13 Dec 2012 12:03:51 +0100 Message-ID: From: Takashi Iwai To: Stephen Rothwell Cc: linux-next@vger.kernel.org, LKML Subject: Re: linux-next: reminder 2 In-Reply-To: <20121213213922.b4474411b2370bb8432cf9eb@canb.auug.org.au> References: <20121213153237.403367211eb1a82e2cdaabb2@canb.auug.org.au> <20121213213922.b4474411b2370bb8432cf9eb@canb.auug.org.au> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.2 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At Thu, 13 Dec 2012 21:39:22 +1100, Stephen Rothwell wrote: > > Hi Takashi, > > On Thu, 13 Dec 2012 10:42:09 +0100 Takashi Iwai wrote: > > > > At Thu, 13 Dec 2012 15:32:37 +1100, > > Stephen Rothwell wrote: > > > > > > If you have a tree that is included in linux-next, please clean it up > > > after it has been merged into your upstream (i.e. Linus' tree in most > > > cases). > > > > What does "clean up" mean in this context exactly? > > Well, if the tree you had in linux-next is pulled directly into Linus' > tree, then you have nothing to do (except maybe a fast forward back merge > of Linus' tree past the point your tree was merged). > > If your tree in linux-next is a merge of other branches that are merged > into Linus' tree separately, then after they are all merged upstream, you > should reset your tree to somewhere in Linus' tree. > > If you rebased your tree before sending it to Linus (which you should not > do, of course), and don't update what is in linux-next to match (which > you should also not do :-)), then you should scold your self (:-)) and > reset your tree to be somewhere in Linus' tree. > > The intent is to give you somewhere nice and clean to start collecting > your next set of commits for the next release (or bug fixes etc) and to > minimise the conflicts with what is left in linux-next. OK, thanks for clarification! Takashi