From patchwork Mon Jun 19 02:33:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 109709 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2745363vqr; Sun, 18 Jun 2023 20:03:27 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5lJycZceGLXq0YjfAYrTd24qeK/za/Fp1v5eiip9PaCLQXNiCD+xwjHt1GkrjrS7P2XQje X-Received: by 2002:a17:902:da81:b0:1ae:4562:14f1 with SMTP id j1-20020a170902da8100b001ae456214f1mr5479292plx.9.1687143807241; Sun, 18 Jun 2023 20:03:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687143807; cv=none; d=google.com; s=arc-20160816; b=AV1USy85jzpQ/gyKKM3jtVOf7h7Qel/IGc1JMOTX7mVzlgfW4pARmnHHGIyq5bdyE6 5pZqBOxMEbDv/ZASXnMaB6XL/hblZIYJXznpNUTSvJTju04Af/YTTP+nZtHHq1jk6N6n xhxnO+as8xNN5MIa1Jb4bEvLIPQQnS+ShQWgRP82YNjErVdhAqHpHDU/0Z2SFu2EaCla uNgBl/GQ1YKtKVG9XxRR+v8oRwywyorOfyaVrD6OGIqgRWsz1P3t0oSnfMmkvGKnC32r ERGOz3sJupzRus636JE1Ogc9ON4IOZfA2E7wNqyoYym/uTVnok+HlH61VAWLiHRIN1DV 9X0w== 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=t1l5GS/PuRN5cARlTbwzxa0sSs/zfPxD2hxKuKE13R8=; b=SpxTFym30nWHiFItcLKJ8ujyNxREw7sh6QW+8nburp4Fc/ZkcuHCazh2ofsZyfKqRv IzHkPnDpmKni5aRA9uXoduOJbx+paJwm4jLHn82v/W6grJfSJJO1xCLG6SQdpPj3LGIk FFhE+X3IYQysE9qgwLPemewWvnA4EhCZuwCnb/ld/FqBzlAbdOwyQcHaDcDn6N0xXAvK YnIEbi4PpFjjgaS1L4Qwkg4ox+d+dWBLIdnOk637PNP5HoujUp6r/5idXMLU/aMnCfIn Bo9RKBiE4WMNA40xeiykhDPCK0BfMyYqG1vSuc3vJaW988hKTOB/AMnhVG7Yz/3dcT0U IByw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=BYfTRHJf; 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 e16-20020a17090301d000b001b1ac20dbb1si6315709plh.400.2023.06.18.20.03.14; Sun, 18 Jun 2023 20:03:27 -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=BYfTRHJf; 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 S229785AbjFSCdL (ORCPT + 99 others); Sun, 18 Jun 2023 22:33:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52126 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229567AbjFSCdK (ORCPT ); Sun, 18 Jun 2023 22:33:10 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 804EE1B4; Sun, 18 Jun 2023 19:33:07 -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 4Qkv2601YXz4x0B; Mon, 19 Jun 2023 12:33:01 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1687141986; bh=t1l5GS/PuRN5cARlTbwzxa0sSs/zfPxD2hxKuKE13R8=; h=Date:From:To:Cc:Subject:From; b=BYfTRHJf+D2B56AZEtGjrO0GQ1RRFdocYxpx1ZoDpDKIVIhsKpkJB/h+LoEM9IwwO k0uqOMDCgsdnk6/EoEKBaVAuRneQDf3W5+naUpR3T8RoVe2YKc8O4me5kQEJM7MROm /ImsbdV8kSYhohDTkHnqlzJOXGdlpu0JI7kjHwq6wU8196InqEZATPxYkO1WRaqdkV rgKLNgFzo0jyhrzFFwboXjhu4q094MgA+oi+EDJcBlR4tm+l4LqkeyWjYW+DGe10ho dmM1WEApDtMWtuLkcil9f2RnjobJKlJM9/r4XuFPP4lbanFMTI9XKoOiYS84O5/+QE FevfzoiBXczrg== Date: Mon, 19 Jun 2023 12:33:00 +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 , Palmer Dabbelt , Vincent Chen Subject: linux-next: manual merge of the kvm-riscv tree with the risc-v tree Message-ID: <20230619123300.389e3dc9@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?1769098504717636260?= X-GMAIL-MSGID: =?utf-8?q?1769098504717636260?= 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: 0f4b82579716 ("riscv: KVM: Add vector lazy save/restore support") from the risc-v tree and commits: 00f918f61c56 ("RISC-V: KVM: Skeletal in-kernel AIA irqchip support") 89d01306e34d ("RISC-V: KVM: Implement device interface for AIA irqchip") 289a007b98b0 ("RISC-V: KVM: Expose APLIC registers as attributes of AIA irqchip") 4fe9eadad83b ("RISC-V: KVM: Expose IMSIC registers as attributes of AIA irqchip") 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,61d7fecc4899..000000000000 --- a/arch/riscv/include/uapi/asm/kvm.h