From patchwork Fri Dec 17 04:19:02 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: 12683611
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 6E6BFC433FE
	for <kvm@archiver.kernel.org>; Fri, 17 Dec 2021 04:19:08 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S232616AbhLQETG (ORCPT <rfc822;kvm@archiver.kernel.org>);
        Thu, 16 Dec 2021 23:19:06 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44428 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229874AbhLQETF (ORCPT <rfc822;kvm@vger.kernel.org>);
        Thu, 16 Dec 2021 23:19:05 -0500
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org
 [IPv6:2404:9400:2:0:216:3eff:fee2:21ea])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4556BC061574;
        Thu, 16 Dec 2021 20:19:05 -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 4JFbMq3bGSz4xd4;
        Fri, 17 Dec 2021 15:19:02 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1639714743;
        bh=yp0Ur0rx7YNSHB/zptC4hYpq036nZ3WtqihqjHB1tGs=;
        h=Date:From:To:Cc:Subject:From;
        b=ssC4Rr3KiYVZ7xbm9EV7NgpDdNvK8mLuC9HXi2LWzue7+FZRSiuzhOflmdg8/RIoP
         yEAoF2P/HlVOjl8fSbwh4tBpLKTvEweA+Js42kmHwWqXgEg3nnd0iZMwhsBnLPZDMO
         wdGBwuJr1+sfToaUTLhkDj1QcB96iWLAu2orZ8AnU3btGrIDkVpfqULoPgeFObnYnD
         VadSCEX5Eup0CJXD8cG3KhJy6itFP34leo05AY+e0A7aLeb+z/LbH7VXGjzF5ADonK
         CIzGB0ZJfZe+9IP0U6stMiSjgiPF65K4V7qlj+ppg/0VlCMgdLTtuoYcq6/tQwSjMO
         Zcj/Awh86mftQ==
Date: Fri, 17 Dec 2021 15:19:02 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christoffer Dall <cdall@cs.columbia.edu>,
        Marc Zyngier <maz@kernel.org>,
        Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Quentin Perret <qperret@google.com>
Subject: linux-next: manual merge of the kvm-arm tree with the kvm tree
Message-ID: <20211217151902.2ae43d1f@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-arm tree got a conflict in:

  arch/arm64/kvm/arm.c

between commit:

  27592ae8dbe4 ("KVM: Move wiping of the kvm->vcpus array to common code")

from the kvm tree and commit:

  52b28657ebd7 ("KVM: arm64: pkvm: Unshare guest structs during teardown")

from the kvm-arm 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/arm64/kvm/arm.c
index 7385bbdfdc42,6057f3c5aafe..000000000000
--- a/arch/arm64/kvm/arm.c