From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D95B7C43613 for ; Mon, 24 Jun 2019 06:50:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A2B6120674 for ; Mon, 24 Jun 2019 06:50:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726416AbfFXGuK (ORCPT ); Mon, 24 Jun 2019 02:50:10 -0400 Received: from smtp3-g21.free.fr ([212.27.42.3]:64856 "EHLO smtp3-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726399AbfFXGuK (ORCPT ); Mon, 24 Jun 2019 02:50:10 -0400 Received: from anisse-station (unknown [213.36.7.13]) by smtp3-g21.free.fr (Postfix) with ESMTPS id 71CA413F879; Mon, 24 Jun 2019 08:50:03 +0200 (CEST) Date: Mon, 24 Jun 2019 08:50:02 +0200 From: Anisse Astier To: gregkh@linuxfoundation.org Cc: will.deacon@arm.com, stable@vger.kernel.org Subject: Re: FAILED: patch "[PATCH] arm64: ssbd: explicitly depend on " failed to apply to 4.9-stable tree Message-ID: <20190624065002.GA59442@anisse-station> References: <156132161022460@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <156132161022460@kroah.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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 . > 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 > Date: Mon, 17 Jun 2019 15:22:21 +0200 > Subject: [PATCH] arm64: ssbd: explicitly depend on > > 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 > Signed-off-by: Will Deacon > > 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 > #include > +#include > #include > #include > #include >