FAILED: patch "[PATCH] arm64: ssbd: explicitly depend on <linux/prctl.h>" failed to apply to 4.9-stable tree

FAILED: patch "[PATCH] arm64: ssbd: explicitly depend on <linux/prctl.h>" failed to apply to 4.9-stable tree

[gregkh]

The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From adeaa21a4b6954e878f3f7d1c5659ed9c1fe567a Mon Sep 17 00:00:00 2001
From: Anisse Astier <aastier@freebox.fr>
Date: Mon, 17 Jun 2019 15:22:21 +0200
Subject: [PATCH] arm64: ssbd: explicitly depend on <linux/prctl.h>

Fix ssbd.c which depends implicitly on asm/ptrace.h including
linux/prctl.h (through for example linux/compat.h, then linux/time.h,
linux/seqlock.h, linux/spinlock.h and linux/irqflags.h), and uses
PR_SPEC* defines.

This is an issue since we'll soon be removing the include from
asm/ptrace.h.

Fixes: 9cdc0108baa8 ("arm64: ssbd: Add prctl interface for per-thread mitigation")
Cc: stable@vger.kernel.org
Signed-off-by: Anisse Astier <aastier@freebox.fr>
Signed-off-by: Will Deacon <will.deacon@arm.com>

diff --git a/arch/arm64/kernel/ssbd.c b/arch/arm64/kernel/ssbd.c
index 885f13e58708..52cfc6148355 100644
--- a/arch/arm64/kernel/ssbd.c
+++ b/arch/arm64/kernel/ssbd.c
@@ -5,6 +5,7 @@
 
 #include <linux/compat.h>
 #include <linux/errno.h>
+#include <linux/prctl.h>
 #include <linux/sched.h>
 #include <linux/sched/task_stack.h>
 #include <linux/thread_info.h>

Re: FAILED: patch "[PATCH] arm64: ssbd: explicitly depend on <linux/prctl.h>" failed to apply to 4.9-stable tree

[Anisse Astier]

Hi,

On Sun, Jun 23, 2019 at 10:26:50PM +0200, gregkh@linuxfoundation.org wrote:
> 
> The patch below does not apply to the 4.9-stable tree.
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <stable@vger.kernel.org>.
> 

That's OK, it's not needed on 4.9-stable because the include was already
added when ssbd was backported. Ditto for 4.14.

Regards,

Anisse

> thanks,
> 
> greg k-h
> 
> ------------------ original commit in Linus's tree ------------------
> 
> From adeaa21a4b6954e878f3f7d1c5659ed9c1fe567a Mon Sep 17 00:00:00 2001
> From: Anisse Astier <aastier@freebox.fr>
> Date: Mon, 17 Jun 2019 15:22:21 +0200
> Subject: [PATCH] arm64: ssbd: explicitly depend on <linux/prctl.h>
> 
> Fix ssbd.c which depends implicitly on asm/ptrace.h including
> linux/prctl.h (through for example linux/compat.h, then linux/time.h,
> linux/seqlock.h, linux/spinlock.h and linux/irqflags.h), and uses
> PR_SPEC* defines.
> 
> This is an issue since we'll soon be removing the include from
> asm/ptrace.h.
> 
> Fixes: 9cdc0108baa8 ("arm64: ssbd: Add prctl interface for per-thread mitigation")
> Cc: stable@vger.kernel.org
> Signed-off-by: Anisse Astier <aastier@freebox.fr>
> Signed-off-by: Will Deacon <will.deacon@arm.com>
> 
> diff --git a/arch/arm64/kernel/ssbd.c b/arch/arm64/kernel/ssbd.c
> index 885f13e58708..52cfc6148355 100644
> --- a/arch/arm64/kernel/ssbd.c
> +++ b/arch/arm64/kernel/ssbd.c
> @@ -5,6 +5,7 @@
>  
>  #include <linux/compat.h>
>  #include <linux/errno.h>
> +#include <linux/prctl.h>
>  #include <linux/sched.h>
>  #include <linux/sched/task_stack.h>
>  #include <linux/thread_info.h>
>