Re: linux-next: manual merge of the random tree

[Theodore Ts'o]

On Tue, Oct 01, 2013 at 01:07:22PM +0200, Thierry Reding wrote:
> Today's linux-next merge of the random tree got a conflict in:
> 
> 	init/main.c
> 
> I fixed it up (see below). Please check if the resolution looks correct.

Looks good, thanks.

						- Ted

> 
> 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-kernel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/