From patchwork Thu Jun  9 00:33:13 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: 12874739
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 61DCBC433EF
	for <kvm@archiver.kernel.org>; Thu,  9 Jun 2022 00:33:29 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S230486AbiFIAd0 (ORCPT <rfc822;kvm@archiver.kernel.org>);
        Wed, 8 Jun 2022 20:33:26 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58716 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S231710AbiFIAdZ (ORCPT <rfc822;kvm@vger.kernel.org>);
        Wed, 8 Jun 2022 20:33:25 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB4D611A28;
        Wed,  8 Jun 2022 17:33:19 -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 4LJQ6z0bVRz4xXD;
        Thu,  9 Jun 2022 10:33:15 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1654734795;
        bh=yGik6OUtan7WWJyZq3UlVKhKyLFGDZiTq/DnPBlfoEM=;
        h=Date:From:To:Cc:Subject:From;
        b=ZasjAYD+Y4Oa11tuMoTPulV4bmIYtWrYftkXI3VOzy8fRuZfuBEBCfeYGxBxN3KrT
         HL70cKLyoq8Dl6SVNpmMpS+m0gyP2GL9URvIXpiaActaMhsil856EFVSazKn0EIIBn
         bJB7UC0Gc7oKX3f+ND9J0pX7SmP98HzYMJC+N7xTY+O1LkOsq7SIbKqbp0QO4wvcMZ
         y5FEQWuxyvgteTO7aK70iwRwUbBDVUqH1W5puioa0tptf5jwbzrQEO+ryjHFEW/q7w
         acX/Sm4CznZahwOMtyYDjxpwig61R8ZdjLDG1V2SE5jh8vZxC/vZ22tlBxV345HABg
         ri43BsAFsNcbQ==
Date: Thu, 9 Jun 2022 10:33:13 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>
Cc: Chenyi Qiang <chenyi.qiang@intel.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Tao Xu <tao3.xu@intel.com>, Xiaoyao Li <xiaoyao.li@intel.com>
Subject: linux-next: manual merge of the kvm tree with Linus' tree
Message-ID: <20220609103313.0f05e4b5@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:

  6cd88243c7e0 ("KVM: x86: do not report a vCPU as preempted outside instruction boundaries")

from Linus' tree and commit:

  2f4073e08f4c ("KVM: VMX: Enable Notify VM exit")

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 2ec6a110ec6c,79efdc19b4c8..000000000000
--- a/arch/x86/kvm/x86.c