linux-kernel - Re: Announce: Linux-next (Or Andrew's dream :-))

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]

Date:	Tue, 12 Feb 2008 19:53:27 +0200
From:	Benny Halevy <bhalevy@...asas.com>
To:	James Bottomley <James.Bottomley@...senPartnership.com>
CC:	Linus Torvalds <torvalds@...ux-foundation.org>,
	Jeff Garzik <jeff@...zik.org>,
	David Miller <davem@...emloft.net>, arjan@...radead.org,
	greg@...ah.com, sfr@...b.auug.org.au, linux-kernel@...r.kernel.org,
	linux-next@...r.kernel.org, linux-arch@...r.kernel.org,
	akpm@...ux-foundation.org
Subject: Re: Announce: Linux-next (Or Andrew's dream :-))

On Feb. 12, 2008, 19:41 +0200, James Bottomley <James.Bottomley@...senPartnership.com> wrote:
> On Tue, 2008-02-12 at 09:09 -0800, Linus Torvalds wrote:
>>  (a) create a base tree with _just_ that fundamental infrastructure change,
>>      and make sure that base branch is so obviously good that there is no 
>>      question about merging it.
> 
> The problem is how do we use a?  Usually we need to track your -rc tree
> as our fixes go in ... some of which affect our development trees.
> 
> If we stick with (a) as the base, we don't get to pull in the fixes in
> your tree.  If we use your tree we have to pull in (a) creating n
> different merge points for the n different upstream trees..

IMHO, this base tree should typically be based off of linus' tree
and kept rebased on top of it.  This way you get the mainline fixes
through the integration base tree.

Benny

--
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/