From patchwork Mon Jul 13 04:40:36 2020
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: 11658681
Return-Path: <SRS0=/1XX=AY=vger.kernel.org=kvm-owner@kernel.org>
Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org
 [172.30.200.123])
	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9681F13B4
	for <patchwork-kvm@patchwork.kernel.org>;
 Mon, 13 Jul 2020 04:40:44 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 7E6ED2068F
	for <patchwork-kvm@patchwork.kernel.org>;
 Mon, 13 Jul 2020 04:40:44 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au
 header.b="Ds5dBXJl"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728540AbgGMEkl (ORCPT
        <rfc822;patchwork-kvm@patchwork.kernel.org>);
        Mon, 13 Jul 2020 00:40:41 -0400
Received: from bilbo.ozlabs.org ([203.11.71.1]:32959 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1725818AbgGMEkk (ORCPT <rfc822;kvm@vger.kernel.org>);
        Mon, 13 Jul 2020 00:40:40 -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 4B4rYf07ttz9sRW;
        Mon, 13 Jul 2020 14:40:37 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1594615238;
        bh=X2Wud9eqHa5P5dnFzfs5isEGcPND8sa4/jcFZQA1klE=;
        h=Date:From:To:Cc:Subject:From;
        b=Ds5dBXJl5n4w6dclItOfUPmw15D2n+JAC129r9bWBPsMz/uh15Fxi8c5MFAnp8Cio
         K98Zh72fNFvw8uqDFNvSomRchfGwJijVQPGYgkomYSnTrtZy+ZDEVlQ7otsDLah15X
         NpGb1/rLXwBPhIg4fr6LNN1ak1hEGvIFpToKXlh3Im0k7+0xph1xqKRXgx2oC6bkae
         f62YOFWl/Rzs6WX6U1gQQApLfFuoLb4Kp2RS8vj9R2ObGFa7PVprmmLONIbX1sQIyl
         7HOQOkhpnML6HLNbj0FNmZq4VwxHG12iC2Wz4puaPLNQr4db3wnvwfsc9dKW5nZcUj
         WfDJCiMHxs7bg==
Date: Mon, 13 Jul 2020 14:40:36 +1000
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 Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Sean Christopherson <sean.j.christopherson@intel.com>
Subject: linux-next: manual merge of the kvm-arm tree with the kvm tree
Message-ID: <20200713144036.7afe4e76@canb.auug.org.au>
MIME-Version: 1.0
Sender: kvm-owner@vger.kernel.org
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/mmu.c

between commit:

  c1a33aebe91d ("KVM: arm64: Use common KVM implementation of MMU memory caches")

from the kvm tree and commit:

  a0e50aa3f4a8 ("KVM: arm64: Factor out stage 2 page table data from struct kvm")

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/mmu.c
index 838aad520f1c,cd14c831d56f..000000000000
--- a/arch/arm64/kvm/mmu.c