From patchwork Mon Oct 30 02:05:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 159464 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp1941929vqb; Sun, 29 Oct 2023 19:05:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHVgcywiITf8p64trM58ZhRHV4b9TElJScQns6gaLh3ROQWX//GZYeeyfcw9ozYDAjQbZzX X-Received: by 2002:a17:90a:7022:b0:274:8949:d834 with SMTP id f31-20020a17090a702200b002748949d834mr4983431pjk.49.1698631529496; Sun, 29 Oct 2023 19:05:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698631529; cv=none; d=google.com; s=arc-20160816; b=giQGRFPAMqAtbr7GCnNNcg7ioAimGxCeg/JZl1zEbM3hoaP8LajME9U9gvwcOuMtni 2CRZjGTnRjfE96gj1Bw8S4nDFKCuS2qxZgM4C+BsdRqK49MwlCjBaiRRnsTOTMrBFWFU Blf0m51/h1vA9aaBxoGLqmnQqZ6ynAib/PL9mtir24VOIYCTu2Lbx529fkfi9RcaAYr9 5M2NmQ6SfW8ThXb3MZE3QHzWim04lKY9xi/39A2cWnfTmbMp7XKY9tIe7j6fzh0mcjlP 8bKH69PLJqjKV7cET7iUSm0wWReHrnmN9X0fGW0NJQxloica1+avsvXmF0fZcB7kgRDD vW/g== 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=52RizNGpmKkqAZFiOEDmBruszolwlq3hzFn8IkpOql0=; fh=iDelXALdRLqHxUnRLHEETwRuyayVwdqRh6fHJvXf6/0=; b=I295u3JfCBFwOhqCKgaze/ArkHlBOXRrPFBdkWbeK79s+rrf2r23k324I4dR2zY2+q +2R6n8GzBlXk2RlYo/YQAn/bwuJDxg2DDRWzfi420nKeviqo6PiCKl8xAMXqN9pUseOB CzO4U8a2c7dzYBC/DzAWoW6RZmPNIMiKvy6F7gdHWJRpPS3Y9yT+x7ekKzZXPeE1WzDI 5Tx40i0z2Sn9il4MYjys1rU24oArrELMEqfKwxyfVSF467woYIwxW75KkSK2T6ORD8vp Q4qwVz0RnNk/TF8QYjBJ9H9AfiCxGOF/oVT6jLkBMSB4DrVlEBHvKKghKsOyngKw1grP GvZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=n8xemMT4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id j12-20020a17090a31cc00b0027d01d450desi4283215pjf.86.2023.10.29.19.05.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 19:05:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=n8xemMT4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (Postfix) with ESMTP id 6641C8096FC3; Sun, 29 Oct 2023 19:05:26 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230059AbjJ3CFM (ORCPT + 31 others); Sun, 29 Oct 2023 22:05:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229510AbjJ3CFL (ORCPT ); Sun, 29 Oct 2023 22:05:11 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 917DFBE; Sun, 29 Oct 2023 19:05:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1698631507; bh=52RizNGpmKkqAZFiOEDmBruszolwlq3hzFn8IkpOql0=; h=Date:From:To:Cc:Subject:From; b=n8xemMT4pznIXJc5bFCpGOAFbnYaYTEcgg04W4//JHXpeuEqndMqF5gbI66eWChSS 2VeA7RhTSZ7PR9OrxGjsuonauQlBK6NF26eIlvBOc+QA1WJ5kuVrh8MbhgWpkJE5ei ZAH0Sx+CHDkzcrTNSHF06qOgMMTOmNYrbPnIT+3mMSQirn0ew7pPFUWT3RlWF5wbIH 0+bve+uNYXJ41HomVvI1JffsuC1Io0HWGK/MsXiZKP60UhAqfXBARyIqa4b/WwFN5C GSb3n1ath3icXFe1Yhe0+5biSDZm3v/uzwWYMclsaNehamnIuyiV3g/vBVTIZbLlO2 Pa8veoKPXopeQ== 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 4SJc6T0CBWz4wd1; Mon, 30 Oct 2023 13:05:04 +1100 (AEDT) Date: Mon, 30 Oct 2023 13:05:04 +1100 From: Stephen Rothwell To: Sean Christopherson , Christoffer Dall , Marc Zyngier Cc: Ackerley Tng , Chao Peng , Isaku Yamahata , Jing Zhang , "Kirill A. Shutemov" , Linux Kernel Mailing List , Linux Next Mailing List , Michael Roth , Oliver Upton , Paolo Bonzini , Yu Zhang Subject: linux-next: manual merge of the kvm-x86 tree with the kvm-arm tree Message-ID: <20231030130504.16f486a2@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 groat.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 (groat.vger.email [0.0.0.0]); Sun, 29 Oct 2023 19:05:26 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781144254752551434 X-GMAIL-MSGID: 1781144254752551434 Hi all, Today's linux-next merge of the kvm-x86 tree got a conflict in: Documentation/virt/kvm/api.rst between commits: 6656cda0f3b2 ("KVM: arm64: Document KVM_ARM_GET_REG_WRITABLE_MASKS") dafa493dd01d ("KVM: arm64: Document vCPU feature selection UAPIs") from the kvm-arm tree and commits: 8e555bf388af ("KVM: Introduce KVM_SET_USER_MEMORY_REGION2") e82df88abb18 ("KVM: Introduce per-page memory attributes") fcbef1e5e5d2 ("KVM: Add KVM_CREATE_GUEST_MEMFD ioctl() for guest-specific backing memory") a2e4643a589a ("KVM: Add transparent hugepage support for dedicated guest 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 Documentation/virt/kvm/api.rst index d75c9a7a7193,205b0c3020c2..000000000000 --- a/Documentation/virt/kvm/api.rst