linux-kernel - Re: [GIT pull] x86 fixes for 2.6.26

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: <20080518122237.0e4ef71d.sfr@canb.auug.org.au>
Date:	Sun, 18 May 2008 12:22:37 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jesper Juhl <jesper.juhl@...il.com>
Cc:	Linus Torvalds <torvalds@...ux-foundation.org>,
	Theodore Tso <tytso@....edu>,
	Thomas Gleixner <tglx@...utronix.de>,
	LKML <linux-kernel@...r.kernel.org>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>
Subject: Re: [GIT pull] x86 fixes for 2.6.26

Hi Jesper,

On Sat, 17 May 2008 17:35:44 -0700 (PDT) Linus Torvalds <torvalds@...ux-foundation.org> wrote:
>
>    But I'll actually happily handle trivial merges too, so this is by no 
>    means even a requirement - if the merge ends up being non-trivial, I'll 
>    let people know anyway and either say "ok, that's so complicated, and I 
>    don't know the area well enough, so can you please do it for me", or 
>    say "ok, I merged it, but can you please double-check the result".

This is also true for linux-next.

> > Once the 2.6.27 merge window opens, ask you to pull the
> > 'for-linux-2.6.27' branch and once you have done so, leave that branch
> > alone forever.
> >
> > Branch off a new 'for-linux-2.6.28' branch and repeat.
> 
> Yes. That's a good model.

I just have one request: instead of calling it for-linux-2.6.27, call it
for-next.  The when the merge window opens rename it to for-linus or
current or something and reset for-next to where you want to start
collecting stuff for 2.6.28.  That way you don't have to keep telling me
where the tree I fetch into linux-next is.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped