From patchwork Wed Jun 23 05:53:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12339013 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 96430C48BC2 for ; Wed, 23 Jun 2021 05:54:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7DB0F6120D for ; Wed, 23 Jun 2021 05:54:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229818AbhFWF4Q (ORCPT ); Wed, 23 Jun 2021 01:56:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55702 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229660AbhFWF4P (ORCPT ); Wed, 23 Jun 2021 01:56:15 -0400 Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F2D6EC061574; Tue, 22 Jun 2021 22:53:57 -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 4G8srz1kbJz9sVm; Wed, 23 Jun 2021 15:53:54 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1624427635; bh=Ve6HXVCvVXXFe6dLof+5dJ02Hlr9UcoY4clXXI/pLAs=; h=Date:From:To:Cc:Subject:From; b=imqBoRFGu3YPrZ7Bz1xwStLbCrJLbj8XrvN968C3eB8gNMCVJMWbd2XSblTaTSrzg MQ1fMaUU5kOIoH/IInCgXXFk0jrCePMj0lYOo8/0oQ21mHCnvRr9TlQCgE6OrvTBNs AnhehArd5bmNw0CjRLCAgIo1ab8Ge01V0MzzRIEVqL2YzrfFTK2ggkpsllzP3IagTo K4GLSixbgEjIiiuUoDkNI7vrksbnETACfqUloNhSIxaYuHhk/RDY4d/Vsy75FaiQIp qLjxx/h2C2U/vz7l+XdQXuGkZTW50nSM06G4Tni4CvG2VMW3OD3Jryl4h9iF2XJVz8 1q9NqAzA0t+EQ== Date: Wed, 23 Jun 2021 15:53:53 +1000 From: Stephen Rothwell To: Christoffer Dall , Marc Zyngier , Paolo Bonzini , KVM Cc: Linux Kernel Mailing List , Linux Next Mailing List , Maxim Levitsky , Steven Price Subject: linux-next: manual merge of the kvm-arm tree with the kvm tree Message-ID: <20210623155353.466ff149@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: 6dba94035203 ("KVM: x86: Introduce KVM_GET_SREGS2 / KVM_SET_SREGS2") 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 ef81de1d4a9b,97661a97943f..000000000000 --- a/Documentation/virt/kvm/api.rst