[prev in list] [next in list] [prev in thread] [next in thread]
List: linux-next
Subject: linux-next: manual merge of the random tree
From: Thierry Reding <thierry.reding () gmail ! com>
Date: 2013-09-30 11:26:09
Message-ID: 1380540373-25352-7-git-send-email-treding () nvidia ! com
[Download RAW message or body]
Today's linux-next merge of the random tree got conflicts in
init/main.c
I fixed it up (see below). Please check if the resolution looks correct.
Thanks,
Thierry
---
diff --cc init/main.c
index 7cc4b78,586cd33..379090f
--- a/init/main.c
+++ b/init/main.c
@@@ -75,7 -75,7 +75,8 @@@
#include <linux/blkdev.h>
#include <linux/elevator.h>
#include <linux/sched_clock.h>
+#include <linux/context_tracking.h>
+ #include <linux/random.h>
#include <asm/io.h>
#include <asm/bugs.h>
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic