From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1751909AbdBFVzE (ORCPT <rfc822;w@1wt.eu>);
        Mon, 6 Feb 2017 16:55:04 -0500
Received: from mail-wr0-f195.google.com ([209.85.128.195]:33020 "EHLO
        mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751533AbdBFVzC (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 6 Feb 2017 16:55:02 -0500
Date: Mon, 6 Feb 2017 22:54:58 +0100
From: Ingo Molnar <mingo@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        Mike Galbraith <efault@gmx.de>, Oleg Nesterov <oleg@redhat.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Thomas Gleixner <tglx@linutronix.de>
Subject: Re: [PATCH 57/89] sched/headers: Split <linux/sched/task_stack> out
 of <linux/sched.h>
Message-ID: <20170206215458.GD9788@gmail.com>
References: <1486387772-18837-1-git-send-email-mingo@kernel.org>
 <1486387772-18837-58-git-send-email-mingo@kernel.org>
 <CA+55aFzfiW-BrUD4fD-1H=oxTnTXNbFJEvo+kHvPgXqaVOnExA@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CA+55aFzfiW-BrUD4fD-1H=oxTnTXNbFJEvo+kHvPgXqaVOnExA@mail.gmail.com>
User-Agent: Mutt/1.5.24 (2015-08-30)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


* 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