From patchwork Thu Dec  1 00:14:08 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: 13060841
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 4EA7DC47088
	for <kvm@archiver.kernel.org>; Thu,  1 Dec 2022 00:18:21 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S230140AbiLAASU (ORCPT <rfc822;kvm@archiver.kernel.org>);
        Wed, 30 Nov 2022 19:18:20 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36546 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S230100AbiLAARN (ORCPT <rfc822;kvm@vger.kernel.org>);
        Wed, 30 Nov 2022 19:17:13 -0500
Received: from gandalf.ozlabs.org (mail.ozlabs.org
 [IPv6:2404:9400:2221:ea00::3])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CFA1E99F23;
        Wed, 30 Nov 2022 16:14:14 -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 4NMxQ92HzTz4xN1;
        Thu,  1 Dec 2022 11:14:09 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1669853651;
        bh=WOflUL9wdmBgWPhKgKfZ1BiVppjOCZcEv0oN6Na+PAY=;
        h=Date:From:To:Cc:Subject:From;
        b=o+MC33OCmCIcVlQ4YONnnjWyIaMYaVafTBF0cNtvyd5xO9LjcV/ziSiLrqL0fOQFw
         94mEAz9JyFLxGlMiybB6eQSFA1qcSulGkdZaK5oVoMCT3xwXwRWqiCOlt0qrE/6cHA
         xWRwMqaqnLFrebB2s+KBFwf18dsPwurNP6F1usqrZ7vdAWhw55/kOgnCrr9eXa5+HC
         GO6JMP8BWDxOb/sx9KQnKDXArCvdv5IEXrz3A89yM5fdu+VT2nWh9C9id44IPq5RPW
         jz1Gmd2ZKG6kspsRsOXM5uSKb8OxWXpBJyi0WeUSOs3QuGB6nR39hazJNS5ioDDpUN
         Hw3pMkbB0L8eg==
Date: Thu, 1 Dec 2022 11:14:08 +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: "Chang S. Bae" <chang.seok.bae@intel.com>,
        Dave Hansen <dave.hansen@linux.intel.com>,
        Jiaxi Chen <jiaxi.chen@linux.intel.com>,
        "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the kvm tree with the tip tree
Message-ID: <20221201111408.05e4edaa@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/include/asm/cpufeatures.h

between commit:

  aa387b1b1e66 ("x86: CPUID and CR3/CR4 flags for Linear Address Masking")

from the tip tree and commits:

  6a19d7aa5821 ("x86: KVM: Advertise CMPccXADD CPUID to user space")
  af2872f62254 ("x86: KVM: Advertise AMX-FP16 CPUID to user space")
  5e85c4ebf206 ("x86: KVM: Advertise AVX-IFMA CPUID to user space")

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/include/asm/cpufeatures.h
index 11a0e06362e4,1419c4e04d45..000000000000
--- a/arch/x86/include/asm/cpufeatures.h