From patchwork Mon Oct 30 02:11: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: 159466 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp1943748vqb; Sun, 29 Oct 2023 19:12:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFtMLTUgupF95nl6kJuZSufIhj4nVN3sl/kK3Y70CkiSeDDx+FG9Rn/a7P6at2pN+ue6hAg X-Received: by 2002:a17:902:c783:b0:1cc:3daa:d368 with SMTP id w3-20020a170902c78300b001cc3daad368mr1631967pla.65.1698631920879; Sun, 29 Oct 2023 19:12:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698631920; cv=none; d=google.com; s=arc-20160816; b=tDrYfy8bRRjE5O4ARuXLQhqzOjpL8vPZydF3ZjwUaQVwSjSH3GzR2+CeL20HSG0/vM mevU8KbcoPI7ILBd0UC8cneRRYXBkdvIpteVFkEJ+HXNXhUR1Hc4cmM2oQZgGiv0Fpq9 TZSf8NusoMg+Ev9sf092yeZELM32sOccSzXbGuV+eDjfnPIbJiCZLnn2yOjNrOQAWct4 7cXVEICk46ytwZ0FbBdl8WbucNPFCaltPNDesL2jh8J1mcFK8M40rhKV/3PRLNbly5gZ IP73/MncD9/i4VLJkx3TkrjNzxN/zzO4D/Hw+T6eVFrATn1vMrtm9AsjM+J1vi9XLLqz VR6Q== 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=Zg+6p8Hbrzqr5Y/RcCEa316dOJl3zufMPpyqbOtROy0=; fh=OvbyccmmS0ma5SZkAU6I7sed5cZZgKcdVmy024HcV1k=; b=jniNspwS7Z4PCxgYji8BA5mE0JtjHa7OFdYe3A9XAmjR71XkFDyWosP0q/ijUq5Sr9 cxrEZxYdoGmhE8UU0Ou0v8OLqEeka2eMHRa1OfMgFDK1jmim/v5g8Rh+25nRcGMh5XQp +aR/f0AwkTiYSSA7aslHjvGlHNnjSCgTLKrYYt8qY63pejLlBON1P8iJmEE4jkXFrIAl TBZCsNXjQmb5aT/wxNE2J01NLL/NgKkx5rqATwSn2waZQwNsZjN1SzCkKJGRWK9dXB+0 ERFebPUACbCTAGZIdo/4EtD3yYMaRa1kebJDcr0pID+eT3cfdArwbkijwbv5K0rzsbO5 0I5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=C6E9XV7n; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id z12-20020a170903018c00b001cc50f67fd9si543218plg.511.2023.10.29.19.12.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 19:12:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=C6E9XV7n; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 5BA338054BC1; Sun, 29 Oct 2023 19:11:58 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230331AbjJ3CLg (ORCPT + 31 others); Sun, 29 Oct 2023 22:11:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229569AbjJ3CLf (ORCPT ); Sun, 29 Oct 2023 22:11:35 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61EDDC0; Sun, 29 Oct 2023 19:11:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1698631891; bh=Zg+6p8Hbrzqr5Y/RcCEa316dOJl3zufMPpyqbOtROy0=; h=Date:From:To:Cc:Subject:From; b=C6E9XV7nKvHEnIRyv6AEXHkwjbhcDDrzpE6/baSGChIeXH7Y10N/5+1FHCdQw/8on jSb6yJn25wpDgbFTc0dPPHDveJm4nZKz52q+Wjz3n4N8kP5LWkFJwSvtCTWk660+qD uU2lGDud6sV+6EOzzk9gKgLMlfDkWV47tHvO9/H+lvoL4PkTqyzVPPMgeE2EJeoh58 GP++lXgJ9UvV5wq0/F+bPhbZ6/mYq1svLC7Hr0sBQOYh2lS/gq6RPz4ty5AO00crqG eBF8b6ZYbgirP2wYrfQkUpMMBVht8ntLH2qeU85k2kmb1DyKis5a+nE8Va3rGgvMie lCM4xaJbO0fFQ== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4SJcFr6Wsdz4wcX; Mon, 30 Oct 2023 13:11:28 +1100 (AEDT) Date: Mon, 30 Oct 2023 13:11:27 +1100 From: Stephen Rothwell To: Sean Christopherson , Christoffer Dall , Marc Zyngier , Huacai Chen Cc: Ackerley Tng , Chao Peng , Huacai Chen , Isaku Yamahata , Jing Zhang , "Kirill A. Shutemov" , Linux Kernel Mailing List , Linux Next Mailing List , Michael Roth , Oliver Upton , Paolo Bonzini , Tianrui Zhao , Yu Zhang Subject: linux-next: manual merge of the kvm-x86 tree with the loongarch, kvm-arm trees Message-ID: <20231030131127.214b979e@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Sun, 29 Oct 2023 19:11:58 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781144664944733252 X-GMAIL-MSGID: 1781144664944733252 Hi all, Today's linux-next merge of the kvm-x86 tree got a conflict in: include/uapi/linux/kvm.h between commits: b37e6b680e3a ("LoongArch: KVM: Add kvm related header files") 3f9cd0ca8484 ("KVM: arm64: Allow userspace to get the writable masks for feature ID registers") from the loongarch, kvm-arm trees and commits: 8e555bf388af ("KVM: Introduce KVM_SET_USER_MEMORY_REGION2") 3291e34c9986 ("KVM: Add KVM_EXIT_MEMORY_FAULT exit to report faults to userspace") e82df88abb18 ("KVM: Introduce per-page memory attributes") fcbef1e5e5d2 ("KVM: Add KVM_CREATE_GUEST_MEMFD ioctl() for guest-specific backing memory") 7e63404f9cd5 ("KVM: x86: Add support for "protected VMs" that can utilize private memory") from the kvm-x86 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 include/uapi/linux/kvm.h index 211b86de35ac,5b5820d19e71..000000000000 --- a/include/uapi/linux/kvm.h