archive mirror
 help / color / mirror / Atom feed
* Conflict in merge of the the random tree
@ 2013-10-05 19:14 Mark Brown
  0 siblings, 0 replies; only message in thread
From: Mark Brown @ 2013-10-05 19:14 UTC (permalink / raw)
  To: Martin Schwidefsky, Theodore Ts'o
  Cc: linux-next, linux-kernel, Thierry Reding

[-- Attachment #1: Type: text/plain, Size: 721 bytes --]

While merging the random tree into -next there was a trivial conflict
in drivers/char/random.c between 0244ad004a54e3 (Remove GENERIC_HARDIRQ
config option) and 557360455b (random: push extra entropy to the output

I've fixed this up as below:

diff --cc drivers/char/random.c
index 7737b5b,f126bd2..0000000
--- 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>
 -# include <linux/irq.h>
  #include <asm/processor.h>
  #include <asm/uaccess.h>
  #include <asm/irq.h>

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2013-10-05 19:14 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-05 19:14 Conflict in merge of the the random tree Mark Brown

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).