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.1010181657380.2764@xanadu.home>
Date:	Mon, 18 Oct 2010 17:11:47 -0400 (EDT)
From:	Nicolas Pitre <nico@...xnic.net>
To:	Daniel Walker <dwalker@...o99.com>
Cc:	Arnd Bergmann <arnd@...db.de>, 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:

> I think the term "merge window" is a little mis-leading here.. Your
> describing development. To me the term merge window is indicating a
> short period when you get changes in, not the whole -rc cycle.

There are overlaps.  The two-week merge window is for subsystem 
maintainers to push their stuff to Linus.  Obviously those subsystem 
maintainers must have merge windows of their own prior pushing their 
tree to Linus.  This is a pipeline.

And folks let's not get too excited about this.  The idea of having this 
change at the end of RMK's merge window is to catch most (if not all) 
ARM targets being affected.  Last time I checked this affected something 
like 367 machines.  This is not a catastrophic issue if support for one 
or two machines get merged outside of RMK's tree and a build error 
happens for them once in Linus' tree.  The fix should be obvious and the 
-rc period is long enough to fix those things.  Or the merge actually 
flags a conflict that should be trivial to fix as Stephen did in 
linux-next.

Merge conflicts do happen.  If those conflicts remain small and trivial 
this is _fine_.


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/