Messages in this thread | | | Date | Tue, 12 Nov 2013 09:55:29 +0100 | From | Daniel Borkmann <> | Subject | Re: linux-next: manual merge of the random tree with the net-next tree |
| |
Hi Stephen,
On 11/12/2013 05:55 AM, Stephen Rothwell wrote: > Hi Ted, > > Today's linux-next merge of the random tree got a conflict in > drivers/char/random.c between commit 0244ad004a54 ("random32: add > prandom_reseed_late() and call when nonblocking pool becomes > initialized") from the net-next tree and commit 301f0595c0e7 ("random: > printk notifications for urandom pool initialization") from the random > tree. > > I fixed it up (probably not properly - see below) and can carry the fix > as necessary (no action is required).
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); } }
Cheers,
Daniel
[1] http://thread.gmane.org/gmane.linux.network/290303
| |