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=-11.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 CD538C433E0 for ; Thu, 30 Jul 2020 10:09:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AF4A02082E for ; Thu, 30 Jul 2020 10:09:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726987AbgG3KJ3 (ORCPT ); Thu, 30 Jul 2020 06:09:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:57762 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726946AbgG3KJ2 (ORCPT ); Thu, 30 Jul 2020 06:09:28 -0400 Received: from gaia (unknown [95.146.230.158]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3A05720809; Thu, 30 Jul 2020 10:09:26 +0000 (UTC) Date: Thu, 30 Jul 2020 11:09:23 +0100 From: Catalin Marinas To: Marc Zyngier Cc: Willy Tarreau , Kees Cook , Linus Torvalds , Stephen Rothwell , Emese Revfy , Linux Next Mailing List , Linux Kernel Mailing List , Will Deacon , Sami Tolvanen , Daniel =?iso-8859-1?Q?D=EDaz?= Subject: Re: linux-next: build failure after merge of the origin tree Message-ID: <20200730100923.GE25149@gaia> References: <20200730090828.2349e159@canb.auug.org.au> <202007292007.D87DBD34B@keescook> <20200730032250.GB7790@1wt.eu> <20200730061407.GA7941@1wt.eu> <102fc7a6fa4c2767879a6f911a9a16d5@misterjones.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <102fc7a6fa4c2767879a6f911a9a16d5@misterjones.org> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Thu, Jul 30, 2020 at 10:59:09AM +0100, Marc Zyngier wrote: > From 33d819f4efa0a4474b5dc2e4bcaef1b886ca30c3 Mon Sep 17 00:00:00 2001 > From: Marc Zyngier > Date: Thu, 30 Jul 2020 10:53:05 +0100 > Subject: [PATCH] arm64: Drop unnecessary include from asm/smp.h > > asm/pointer_auth.h is not needed anymore in asm/smp.h, as 62a679cb2825 > ("arm64: simplify ptrauth initialization") removed the keys from the > secondary_data structure. > > This also cures a compilation issue introduced by f227e3ec3b5c > ("random32: update the net random state on interrupt and activity"). > > Fixes: 62a679cb2825 ("arm64: simplify ptrauth initialization") > Fixes: f227e3ec3b5c ("random32: update the net random state on interrupt and > activity") > Signed-off-by: Marc Zyngier > --- > arch/arm64/include/asm/smp.h | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/arch/arm64/include/asm/smp.h b/arch/arm64/include/asm/smp.h > index ea268d88b6f7..a0c8a0b65259 100644 > --- a/arch/arm64/include/asm/smp.h > +++ b/arch/arm64/include/asm/smp.h > @@ -30,7 +30,6 @@ > #include > #include > #include > -#include > > DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number); I think this arm64 patch makes sense irrespective of any other generic fixes. If Will wants to take it as a fix: Acked-by: Catalin Marinas (otherwise I'll queue it for 5.9)