Re: [PATCH 52/89] sched/headers: Split out of

Linus Torvalds
2017-02-06T21:16:29Z

On Mon, Feb 6, 2017 at 5:28 AM, Ingo Molnar <mingo@kernel.org> wrote:
> diff --git a/mm/usercopy.c b/mm/usercopy.c
> index 35685a236e34..2ce59b236d23 100644
> --- a/mm/usercopy.c
> +++ b/mm/usercopy.c
> @@ -17,6 +17,11 @@
> #include <linux/mm.h>
> #include <linux/slab.h>
> #include <linux/sched.h>
> +<<<<<<< HEAD
> +=======
> +#include <linux/sched/task.h>
> +#include <linux/sched/task_stack.h>
> +>>>>>>> 9ecfbdbd2d46... fork.h fixes
> #include <asm/sections.h>
>
> enum {

This was clearly never actually tested. It was hidden in all the silly
one-liner noise. See previous email about how nobody ever looks at
that.

Linus