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  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, 02 Dec 2008 14:42:59 -0800 (PST)
From:	David Miller <>
Subject: Re: GIT tree plans...

From: Marcel Holtmann <>
Date: Tue, 02 Dec 2008 11:33:05 +0100

> > 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.
> I don't expect that any of my stuff will conflict since it is nicely
> self-contained and I checked it against Linus' tree and net-next-2.6,
> but just in case it does. Let me know since I can very quickly create a
> new tree from my patch queue.

Sure, will do.  Thanks Marcel.

To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to
More majordomo info at

Powered by blists - more mailing lists