From patchwork Wed Jul 13 06:02:38 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: 12916014
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 192B4C433EF
	for <kvm@archiver.kernel.org>; Wed, 13 Jul 2022 06:02:50 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S234107AbiGMGCt (ORCPT <rfc822;kvm@archiver.kernel.org>);
        Wed, 13 Jul 2022 02:02:49 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41224 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S230445AbiGMGCr (ORCPT <rfc822;kvm@vger.kernel.org>);
        Wed, 13 Jul 2022 02:02:47 -0400
Received: from gandalf.ozlabs.org (mail.ozlabs.org
 [IPv6:2404:9400:2221:ea00::3])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01D4A5006E;
        Tue, 12 Jul 2022 23:02:45 -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 4LjRqM46T0z4xZD;
        Wed, 13 Jul 2022 16:02:39 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1657692161;
        bh=EizAc07LAFfcO/KRLoZZdNMjii3lpN/aMpY4/BYi71I=;
        h=Date:From:To:Cc:Subject:From;
        b=nNM3gYhOqPb3sxn1bPbCGSeQDRc8ldfgQK7wbOYaSpF66lw/0IoOLngiXwcbvUNlX
         xJRXIHnRv0AexotmDeromG7WpZ7wGgB/0rTjLOEnTsoHDZzUbqJ1fRuaujX7fm2BRZ
         L777q77MG91LM7WF01t5c7O0I+wFjTZU7KKJWslEoaCTo/OJxwHzPJfq1jGlZvlRGm
         Ss5rIahSmijIw2omG21xDzD8vIlVou41oBBtU2v4b2V0+ZyIaCZBvA3ETHZtThfCOV
         518cq0iJN7RNQbWMZoCtnV/QBvDVsuqQtOd48U300ANTEEknxeXhSnN2qSTq/J5S0t
         sxNKDtzmjJwGw==
Date: Wed, 13 Jul 2022 16:02:38 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>
Cc: Borislav Petkov <bp@suse.de>, Josh Poimboeuf <jpoimboe@kernel.org>,
        Kan Liang <kan.liang@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>,
        Luwei Kang <luwei.kang@intel.com>,
        "Peter Zijlstra (Intel)" <peterz@infradead.org>
Subject: linux-next: manual merge of the kvm tree with Linus' tree
Message-ID: <20220713160238.3bfcdb26@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/vmx/capabilities.h

between commit:

  07853adc29a0 ("KVM: VMX: Prevent RSB underflow before vmenter")

from Linus' tree and commits:

  cf8e55fe50df ("KVM: x86/pmu: Expose CPUIDs feature bits PDCM, DS, DTES64")
  6ef25aa0a961 ("KVM: x86/pmu: Restrict advanced features based on module enable_pmu")

from the kvm tree.

I didn't know if the new includes needed to be prefixed with "../"
as well ... I though it was better safe than sorry.

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/vmx/capabilities.h
index c0e24826a86f,069d8d298e1d..000000000000
--- a/arch/x86/kvm/vmx/capabilities.h