From patchwork Mon Jan 10 02:16:42 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: 12708127
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 5F1ADC4332F
	for <kvm@archiver.kernel.org>; Mon, 10 Jan 2022 02:16:52 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S238174AbiAJCQs (ORCPT <rfc822;kvm@archiver.kernel.org>);
        Sun, 9 Jan 2022 21:16:48 -0500
Received: from gandalf.ozlabs.org ([150.107.74.76]:40119 "EHLO
        gandalf.ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S234152AbiAJCQr (ORCPT <rfc822;kvm@vger.kernel.org>);
        Sun, 9 Jan 2022 21:16:47 -0500
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 4JXHWb5gCRz4xtf;
        Mon, 10 Jan 2022 13:16:43 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1641781006;
        bh=6+f18ZytRVV6ZaJN651JtsXZrQaqFJ8HTPPIaAtVkGI=;
        h=Date:From:To:Cc:Subject:From;
        b=seJzmcEXPNZgKSMfYSq70ONkvm4sLqPw+0xeRCbbD/e286IrAz0FZmfGce0TR/cwy
         n7wo6wnOKjzMMlsQoDDsE25oIAFSZqYrVbARitylvV+bLL8XCqSJXc/mi9tI9/Jz4H
         z7uDkRY2kGeovu2NXVJNQ8kJzGz7lWMpk1rBTyIIABiIcJ7+a9g5sxJx6JtKvHulBu
         oUCNQRRd1UFBThvQ0jCjZIN1ZLotJTSLCB8Ctvs7ljeDPqJ9zd+vqGxiN4Lr2f0uwB
         Um36ul3M7VDtvWqNNvjOtrOXGWrsvZGo/Rwb4hTdlavQ9oPh5TTqcfNok1jAUTnYBC
         sLpKkueEnVn9w==
Date: Mon, 10 Jan 2022 13:16:42 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>,
        Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.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>,
        Sean Christopherson <seanjc@google.com>,
        Zhu Lingshan <lingshan.zhu@intel.com>
Subject: linux-next: manual merge of the kvm tree with the tip tree
Message-ID: <20220110131642.75375b09@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.c

between commits:

  b9f5621c9547 ("perf/core: Rework guest callbacks to prepare for static_call support")
  73cd107b9685 ("KVM: x86: Drop current_vcpu for kvm_running_vcpu + kvm_arch_vcpu variable")

from the tip tree and commit:

  40ccb96d5483 ("KVM: x86/pmu: Add pmc->intr to refactor kvm_perf_overflow{_intr}()")

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.c
index 0c2133eb4cf6,8abdadb7e22a..000000000000
--- a/arch/x86/kvm/pmu.c