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.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 5F204C433DF for ; Thu, 30 Jul 2020 15:01:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3E4A320838 for ; Thu, 30 Jul 2020 15:01:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596121264; bh=vrT0L42uxKpirJmQf04CjGJseDo6AeA6oDr8HXNg8Vs=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=nQvRoAmR2rT83Uv3lqDkPlEfmXJ+zY/qblLgUMSjnMYHuY8QeNHBTd2WmejgbvjxN CpsP+ugKP5ff+CuLbFxLuk4hGU20pguuqdVPuptGEY66GNHokpfua3TBfeb779BSD5 0pmKFTsTCIrbLoLI5ui8uZ0pkLmDcmoecnie6JWI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729600AbgG3PBC (ORCPT ); Thu, 30 Jul 2020 11:01:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:52526 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726275AbgG3PBC (ORCPT ); Thu, 30 Jul 2020 11:01:02 -0400 Received: from willie-the-truck (236.31.169.217.in-addr.arpa [217.169.31.236]) (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 EFD832070B; Thu, 30 Jul 2020 15:00:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596121261; bh=vrT0L42uxKpirJmQf04CjGJseDo6AeA6oDr8HXNg8Vs=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=J2AGaFsP3cCdxOYRg2TlT/S6yMwsJgah7u7grimwcOQdZL6EaFs/5bFUbboX8sXAW dHs1inYA/qcBuTef/BAmWX5GTgUor/PoRZs+lkVwHU3LcCTeRpCbmwZdpD5ZsjHuw+ zqksTEoCJqMZm2C4kp9xeJhfbBGyuWWdqILwkzBA= Date: Thu, 30 Jul 2020 16:00:56 +0100 From: Will Deacon To: Catalin Marinas Cc: Marc Zyngier , Willy Tarreau , Kees Cook , Linus Torvalds , Stephen Rothwell , Emese Revfy , Linux Next Mailing List , Linux Kernel Mailing List , Sami Tolvanen , Daniel =?iso-8859-1?Q?D=EDaz?= Subject: Re: linux-next: build failure after merge of the origin tree Message-ID: <20200730150056.GA24716@willie-the-truck> References: <20200730090828.2349e159@canb.auug.org.au> <202007292007.D87DBD34B@keescook> <20200730032250.GB7790@1wt.eu> <20200730061407.GA7941@1wt.eu> <102fc7a6fa4c2767879a6f911a9a16d5@misterjones.org> <20200730100923.GE25149@gaia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200730100923.GE25149@gaia> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jul 30, 2020 at 11:09:23AM +0100, Catalin Marinas wrote: > 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) Cheers, I'll pick this up asap. Will