From patchwork Fri Jun 25 05:15:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12343607 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 633D8C48BC2 for ; Fri, 25 Jun 2021 05:15:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3BF1761423 for ; Fri, 25 Jun 2021 05:15:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230359AbhFYFRi (ORCPT ); Fri, 25 Jun 2021 01:17:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45128 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230097AbhFYFRh (ORCPT ); Fri, 25 Jun 2021 01:17:37 -0400 Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4FD25C061574; Thu, 24 Jun 2021 22:15:17 -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 4GB4vN6kRCz9sWw; Fri, 25 Jun 2021 15:15:12 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1624598113; bh=n4nmdvprxAbipxGmyKseNuAj2NmWFpDgkSLoT8FEcBA=; h=Date:From:To:Cc:Subject:From; b=lGYhwFg4Dr629JPLRDZJgD5AE984VPYZXbkqQOgo9VRehyqYQKoNj/HL3kooNVG/E b9ovJJBGXfPlkvfKBw5B1zkyirlYQTs0i8iG1J8g0DHBnhgDhcMH256vcgf6ae3bbJ Vt8nek/1gGZWqSshN5BJ7iYxg1FC0yLKGA2iQ8WrvMs1QXpioPTIyzn6v3llpTT36X kFKD6SFeJslby7vcJsP6n3epCKneG4xeFPHW9xCVKmL6fK1CNmGmKPNTs/BdZkOJdx iLA3bNtjh3QHm5wWvZYDSQkL09WXRxAe91RDj3UD/umJGh1odcjZAigJEWEXxxxGh0 xhQyIOBFDl+3A== Date: Fri, 25 Jun 2021 15:15:11 +1000 From: Stephen Rothwell To: Christoffer Dall , Marc Zyngier , Paolo Bonzini , KVM Cc: Jing Zhang , Linux Kernel Mailing List , Linux Next Mailing List , Steven Price Subject: linux-next: manual merge of the kvm-arm tree with the kvm tree Message-ID: <20210625151511.270c1611@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in: Documentation/virt/kvm/api.rst between commit: fdc09ddd4064 ("KVM: stats: Add documentation for binary statistics interface") from the kvm tree and commit: 04c02c201d7e ("KVM: arm64: Document MTE capability and ioctl") 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 Documentation/virt/kvm/api.rst index aba27461edec,97661a97943f..000000000000 --- a/Documentation/virt/kvm/api.rst