From patchwork Tue Jun 20 02:45:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 110232 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3385841vqr; Mon, 19 Jun 2023 19:57:48 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4XKBHnwlk6rvv83r/VE/Muz4t/GMb6tD3XGfyWv82gJr2caHNfHbNGvdNLfV1aWIz1N9ON X-Received: by 2002:a05:620a:3913:b0:75b:23a1:3686 with SMTP id qr19-20020a05620a391300b0075b23a13686mr12730016qkn.71.1687229868535; Mon, 19 Jun 2023 19:57:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687229868; cv=none; d=google.com; s=arc-20160816; b=0nM/6fSrP5g6OzkHEKl1rz1adx5+vsP8IZnXgsYXE/yH/PUCakLvwKrXGJmfVUSHyi J28eembncO/9T3iy+4uK1MLxI+Ne6G2k+EHfWPA4tSlAR1EGRAvUYDwLPQgeqz4329i1 0DHJ0aRBdQ14wuljSXtqmAsMaNycQqN7DObT+RkKxEONkHsqrykKS9Z50OF+hCGbM7Cb YV4vvHqf2y3xkZPAESbU8LKHSoVTwLsqn3WdH7tWyxg9JJNEgokjbLp/YJLfcczUgiI/ UM7LZk1UFdyoTSlzRlSBsQexi4mlQOy0J6KXOhrcqtaAjV5TKxZhsfWFK5IW1ccoaWww YbOQ== 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=WyVTCXi2M4ockHdssmMw4QkwO3NRemhqMisvdiRWy6A=; b=epbNctSN3gByKCt/F1b3ZWUEak0H7RqE6Is/kyQM4jOR2M/8gQ+Q3vdkLUD//DSZmV WwVH02mTtC14EfHaj99cxogXbXkHoqC2JKLJ4AU6VOwW/J9a2XXfhxKpQf8lEF7GwJ10 Y4+wPoMRNxr/fCZfEKhlJRfyeXmkyskoKwc+PAuXoP/P7EEE24KhSpWb0GxOxR+TkV18 Mi9jw/I7eqIIayYs5Je1RaBsnMwRFSxTu9p7F7bXzq8wJg8OSOSjzToRFhHxXOCadbZ2 OxR6zXioqX+EI6EV6FxWNOrKhMoXHkYciPQSD2p2NB/hGJlVUWN1XaA0rgLCwIzjxxr/ iG9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=RHnFnrXG; 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 n20-20020a17090ade9400b002568322e3d0si968079pjv.34.2023.06.19.19.57.35; Mon, 19 Jun 2023 19:57:48 -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=RHnFnrXG; 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 S229985AbjFTCpo (ORCPT + 99 others); Mon, 19 Jun 2023 22:45:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229690AbjFTCpn (ORCPT ); Mon, 19 Jun 2023 22:45:43 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CBF310C1; Mon, 19 Jun 2023 19:45:41 -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 4QlWG70ZxGz4wgn; Tue, 20 Jun 2023 12:45:34 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1687229136; bh=WyVTCXi2M4ockHdssmMw4QkwO3NRemhqMisvdiRWy6A=; h=Date:From:To:Cc:Subject:From; b=RHnFnrXGv6jrHeCCYLLT7QmdNfBxDnfxOYsAC6v5NgNlHws2YBp+BCYC8kakwhknh qcD2IhTtmgtr+NUFGk/7MW79WyTi/ChfPqq1MHfvAqH9grZdrbFXnih4oioc17m3C3 6FHSALF7xkJn76BUZjXY58JCnyoBb6w7is0HZdbF6roQdgEpVU1+F0ZpzDjdgYdWB6 uQykGa75o8FL8UZcMYOuDpM/uGFiWC5poqIz3ESVvtogPuCra01C6QrNKTPyFK3YXW MOIw6aA4vAnmtg+HN8XIMKadiD8OhfgPxcjWuyjZnYt2oJtUdBxLX5zE08qgn5XitJ MzvxnJNcsmruw== Date: Tue, 20 Jun 2023 12:45:33 +1000 From: Stephen Rothwell To: Anup Patel , Palmer Dabbelt , Paul Walmsley Cc: Andy Chiu , Anup Patel , Greentime Hu , Linux Kernel Mailing List , Linux Next Mailing List , Vincent Chen Subject: linux-next: manual merge of the kvm-riscv tree with the risc-v tree Message-ID: <20230620124533.45c18fee@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?1769188746359800616?= X-GMAIL-MSGID: =?utf-8?q?1769188746359800616?= Hi all, Today's linux-next merge of the kvm-riscv tree got a conflict in: arch/riscv/include/uapi/asm/kvm.h between commit: bf78f1ea6e51 ("riscv: kvm: Add V extension to KVM ISA") from the risc-v tree and commit: 3177011788ee ("RISC-V: KVM: Allow Svnapot extension for Guest/VM") from the kvm-riscv 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/riscv/include/uapi/asm/kvm.h index 855c047e86d4,a1ca18408bbd..000000000000 --- a/arch/riscv/include/uapi/asm/kvm.h