Date: Wed, 18 Feb 2015 21:53:26 +0100 (CET)
From: Jiri Kosina <jikos@jikos.cz>
To: Stephen Rothwell <sfr@canb.auug.org.au>
cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: please don't start adding v3.21 stuff yet
In-Reply-To: <20150219074431.77e56ef8@canb.auug.org.au>
Message-ID: <alpine.LRH.2.00.1502182145300.2547@twin.jikos.cz>
References: <20150219074431.77e56ef8@canb.auug.org.au>
User-Agent: Alpine 2.00 (LRH 1167 2008-08-23)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1301
Lines: 36

On Thu, 19 Feb 2015, Stephen Rothwell wrote:

> Hi Jiri,
> 
> From my daily release notes:
> 
> "Please do not add any material destined for v3.21 to your linux-next
> included trees until after v3.20-rc1 has been released."
> 
> Commit 38e0e413ca1d ("Merge branch 'for-3.21/logitech' into for-next"),
> commit e0ab74fe569d ("Merge branch 'for-3.21/rmi' into for-next"),
> commit ee2de8fc6c18 ("Merge branch 'for-3.21/genius' into for-next")
> (though this last contains what looks like a fix).
> 
> :-(

Gah, sorry for that, I always forget to switch off my automated script 
machinery during merge window.

> Also, at some point you might want to reset your tree to Linus' to get
> rid of all those (now useless) old merge commits.

Hmm, I am really not a big fan of rebasing public tree. People are 
actually pulling the for-next branch and working on top of it.

Those merge commits are always only in for-next, the branch that gets 
created for Linus before merge (by merging all the topic branches at once) 
is not polluted by them.

-- 
Jiri Kosina
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/