[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CA+55aFzF10u7TbhgTfyRJd72FMvk7_WPtNRpspLD=YAUfYNEgQ@mail.gmail.com>
Date: Mon, 6 Feb 2017 13:16:21 -0800
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: Ingo Molnar <mingo@...nel.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 52/89] sched/headers: Split <linux/sched/task.h> out of <linux/sched.h>
On Mon, Feb 6, 2017 at 5:28 AM, Ingo Molnar <mingo@...nel.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.
Linus
Powered by blists - more mailing lists