Linux kernel -stable discussions
 help / color / mirror / Atom feed
From: Anisse Astier <aastier@freebox.fr>
To: gregkh@linuxfoundation.org
Cc: will.deacon@arm.com, stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] arm64: ssbd: explicitly depend on <linux/prctl.h>" failed to apply to 4.9-stable tree
Date: Mon, 24 Jun 2019 08:50:02 +0200	[thread overview]
Message-ID: <20190624065002.GA59442@anisse-station> (raw)
In-Reply-To: <156132161022460@kroah.com>

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>
> 

      reply	other threads:[~2019-06-24  6:50 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-23 20:26 FAILED: patch "[PATCH] arm64: ssbd: explicitly depend on <linux/prctl.h>" failed to apply to 4.9-stable tree gregkh
2019-06-24  6:50 ` Anisse Astier [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190624065002.GA59442@anisse-station \
    --to=aastier@freebox.fr \
    --cc=gregkh@linuxfoundation.org \
    --cc=stable@vger.kernel.org \
    --cc=will.deacon@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox