From patchwork Fri May 13 03:53:33 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: 12848343
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 18847C433FE
	for <kvm@archiver.kernel.org>; Fri, 13 May 2022 03:53:45 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1376828AbiEMDxn (ORCPT <rfc822;kvm@archiver.kernel.org>);
        Thu, 12 May 2022 23:53:43 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57944 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1347440AbiEMDxl (ORCPT <rfc822;kvm@vger.kernel.org>);
        Thu, 12 May 2022 23:53:41 -0400
Received: from gandalf.ozlabs.org (mail.ozlabs.org
 [IPv6:2404:9400:2221:ea00::3])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B042D663C1;
        Thu, 12 May 2022 20:53:37 -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 4KzvrZ4rXHz4xXH;
        Fri, 13 May 2022 13:53:34 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1652414016;
        bh=n54DZblynk0VLimaT4qwoyLi4hiRgpE+b2L0ESdGaHM=;
        h=Date:From:To:Cc:Subject:From;
        b=sLBt/6U8CGhSm31XnTRHMBl1iTWZ8GGU9isT69jNUTFCYKmwfOFTE8YFMvg04484Z
         T1XE2yj6zofXyCDpRXY0yAG7Fchmey6cZXc2+6++HEJpT94OQN+DbnuiPeZRZX2zLc
         u699hzn6+42NxpwPifsJmKi1YcP8PXLDg8e0FFsHZWrmZFUU4cLrGqC3/bxTHnSAsb
         cB3+NgwOfcMNfhPsFFkEk4XklQ1TBPq2905keOywO9iqAbDr0G3B9L/6g5daWy5Edx
         K8Ho/KbEQ/1InZRzzV+HLUW1DY41RyMVOQ0PBXgXyCXaN5rAOLVbs63NDeKR4OjpQy
         m1+lJHjKAkMcg==
Date: Fri, 13 May 2022 13:53:33 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>
Cc: Like Xu <like.xu@linux.intel.com>, Like Xu <likexu@tencent.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the kvm tree with Linus' tree
Message-ID: <20220513135333.7424c1c8@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/pmu.h

between commit:

  75189d1de1b3 ("KVM: x86/pmu: Update AMD PMC sample period to fix guest NMI-watchdog")

from Linus' tree and commits:

  a10cabf6815c ("KVM: x86/pmu: Move pmc_speculative_in_use() to arch/x86/kvm/pmu.h")
  8eeac7e999e8 ("KVM: x86/pmu: Add kvm_pmu_cap to optimize perf_get_x86_pmu_capability")

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/pmu.h
index 22992b049d38,dbf4c83519a4..000000000000
--- a/arch/x86/kvm/pmu.h