From patchwork Thu Nov 10 02:09:20 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: 13038247
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 EB569C4332F
	for <kvm@archiver.kernel.org>; Thu, 10 Nov 2022 02:09:27 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S232375AbiKJCJ0 (ORCPT <rfc822;kvm@archiver.kernel.org>);
        Wed, 9 Nov 2022 21:09:26 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34484 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S231828AbiKJCJZ (ORCPT <rfc822;kvm@vger.kernel.org>);
        Wed, 9 Nov 2022 21:09:25 -0500
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99EAFFAE0;
        Wed,  9 Nov 2022 18:09:24 -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 4N74yn6VjLz4xGT;
        Thu, 10 Nov 2022 13:09:21 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1668046162;
        bh=yYAo6orz4PQyawTZ7XwqSAZd30ekfwNX0vXirxhu7Io=;
        h=Date:From:To:Cc:Subject:From;
        b=uMg7Ib9z5n/UMhs/NawTAZl6UMVnz48f6bIyvSr/lMhfooUcxV2VkwzKxMC3lOqSO
         Z2L7b5rKhAXDPVkkAN9PeIpmBrxmtRXMckShWJXoPVdzHykB81E/uANHunhvgjK33a
         M76qvUfqYL2y43oviV5y8GSmYbceNZNOzYy9MYAw8ZQgf6GT7/fwJUR9h4t2JavKmM
         H7+TG9unPQEtTgCa5l+HhI56vk8yUtrs9UPJ0MlWrFc2GBF2By7dTGN+uuzcis3NXq
         pBtCLrrvP5DLkQQRUJ6aGEUkUSPb4OARI7XR6hlDyJuOgBLThxc9JipXtnf7Je2vNL
         R+DPRtWeAZRtA==
Date: Thu, 10 Nov 2022 13:09:20 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Paolo Bonzini <pbonzini@redhat.com>
Cc: KVM <kvm@vger.kernel.org>,
        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 tip tree with the kvm-fixes tree
Message-ID: <20221110130920.55a7d583@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 tip tree got a conflict in:

  arch/x86/kernel/asm-offsets.c

between commit:

  debc5a1ec0d1 ("KVM: x86: use a separate asm-offsets.c file")

from the kvm-fixes tree and commits:

  c063a217bc07 ("x86/percpu: Move current_top_of_stack next to current_task")
  5d8213864ade ("x86/retbleed: Add SKL return thunk")

from the tip 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/asm-offsets.c
index 437308004ef2,13afdbbee349..000000000000
--- a/arch/x86/kernel/asm-offsets.c