Hi Theodore,
Today's linux-next merge of the random tree got a conflict in init/main.c
between commit 65f382fd0c8f ("context_tracking: Ground setup for static
key use") from Linus' tree and commit 382521d2478b ("random: run
random_int_secret_init() run after all late_initcalls") from the random
tree.I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell s...@canb.auug.org.au diff --cc init/main.c index af310af,586cd33..0000000 --- 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>
pgp3zMtK09bE7.pgp
Description: PGP signature
