From patchwork Thu Jun 15 02:22:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 108237 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp352242vqr; Wed, 14 Jun 2023 19:31:56 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6SqVsKkmfjEXTheQtOAMuPVi0D7EI5cD8SAkyUX9hfcyZM8Gad6/MBdChajxkoxXOs7r6K X-Received: by 2002:a05:6a21:7894:b0:116:df6e:c84c with SMTP id bf20-20020a056a21789400b00116df6ec84cmr3439626pzc.45.1686796315669; Wed, 14 Jun 2023 19:31:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686796315; cv=none; d=google.com; s=arc-20160816; b=Wp/w6a0MmMHL1dIlJON5Lep5Bw093esBGCkKdwrAta2tI92e5egYqcdppiYKe+J+m3 KaT5gGATy17L/G56iQP/cbmpKsyKUr/R6ggOjRgnH7CgQWcl61hTfhv2NiVQq7BFMFZl MI4/TXg8PD5Wc3kAAX1VzZ3JE8BADmcSFwrZYShsdvd4sQEEMOZpffh4QMBBQke5Gjjz IYQRK1txAZ70dvWgWad+5nvjYzoKn0sFUlQBePqaQP2Fe19CTngSvkfxlfnBYVYzDCP8 S3dRJPlUYavck4nTnu8FsomVsyin6QilWndVao2ynApIV8IaY8YDos0Qqu7IrLPG3x1U SdUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=p5xSfDyYnXJ+NMp12bUovs/UHMo9Iq6/3qEBP2aWE7s=; b=ePDP/oF+Awe8ykhwvNtSD9L7DlRf/OhOFciyz5Upcs+AlUrLbJJbkZtXvPgmr/1FaY SYSAW14T8XgsFv3N5vygeCTQ0CuR9apF+ykwpD44NKbvWtujJGCVDiv98+vG3WkpmrGY gwmeJQ1dAybnUjNs2uJSrDa4YESXe49ufSnswGdjCys0Uslshow6hg63Z0s5LZOzP4og zQ6g54wcYpphCihsV5NgsA5moCbhYXQ+sPEUFrruHzQH1MOh7CcHW/VYhvFDvRLqYDcf g+4VqQbXha/zzbFY5vIGkBe6DXtpL7FeEaNAAS/2E0K+gKWL/JC7su+wLXeilEdzBChE d49Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=rCpNaGSb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j14-20020a170902da8e00b001b3bb739eddsi8187902plx.138.2023.06.14.19.31.43; Wed, 14 Jun 2023 19:31:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=rCpNaGSb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237117AbjFOCWV (ORCPT + 99 others); Wed, 14 Jun 2023 22:22:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230144AbjFOCWU (ORCPT ); Wed, 14 Jun 2023 22:22:20 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9DBF61FC7; Wed, 14 Jun 2023 19:22:16 -0700 (PDT) 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 4QhQzR4Z4Hz4wjC; Thu, 15 Jun 2023 12:22:11 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1686795732; bh=p5xSfDyYnXJ+NMp12bUovs/UHMo9Iq6/3qEBP2aWE7s=; h=Date:From:To:Cc:Subject:From; b=rCpNaGSbO4cpZNaTh21tAn3S91BcEAONQo46e0iIl/PbYcrJdmWxQViCEfMJG28YZ MG98qO4dFB/m4z2+c6V6fW1iVE9HGQa/YkP8qRM5bFW2psfN8zcXVXD0URKY5pDP1O f1slJygyUmDY3+8fjun8nMXnT8BvlKOUa3ytzYgj4ULQt5lUfHISOC3ntRA8DMkMih uFrpoI4lyOLOSQEpiCqB8Fif2FxY2eytHH0b9chj+rrxHlKKR56PJJ/OD6KX2qGtDM viXpgr23LgkfexpTfyltvKiW+w+bPor7dvikpWAlcu57ObICdgmGYNyjsb2YAlwrkI fhRR9kXAgBJlg== Date: Thu, 15 Jun 2023 12:22:01 +1000 From: Stephen Rothwell To: Christoffer Dall , Marc Zyngier , Catalin Marinas , Will Deacon Cc: Joey Gouly , Kristina Martsenko , Linux Kernel Mailing List , Linux Next Mailing List , Oliver Upton Subject: linux-next: manual merge of the kvm-arm tree with the arm64 tree Message-ID: <20230615122201.75e36abd@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768734133794306999?= X-GMAIL-MSGID: =?utf-8?q?1768734133794306999?= Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in: arch/arm64/kernel/cpufeature.c between commits: b7564127ffcb ("arm64: mops: detect and enable FEAT_MOPS") 2b760046a2d3 ("arm64: cpufeature: add TCR2 cpucap") e43454c44232 ("arm64: cpufeature: add Permission Indirection Extension cpucap") from the arm64 tree and commits: c876c3f182a5 ("KVM: arm64: Relax trapping of CTR_EL0 when FEAT_EVT is available") e2d6c906f0ac ("arm64: Add KVM_HVHE capability and has_hvhe() predicate") 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. diff --cc arch/arm64/kernel/cpufeature.c index 6ea7f23b1287,f6e3598760f1..000000000000 --- a/arch/arm64/kernel/cpufeature.c