netdev - Re: GIT tree plans...

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] [day] [month] [year] [list]

Date:	Tue, 02 Dec 2008 22:36:56 -0800 (PST)
From:	David Miller <davem@...emloft.net>
To:	netdev@...r.kernel.org
Subject: Re: GIT tree plans...

From: David Miller <davem@...emloft.net>
Date: Mon, 01 Dec 2008 23:21:24 -0800 (PST)

> There are a bunch of conflicts to resolve in the net-next-2.6
> tree because of things in Linus's tree.
> 
> So what I'm going to do is wait for Linus to take in the
> net-2.6 pull request I just sent to him.  And afterwards
> do all the necessary merges and conflict resolution to
> get everything clean again.

All of this work has been done and pushed to kernel.org
--
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