linux-kernel - Re: [PATCH 57/89] sched/headers: Split <linux/sched/task

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Mon, 6 Feb 2017 22:54:58 +0100
From:   Ingo Molnar <mingo@...nel.org>
To:     Linus Torvalds <torvalds@...ux-foundation.org>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Andrew Morton <akpm@...ux-foundation.org>,
        Mike Galbraith <efault@....de>,
        Oleg Nesterov <oleg@...hat.com>,
        Peter Zijlstra <peterz@...radead.org>,
        Thomas Gleixner <tglx@...utronix.de>
Subject: Re: [PATCH 57/89] sched/headers: Split <linux/sched/task_stack> out
 of <linux/sched.h>


* Linus Torvalds <torvalds@...ux-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@...nel.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