From patchwork Wed Mar 30 23:42:24 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: 12796514
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 D04FDC433F5
	for <kvm@archiver.kernel.org>; Wed, 30 Mar 2022 23:42:32 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1351822AbiC3XoQ (ORCPT <rfc822;kvm@archiver.kernel.org>);
        Wed, 30 Mar 2022 19:44:16 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45770 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S234233AbiC3XoO (ORCPT <rfc822;kvm@vger.kernel.org>);
        Wed, 30 Mar 2022 19:44:14 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE50C5A094;
        Wed, 30 Mar 2022 16:42:27 -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 4KTNJd5vsyz4x7X;
        Thu, 31 Mar 2022 10:42:25 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1648683746;
        bh=RivFaA1EdxuYaOBnxyzYnCLAZKxrTkZ/IYD7drusmdM=;
        h=Date:From:To:Cc:Subject:From;
        b=DiXQw0nxunAhLjOGin7ZVRFIjXWkhnhnFLmWWkj4Q2VdNY/9LncViUQ2xUD9EUlTM
         YS5fyRq3GYWe6frxqElJBPjZsxyc0oC4DXJvxL78LPu811JQmRPJf+nFwFMUQ0ssSO
         NBpahNK+3rkEyxcVtYobCLmMchXxvxopm756na7WDyXgY2Avj3h7rVhf+mFQVt5csH
         Uf3q7Mn4g7HOSHLpFHII/wDIJJUCEFOYOuOC/CLlT8dVAQKUuKwupcw7y+nIKR/nYO
         rnv/V/DcIL5zju+4dqyyLESqNK3beSJyQPHCwyclM2MNzXtRDXxRy/oZbBPEOoCxXZ
         8rhr5sxDtLOlg==
Date: Thu, 31 Mar 2022 10:42:24 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>
Cc: Li RongQing <lirongqing@baidu.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        "Peter Zijlstra (Intel)" <peterz@infradead.org>
Subject: linux-next: manual merge of the kvm tree with Linus' tree
Message-ID: <20220331104224.665e456b@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/kernel/kvm.c

between commit:

  c3b037917c6a ("x86/ibt,paravirt: Sprinkle ENDBR")

from Linus' tree and commit:

  8c5649e00e00 ("KVM: x86: Support the vCPU preemption check with nopvspin and realtime hint")

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/kernel/kvm.c
index 79e0b8d63ffa,21933095a10e..000000000000
--- a/arch/x86/kernel/kvm.c