From patchwork Tue Jun 6 01:49:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 103535 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3081572vqr; Mon, 5 Jun 2023 19:02:26 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6ccf6k518LIpVZEzoDkObJZESQ3IQJRg0Uxky4dFkzjzC9ayG8V1XoC0GxNj7ntC+7bVPC X-Received: by 2002:a05:6a20:7fa1:b0:110:f65a:13d7 with SMTP id d33-20020a056a207fa100b00110f65a13d7mr657966pzj.9.1686016946253; Mon, 05 Jun 2023 19:02:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686016946; cv=none; d=google.com; s=arc-20160816; b=BxhDR/HmYnn0uGdGYRHe8mYDBwPWBYldAABSJjXderbZugy3ZEGlgn9CVulZ4g5SK/ eL/NU9EgCI2pS1vtkcE5X8kCW1o7adYi8TYsiaYxDRiGUAVo1ERdymM05ZoWP46KK239 bFtZ+4ItHV5FHyE6t/WWJX896lhSvthcVGUOjzcO3CxPmjZLQqw9AlltY+9kaVbNn/vP A/OeBZxoQ4oY2cam0SuzhtxRJgGmhNz65Wx65PDxsNFHxB/NPqT7kV5IJGHK7/NiWLvr TNxV8hDE9ySICDoQ3zyH5emtXTqHG+BQR32ARavqhuOLG6xM9RyzgowmibfsqdgtDJLe /cEA== 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=9XXm/QR5J7nxa7/gwe/mYjN3Je4hD6qAuS55zZUHYAU=; b=u3Mi9WPFz3b/Gvw1XCJT7V4jrm3IG1oKbG9eLiGAtQFgkRmZuXirRCiENbwzyuYF+T QCk87+SYsZ+n4lTUvKzl0pcfPB/2ZVBVHIhjvKCrpXpQBKhmbqUrS3je4SmAyoSuSA32 yjTM8lQeEHAJbxW2JggsNgD89aV4DpmAwM5YQoJ8yRzFhgsWjby8JYlqmLNCY4+J8l18 20U5xVreJYWeeem8yegaWBFESRZ+PPu4aSOpEn5iGYj4qzhgbznRm7Xbb+Ro671nkMqk gx6XhhRuDaFer0toHyr/AFu0KQTuK9x9ZGvGKvdSyXQurmxNi5MtdCz2r2uqW/4tZ6ZW hCXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=CdNHa2ki; 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 e12-20020a17090301cc00b001ac9a3ebb38si6369296plh.360.2023.06.05.19.02.14; Mon, 05 Jun 2023 19:02:26 -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=CdNHa2ki; 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 S230212AbjFFBu6 (ORCPT + 99 others); Mon, 5 Jun 2023 21:50:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231844AbjFFBus (ORCPT ); Mon, 5 Jun 2023 21:50:48 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 919F9E54; Mon, 5 Jun 2023 18:50:20 -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 4QZtgs2hWWz4x1f; Tue, 6 Jun 2023 11:49:28 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1686016170; bh=9XXm/QR5J7nxa7/gwe/mYjN3Je4hD6qAuS55zZUHYAU=; h=Date:From:To:Cc:Subject:From; b=CdNHa2ki9JcNnl7r8mitNMwcyXFXWyiAIqDWB96i/9d/FmJ11o2JVrWRh3tJa4Zzh tyDmC5mueCDPHMZw/LaD5l8vqGGNjzr2BB3TnHPT//Xrki8LkDFYO8heX/J8vF/sLb mkDuckw2QKTJQrEqky3FAFskE365eK9XCxyM1w8ryPr5p2l3wTClDUiQRgJDN4CKP1 QCts/y+YMi1QhHymSjBTwFFGfCIq7qTaBKNLtnyCavZK1BDYDV2+VSBm59F7m2VJXS eSVwsWxhV44v0KrLuXvUu4meXM49G2nXDu7mdDixK5Jd5pJ3o4dhGV/+wxD6yJbX5C RB26o5dtEU4rg== Date: Tue, 6 Jun 2023 11:49:27 +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: <20230606114927.227a66a5@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1767916905808450913?= X-GMAIL-MSGID: =?utf-8?q?1767916905808450913?= 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") c1fa32c8f189 ("arm64: cpufeature: add TCR2 cpucap") b5a8e35236ee ("arm64: cpufeature: add Permission Indirection Extension cpucap") from the arm64 tree and commit: c876c3f182a5 ("KVM: arm64: Relax trapping of CTR_EL0 when FEAT_EVT is available") 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 a74f41c7280f,4a2ab3f366de..000000000000 --- a/arch/arm64/kernel/cpufeature.c