lkml.org 
[lkml]   [2013]   [Nov]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the random tree with the net-next tree
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.

Cheers,

- Ted


\
 
 \ /
  Last update: 2013-11-13 00:21    [W:1.916 / U:0.060 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site