Re: [PATCH 52/89] sched/headers: Split <linux/sched/task.h> out of <linux/sched.h>

From	Linus Torvalds <torvalds@linux-foundation.org>
Newsgroups	linux.kernel
Subject	Re: [PATCH 52/89] sched/headers: Split <linux/sched/task.h> out of <linux/sched.h>
Date	2017-02-06 22:20 +0100
Message-ID	<t7YRA-1TU-27@gated-at.bofh.it> (permalink)
References	<t7RGp-5x6-3@gated-at.bofh.it> <t7RQ7-5AW-57@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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.

                  Linus

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

Re: [PATCH 52/89] sched/headers: Split <linux/sched/task.h> out of <linux/sched.h> Linus Torvalds <torvalds@linux-foundation.org> - 2017-02-06 22:20 +0100
  Re: [PATCH 52/89] sched/headers: Split <linux/sched/task.h> out of  <linux/sched.h> Ingo Molnar <mingo@kernel.org> - 2017-02-06 22:50 +0100
    Re: [PATCH 52/89] sched/headers: Split <linux/sched/task.h> out of  <linux/sched.h> Ingo Molnar <mingo@kernel.org> - 2017-02-06 22:50 +0100

csiph-web