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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C552FC433F5 for ; Wed, 9 Mar 2022 12:20:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232676AbiCIMV0 (ORCPT ); Wed, 9 Mar 2022 07:21:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231534AbiCIMVZ (ORCPT ); Wed, 9 Mar 2022 07:21:25 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5D1D317584B; Wed, 9 Mar 2022 04:20:27 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id EFC03B8213D; Wed, 9 Mar 2022 12:20:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7DBD6C340E8; Wed, 9 Mar 2022 12:20:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1646828424; bh=RaV6K88b3L+HXsuscECSUuHuH+07EtXgyzZft0gRdcc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=GoREBFOUl14/i+Qq2IVSd9fjFkfETF6Sg34FaN5hBlxaLwgP2vPL6yKjLMEj8m5fI tpfuEu0LfOhinnCcz1cwVyiCjB+EAS74dTpu9zvm1dIaEsonqHzUaTswDLdoA8s+vP l2y1Nh+N9j5GySqkWrWPJCOSewK9s0gRKmHsmRJpu6Uo0fC78vNxdpiZPO3U9o6yEN Z2xvzdY61aF9egf64Ve0ObbjG/k8a8E4CAAnV5eWXbG7mvQQIqYJUvzjRhXGQoPV+q S4IBqoxKjyCcgfVVPmCam9iaO7PmYPTcU/7r5PuIziHDce7fViqdecfV0tg24IVhTd d9crahvyQ3dng== Date: Wed, 9 Mar 2022 12:20:20 +0000 From: Will Deacon To: Stephen Rothwell Cc: Catalin Marinas , James Morse , Linux Kernel Mailing List , Linux Next Mailing List , Vladimir Murzin Subject: Re: linux-next: manual merge of the arm64 tree with Linus' tree Message-ID: <20220309122019.GD397@willie-the-truck> References: <20220309094235.146df5bd@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220309094235.146df5bd@canb.auug.org.au> User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Wed, Mar 09, 2022 at 09:42:35AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm64 tree got a conflict in: > > arch/arm64/kernel/cpufeature.c > > between commit: > > 228a26b91228 ("arm64: Use the clearbhb instruction in mitigations") > > from Linus' tree and commit: > > def8c222f054 ("arm64: Add support of PAuth QARMA3 architected algorithm") > > from the arm64 tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. > > -- > Cheers, > Stephen Rothwell > > diff --cc arch/arm64/kernel/cpufeature.c > index d33687673f6b,32aa0eb3ed68..000000000000 > --- a/arch/arm64/kernel/cpufeature.c > +++ b/arch/arm64/kernel/cpufeature.c > @@@ -231,7 -226,10 +231,11 @@@ static const struct arm64_ftr_bits ftr_ > }; > > static const struct arm64_ftr_bits ftr_id_aa64isar2[] = { > + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_HIGHER_SAFE, ID_AA64ISAR2_CLEARBHB_SHIFT, 4, 0), > + ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_PTR_AUTH), > + FTR_STRICT, FTR_EXACT, ID_AA64ISAR2_APA3_SHIFT, 4, 0), > + ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_PTR_AUTH), > + FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR2_GPA3_SHIFT, 4, 0), > ARM64_FTR_BITS(FTR_VISIBLE, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64ISAR2_RPRES_SHIFT, 4, 0), > ARM64_FTR_END, > }; This (and https://lore.kernel.org/r/20220309093832.01585172@canb.auug.org.au) are due to the surprise spectre mitigations which landed yesterday. Now that's all public, I'll merge those changes into our for-next/core branch and these conflicts should all disappear. Thanks, Will