From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Theodore Ts'o <tytso@mit.edu>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Hannes Frederic Sowa <hannes@stressinduktion.org>,
David Miller <davem@davemloft.net>,
netdev@vger.kernel.org, Daniel Borkmann <dborkman@redhat.com>
Subject: linux-next: manual merge of the random tree with the net-next tree
Date: Tue, 12 Nov 2013 15:55:49 +1100 [thread overview]
Message-ID: <20131112155549.c160273993147244ed6bc81d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1525 bytes --]
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).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/char/random.c
index 4fe5609eeb72,cdf4cfb2da4d..000000000000
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@@ -255,8 -255,12 +255,9 @@@
#include <linux/fips.h>
#include <linux/ptrace.h>
#include <linux/kmemcheck.h>
+#include <linux/irq.h>
+ #include <linux/workqueue.h>
-#ifdef CONFIG_GENERIC_HARDIRQS
-# include <linux/irq.h>
-#endif
-
#include <asm/processor.h>
#include <asm/uaccess.h>
#include <asm/irq.h>
@@@ -601,12 -654,14 +651,16 @@@ retry
if (cmpxchg(&r->entropy_count, orig, entropy_count) != orig)
goto retry;
+ r->entropy_total += nbits;
if (!r->initialized && nbits > 0) {
- r->entropy_total += nbits;
if (r->entropy_total > 128) {
+ if (r == &nonblocking_pool)
+ pr_notice("random: %s pool is initialized\n",
+ r->name);
r->initialized = 1;
+ if (r == &nonblocking_pool)
+ prandom_reseed_late();
+ r->entropy_total = 0;
}
}
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-11-12 4:56 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-12 4:55 Stephen Rothwell [this message]
2013-11-12 8:55 ` linux-next: manual merge of the random tree with the net-next tree Daniel Borkmann
2013-11-12 20:46 ` Stephen Rothwell
2013-11-14 15:17 ` Markos Chandras
2013-11-12 23:02 ` Theodore Ts'o
2013-11-12 23:13 ` Hannes Frederic Sowa
2013-11-12 23:17 ` David Miller
2013-11-12 23:24 ` Theodore Ts'o
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131112155549.c160273993147244ed6bc81d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=dborkman@redhat.com \
--cc=hannes@stressinduktion.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).