From patchwork Thu Dec  1 00:18:31 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: 13060842
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 227D1C47088
	for <kvm@archiver.kernel.org>; Thu,  1 Dec 2022 00:20:45 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S229755AbiLAAUn (ORCPT <rfc822;kvm@archiver.kernel.org>);
        Wed, 30 Nov 2022 19:20:43 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36428 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229468AbiLAAUV (ORCPT <rfc822;kvm@vger.kernel.org>);
        Wed, 30 Nov 2022 19:20:21 -0500
Received: from gandalf.ozlabs.org (mail.ozlabs.org
 [IPv6:2404:9400:2221:ea00::3])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 134819FA9F;
        Wed, 30 Nov 2022 16:18:34 -0800 (PST)
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 4NMxWD1rmrz4xN4;
        Thu,  1 Dec 2022 11:18:32 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1669853912;
        bh=DHXAAR9V23iPaeDoT3PCmOyGLtauQGzTbCFlJUi4dSo=;
        h=Date:From:To:Cc:Subject:From;
        b=LRuZjUK7ns2IL9SKOPyEDwCs2RR+EeYt9chgJHnUbD+Zr2lGrxqEZ+8KEqk6cX4j7
         FCuyFVaVaJKzm1ZfHiy1Gg5rdF/IKe8eqRzLq+dpS6jGvvLAsOZfGhC5YeWgMW09gv
         z5SF2NIgT/oFSHqSFYGkcGDE5RfLX9hZyOmdvGfxXTBFUPHBKkF+UQ6JdcqqrfcZYu
         GCUQBHpYp7Q4M1oumXYmfJpEJ29yYCAWTuAZFVPB9IVA7UdY4n8u8swYZ2QXfpSXh5
         +xYANEpp4qf2pEOe64SSosx8dEQwRkchNEa3SEP6Ie6ZX4S3rTpvMOpVXGG1X6gAUU
         +Sxe/i7JadPjg==
Date: Thu, 1 Dec 2022 11:18: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: Dave Hansen <dave.hansen@linux.intel.com>,
        Kai Huang <kai.huang@intel.com>,
        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: <20221201111831.1d90feec@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/cpuid.c

between commit:

  16a7fe3728a8 ("KVM/VMX: Allow exposing EDECCSSA user leaf function to KVM guest")

from the tip tree and commit:

  047c72299061 ("KVM: x86: Update KVM-only leaf handling to allow for 100% KVM-only leafs")

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/cpuid.c
index c92c49a0b35b,723502181a3a..000000000000
--- a/arch/x86/kvm/cpuid.c