From: David S. Miller <davem@davemloft.net>
Date: Mon, 11 Nov 2013 19:33:06 +0000 (-0500)
Subject: Merge branch 'prandom'
X-Git-Tag: v3.13-rc1~105^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=75ecab1df14d90e86cebef9ec5c76befde46e65f;p=platform%2Fkernel%2Flinux-stable.git

Merge branch 'prandom'

prandom fixes/improvements

====================
It would be great if you could still consider this series that fixes and
improves prandom for 3.13. We have sent it to netdev as prandom() originally
came from net/core/utils.c and networking is its main user. For a detailled
description, please see individual patches.

For patch 3 in this series, there will be a minor merge conflict with the
random tree that is for 3.13. See below how to resolve it.

====
Hannes says: on merge with the random tree I would suggest to resolve the
conflict in drivers/char/random.c like this:

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);
	}
}

So it won't generate a warning if DEBUG_RANDOM_BOOT gets activated.
====

Patch 1 should probably also go to -stable.

Set tested on 32 and 64 bit machines.

Thanks a lot!

Ref. original discussion: http://patchwork.ozlabs.org/patch/289951/
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

75ecab1df14d90e86cebef9ec5c76befde46e65f