netdev - Re: READ ME, net-2.6 fully merged

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:	Sat, 19 Jul 2008 09:50:36 +0200
From:	Jarek Poplawski <jarkao2@...il.com>
To:	David Miller <davem@...emloft.net>
CC:	netdev@...r.kernel.org
Subject: Re: READ ME, net-2.6 fully merged

David Miller wrote, On 07/18/2008 12:39 PM:

> I merged Linus's current tree into net-next-2.6, fixed up all
> the merge conflicts, and pushed this out as plain "net-2.6":
> 
> 	master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
> 
> There is a net-next-2.6 still there, but it's just a plain clone
> of Linus's tree so that the linux-next folks can still do dummy
> pulls from it.

A little btw. question: I know you are busy now with more serious
problems and it's not for now, but: after the last net-next-2.6 git
policy change most of the time neither net-2.6 nor net-next-2.6
could be treated as current net state. I tried to stick to net-next,
but it was idle most of the time.

Isn't it possible to create the third git tree maintained the old
net-next way i.e. net-next-2.6 with immediate bug fixes from net-2.6
(and of course rebased from time to time)? I guess you could be doing
something like this privately, so it's not necessarily a lot of
additional hassle?

Thanks,
Jarek P.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html