Re: linux-next: manual merge of the msm tree with the arm tree

From: Nicolas Pitre
Date: Mon Oct 18 2010 - 16:57:43 EST


On Mon, 18 Oct 2010, Daniel Walker wrote:

> On Mon, 2010-10-18 at 15:29 -0400, Nicolas Pitre wrote:
>
> > RMK has his own merge window which closes about at the same time as
> > Linus' one opens. We thought this was happening last week and therefore
> > this change was supposed to be the last one.
>
> I guess what I'm missing here is when does this window open? Is it a two
> week deal, or does it last the whole -rc cycle?

Linus' merge window is indeed the two-week thing. No one can predict
with certainty when it'll happen, as demonstrated by our merging of the
debug macro in RMK's tree last week based on the presumption that we
would be in the two-week merge now.


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