linux-kernel - Re: linux-next: manual merge of the random tree with the net-next 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:	Tue, 12 Nov 2013 18:24:55 -0500
From:	Theodore Ts'o <tytso@....edu>
To:	David Miller <davem@...emloft.net>
Cc:	dborkman@...hat.com, sfr@...b.auug.org.au,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	hannes@...essinduktion.org, netdev@...r.kernel.org
Subject: Re: linux-next: manual merge of the random tree with the net-next
 tree

On Tue, Nov 12, 2013 at 06:17:17PM -0500, David Miller wrote:
> > Agreed.  What's the schedule for pushing net-dev to Linus?  I'm
> > currently at Korea Linux Forum, and I was originally planning on
> > pushing random.git to Linus sometime today, but I'm also willing to
> > wait for net-dev to go first.  Either way, we should make sure Linus
> > is aware of the agreed-upon resolution of the merge conflict.
> 
> Linus is going to pull it soon, I sent the pull request last night but
> he was away from decent internet access at the time.

Great, I'll wait for net-dev to show up in Linus's tree before I send
the pull request for random.git.

Thanks,

						- Ted

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/