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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-id: <alpine.LFD.2.00.1010181654300.2764@xanadu.home>
Date:	Mon, 18 Oct 2010 16:57:32 -0400 (EDT)
From:	Nicolas Pitre <nico@...xnic.net>
To:	Daniel Walker <dwalker@...o99.com>
Cc:	Russell King <rmk@....linux.org.uk>,
	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jeremy Kerr <jeremy.kerr@...onical.com>,
	Jeff Ohlstein <johlstei@...eaurora.org>
Subject: Re: linux-next: manual merge of the msm tree with the arm tree

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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/