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 S1751967AbdBFVp0 (ORCPT <rfc822;w@1wt.eu>);
        Mon, 6 Feb 2017 16:45:26 -0500
Received: from mail-wm0-f68.google.com ([74.125.82.68]:34173 "EHLO
        mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751172AbdBFVpZ (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 6 Feb 2017 16:45:25 -0500
Date: Mon, 6 Feb 2017 22:45:21 +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 52/89] sched/headers: Split <linux/sched/task.h> out of
 <linux/sched.h>
Message-ID: <20170206214521.GA30307@gmail.com>
References: <1486387772-18837-1-git-send-email-mingo@kernel.org>
 <1486387772-18837-53-git-send-email-mingo@kernel.org>
 <CA+55aFzF10u7TbhgTfyRJd72FMvk7_WPtNRpspLD=YAUfYNEgQ@mail.gmail.com>
 <20170206214140.GC9788@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20170206214140.GC9788@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


* Ingo Molnar <mingo@kernel.org> wrote:

> 
> * Linus Torvalds <torvalds@linux-foundation.org> wrote:
> 
> > 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.
> 
> Ouch. Note that I did test the TILE cross-build on the resulting tree:
> 
>  testing      sparc:  -git:  pass (    0),  -tip:  pass (    0)
>  testing       tile:  -git:  pass (    2),  -tip:  pass (    2)
>                                             ^^^^^^^^^^^^^^^^^^^
>  testing         um:  -git:  pass (    0),  -tip:  pass (    0)
> 
> ... but this ugliness was hidden by the fact that a later patch removed the merge 
> artifact:
> 
>   [PATCH 57/89] sched/headers: Split <linux/sched/task_stack> out of <linux/sched.h>
> 
> 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 doesn't excuse this in any way, of course. I've fixed it and I've double 
> checked there are no other merge artifacts.
> 
> Not sure what happened there, my workflow usually warns about merge artifacts :-/
> 
> These appear to have been the only such incidents:
> 
>   triton:~/tip> git log -p 248fd141c4c1..WIP.sched/core | grep '===='
>   -=======
>   -=======
>   +=======
>   +=======

Actually, this was already in the fixed tree, so there was another merge 
artifact...

Thanks,

	Ingo