netdev - 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]

Message-Id: <20131112.181717.2152470373264166279.davem@davemloft.net>
Date:	Tue, 12 Nov 2013 18:17:17 -0500 (EST)
From:	David Miller <davem@...emloft.net>
To:	tytso@....edu
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

From: Theodore Ts'o <tytso@....edu>
Date: Tue, 12 Nov 2013 18:02:42 -0500

> On Tue, Nov 12, 2013 at 09:55:29AM +0100, Daniel Borkmann wrote:
>> 
>> As per Hannes' suggestion, the result should look like (see cover
>> letter in [1]):
>> 
>> if (r->entropy_total > 128) {
>> 	r->initialized = 1;
>> 	r->entropy_total = 0;
>> 	if (r == &nonblocking_pool) {
>> 		prandom_reseed_late();
>> 		pr_notice("random: %s pool is initialized\n",
>> 			  r->name);
>> 	}
>> }
> 
> 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.
--
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