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

Linus Torvalds
2017-02-06T21:21:15Z

So this was another of those "lots of noise, hiding the actual changes".

And in the midst of all that noise was this fixup:

On Mon, Feb 6, 2017 at 5:29 AM, Ingo Molnar <mingo@kernel.org> wrote:
>
> diff --git a/arch/tile/mm/fault.c b/arch/tile/mm/fault.c
> index 1e0509a4c8bd..f58fa06a2214 100644
> --- a/arch/tile/mm/fault.c
> +++ b/arch/tile/mm/fault.c
> @@ -17,11 +17,8 @@
> #include <linux/signal.h>
> #include <linux/sched.h>
> #include <linux/sched/debug.h>
> -<<<<<<< HEAD
> -=======
> #include <linux/sched/task.h>
> #include <linux/sched/task_stack.h>
> ->>>>>>> 9ecfbdbd2d46... fork.h fixes
> #include <linux/kernel.h>
> #include <linux/errno.h>
> #include <linux/string.h>

which obviously means that I didn't even notice this other conflict
marker earlier in the series.

Anyway, I'm finding the end result pleasing, but the steps having
small issues like this really makes me want the final series to be
cleaned-up.

Linus