From patchwork Wed Apr 13 02:34:14 2022
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Stephen Rothwell <sfr@canb.auug.org.au>
X-Patchwork-Id: 12811393
Return-Path: <kvm-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 44C83C433EF
	for <kvm@archiver.kernel.org>; Wed, 13 Apr 2022 02:34:20 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S231157AbiDMCgh (ORCPT <rfc822;kvm@archiver.kernel.org>);
        Tue, 12 Apr 2022 22:36:37 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53884 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229497AbiDMCgg (ORCPT <rfc822;kvm@vger.kernel.org>);
        Tue, 12 Apr 2022 22:36:36 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B0D89DC6;
        Tue, 12 Apr 2022 19:34:16 -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 4KdRVv0DDjz4xLQ;
        Wed, 13 Apr 2022 12:34:14 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1649817255;
        bh=Gg/b6OBoVPLkyC8Zt70CWjXEHj+DMMNe3GomLkFFDrA=;
        h=Date:From:To:Cc:Subject:From;
        b=csIkXQc7BuexSkhqpvxKQBeIJJf5EP7cKPsfoKwdmWEcTbQYEmQsaS/ThabpHzNee
         S3HD7jmhf2fbybxoC2Z17w6Bc1ZL9OC3bMlXDn2KHnFhldzgfn2ey1k4o8otQfgO3O
         moqC+Gb9H/RV5epQTJzohx4pCoYt7QYiAVeqN6ZyiYmjSf30yqyZinGSWpk8o0wO7D
         fNYA81bHPJ2FQCxwA8kS0bC0lg+NMUJtRMduHb2riR4mPlL5Vq8YCM9el+EKcmgGI5
         AaPvn+2oiG9gWa36MwJMFN+gUnhJNCBpWiY8DXs0loHpD1ZEuWbd1IJgYx0wNb5Roi
         pndXp05NWa6/A==
Date: Wed, 13 Apr 2022 12:34:14 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>
Cc: David Woodhouse <dwmw@amazon.co.uk>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Vitaly Kuznetsov <vkuznets@redhat.com>
Subject: linux-next: manual merge of the kvm tree with the kvm-fixes tree
Message-ID: <20220413123414.01119890@canb.auug.org.au>
MIME-Version: 1.0
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org

Hi all,

Today's linux-next merge of the kvm tree got a conflict in:

  arch/x86/kvm/x86.c

between commit:

  42dcbe7d8bac ("KVM: x86: hyper-v: Avoid writing to TSC page without an active vCPU")

from the kvm-fixes tree and commits:

  916d3608df82 ("KVM: x86: Use gfn_to_pfn_cache for pv_time")
  7caf9571563e ("KVM: x86/xen: Use gfn_to_pfn_cache for vcpu_info")
  69d413cfcf77 ("KVM: x86/xen: Use gfn_to_pfn_cache for vcpu_time_info")

from the kvm 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/x86/kvm/x86.c
index 547ba00ef64f,7a066cf92692..000000000000
--- a/arch/x86/kvm/x86.c