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=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 B4867C433B4 for ; Tue, 13 Apr 2021 05:43:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7B0A4613AB for ; Tue, 13 Apr 2021 05:43:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245700AbhDMFnv (ORCPT ); Tue, 13 Apr 2021 01:43:51 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:38463 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243542AbhDMFnt (ORCPT ); Tue, 13 Apr 2021 01:43:49 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4FKDzb2SRVz9sVw; Tue, 13 Apr 2021 15:43:22 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1618292604; bh=tZ54/3ocfBoA6RPTXMtP3NOOQVJJEGcVSh2zdlv211k=; h=Date:From:To:Cc:Subject:From; b=f/1b9EERvihAO9fwjPRzur+F9rIKgJVjdZ8p9ozFuqNlzCSQvfv0ZKgzRMIWCGIfX /qzYp5aRq4pmbhZHlQO9d9DS+Y95CAu+wmCdTCuIDSP93VNU8+VD982yrrebhJY7J7 /q4vtx6aREa6UgaKx/oL4ks8Qzns18OwTxeQICFbcCjCAbxzzYrrfaWwBxY2XhmaQ3 gdICCUcSbjdvZKxgSvjW1BWbUyuUN/yhu/84EGLE6bfmRAO6dGGw+bwB1S3OeI+kU4 Ro6pKBqc/FwDR8kDKUZ1x7XBxuixQMvKcFMzzwBrqGathOkFn3y22xOB/eWoqq4714 vnILVX0bj8WNQ== Date: Tue, 13 Apr 2021 15:43:05 +1000 From: Stephen Rothwell To: Christoffer Dall , Marc Zyngier , Catalin Marinas , Will Deacon Cc: Ard Biesheuvel , Linux Kernel Mailing List , Linux Next Mailing List , Quentin Perret Subject: linux-next: manual merge of the kvm-arm tree with the arm64 tree Message-ID: <20210413154305.49442969@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/tvzh469tZ3+W4GMju+tgZ+i"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/tvzh469tZ3+W4GMju+tgZ+i Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in: arch/arm64/include/asm/assembler.h between commits: 27248fe1abb2 ("arm64: assembler: remove conditional NEON yield macros") 13150149aa6d ("arm64: fpsimd: run kernel mode NEON with softirqs disabled= ") from the arm64 tree and commits: 8f4de66e247b ("arm64: asm: Provide set_sctlr_el2 macro") 755db23420a1 ("KVM: arm64: Generate final CTR_EL0 value when running in P= rotected mode") from the kvm-arm 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. --=20 Cheers, Stephen Rothwell diff --cc arch/arm64/include/asm/assembler.h index ab569b0b45fc,34ddd8a0f3dd..000000000000 --- a/arch/arm64/include/asm/assembler.h +++ b/arch/arm64/include/asm/assembler.h @@@ -15,7 -15,7 +15,8 @@@ #include =20 #include +#include + #include #include #include #include @@@ -701,25 -705,95 +714,33 @@@ USER(\label, ic ivau, \tmp2) // inval isb .endm =20 + .macro set_sctlr_el1, reg + set_sctlr sctlr_el1, \reg + .endm +=20 + .macro set_sctlr_el2, reg + set_sctlr sctlr_el2, \reg + .endm +=20 -/* - * Check whether to yield to another runnable task from kernel mode NEON = code - * (which runs with preemption disabled). - * - * if_will_cond_yield_neon - * // pre-yield patchup code - * do_cond_yield_neon - * // post-yield patchup code - * endif_yield_neon