From patchwork Thu Oct 21 02:39:31 2021
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: 12573655
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 mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 2A7AFC433EF
	for <kvm@archiver.kernel.org>; Thu, 21 Oct 2021 02:39:38 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id F37FE611F2
	for <kvm@archiver.kernel.org>; Thu, 21 Oct 2021 02:39:37 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S230351AbhJUClv (ORCPT <rfc822;kvm@archiver.kernel.org>);
        Wed, 20 Oct 2021 22:41:51 -0400
Received: from gandalf.ozlabs.org ([150.107.74.76]:44987 "EHLO
        gandalf.ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229842AbhJUClv (ORCPT <rfc822;kvm@vger.kernel.org>);
        Wed, 20 Oct 2021 22:41:51 -0400
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 4HZWsK2Q6yz4xbR;
        Thu, 21 Oct 2021 13:39:33 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1634783974;
        bh=+YyK2gDFC5pqxheqkppYraxAoWcWTs5ApJx+siznQCA=;
        h=Date:From:To:Cc:Subject:From;
        b=aOu1rVLY8PczP6jaNaEL2OlgAf3P9/Ton1QIJrYym+HqdNHcZJLqvkf3G3lfpo9Rv
         LKA/D/oSxAC263a/A5zrictSLAwftvYDxVTKiodOgC3IYdS1pD5+gwXA8BC4AoXQ7u
         u+u9EyObG5DKEBoE6wBhD3tJCM2bLBVQGb3Vavr5E1qcieEQR0KLLfwIBQtfUaU8R6
         VZU2hS6Rjf3rloxA+NRP1cqvc/4XVylgyp4YWQamDWjZhCbbJpmPuXRn4xoMxJ9Le9
         2ODbyd5xFitKLygz61/1Pji3zVQaSGd65yhp0HJhCqic7CUEaM4C1yQUcaCZxHN2Du
         HzB3O34vAbQwQ==
Date: Thu, 21 Oct 2021 13:39:31 +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: Borislav Petkov <bp@suse.de>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Sean Christopherson <seanjc@google.com>
Subject: linux-next: manual merge of the kvm tree with the tip tree
Message-ID: <20211021133931.1a0e096b@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:

  126fe0401883 ("x86/fpu: Cleanup xstate xcomp_bv initialization")

from the tip tree and commits:

  5ebbc470d7f3 ("KVM: x86: Remove defunct setting of CR0.ET for guests during vCPU create")
  e8f65b9bb483 ("KVM: x86: Remove defunct setting of XCR0 for guest during vCPU create")
  583d369b36a9 ("KVM: x86: Fold fx_init() into kvm_arch_vcpu_create()")

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 04350680b649,3ea4f6ef2474..000000000000
--- a/arch/x86/kvm/x86.c