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

Ingo Molnar
2017-02-06T21:55:04Z

* Linus Torvalds <torvalds@linux-foundation.org> wrote:

> 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.

Yeah, absolutely. :-/

Wondering why Git allowed me to be so stupid with those leftover merge markers.
Git usually doesn't even allow me to commit them so I have these tuned out as a
possibility. This was just a regular git rebase -i flow, to back-merge fixes and
reorder/squash patches - nothing fancy that I remember - only the occasional
--onto option. I'm using Git 2.7.4.

Note that the title has a problem too:

[PATCH 57/89] sched/headers: Split <linux/sched/task_stack> out of <linux/sched.h>

That should say <linux/sched/task_stack.h>.

I'll do the further splitting up, will address all the other review feedback and
will go over it with a fine comb before reposting.

Thanks,

Ingo