Today's linux-next merge of the random tree got a conflict in: drivers/char/random.c caused by commits 5573604 (random: push extra entropy to the output pools) and 0244ad0 (Remove GENERIC_HARDIRQ config option). I fixed it up (see below). Please verify that the resolution looks correct. Thanks, Thierry --- diff --cc drivers/char/random.c index 7737b5b,f126bd2..7cfc146 --- 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> -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
