Messages in this thread | | | From | Thierry Reding <> | Subject | linux-next: manual merge of the random tree | Date | Mon, 30 Sep 2013 13:26:09 +0200 |
| |
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>
| |