linux-kernel - Re: linux-next: manual merge of the net tree with Linus' 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]

Date:	Mon, 11 Jan 2010 18:56:45 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	David Miller <davem@...emloft.net>
Cc:	netdev@...r.kernel.org, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, hawk@...x.dk, hadi@...erus.ca
Subject: Re: linux-next: manual merge of the net tree with Linus' tree

Hi Dave,

On Sun, 10 Jan 2010 22:50:55 -0800 (PST) David Miller <davem@...emloft.net> wrote:
>
> That latter commit is specially in the net-next-2.6 tree not the
> net-2.6 tree.

What you call "net-next-2.6", I have always called "net".  What you call
"net-2.6", I have always called "net-current".  Would you like me to
change the names?

> I'll merge net-2.6 into net-next-2.6 to resolve this, thanks!

Thanks.

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

Content of type "application/pgp-signature" skipped