Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31;
Date:   Tue, 24 Oct 2023 13:28:35 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Christoffer Dall <cdall@cs.columbia.edu>,
        Marc Zyngier <maz@kernel.org>,
        Catalin Marinas <catalin.marinas@arm.com>,
        Will Deacon <will@kernel.org>
Cc:     Ard Biesheuvel <ardb@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Oliver Upton <oliver.upton@linux.dev>,
        Vincent Donnefort <vdonnefort@google.com>
Subject: linux-next: manual merge of the kvm-arm tree with the arm64 tree
Message-ID: <20231024132835.3b885fb8@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/k0SswMXsNpeYrw=DHqkGzWn";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/k0SswMXsNpeYrw=DHqkGzWn
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the kvm-arm tree got a conflict in:

  arch/arm64/kvm/mmu.c

between commits:

  0e0fb2f69c1b ("arm64: kvm: avoid CONFIG_PGTABLE_LEVELS for runtime levels=
")
  8d35f7bcee55 ("arm64: kvm: Limit HYP VA and host S2 range to 48 bits when=
 LPA2 is in effect")

from the arm64 tree and commit:

  bf92834e6f6e ("KVM: arm64: Use folio for THP adjustment")

from the kvm-arm tree.

I fixed it up (the latter removed the struct updated by the former, so
I just did that) 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.

--=20
Cheers,
Stephen Rothwell

--Sig_/k0SswMXsNpeYrw=DHqkGzWn
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmU3K9MACgkQAVBC80lX
0GwiEgf/WjewjROZQjqQHvWX+KfblkJf99qbyAgFs76UWfg+BJDS+Gu18SMtcS+G
m5llZmDPUbjz5/wXXOOSUTVhXLIjrKJ6WQTfcGAdLUoONWNDJem9BruE4MSnWoOX
dGl1QRDZYI70A5OYc7QTbs0JfuUPdHJI4fpfvQ9mWt3qq0g/6QM6ozR26P2lqtgm
0OyteFwCAWTUId0ZJuYImXKDIHbMoEV9LQwccLQ5ufcxLCbUmPuYadU70quO7E4/
Y1mB2k5zmidla1yQPVkGnGFx0lWeO6fnS+Fe9YHbo0tG4vv8Aor/YSmWY7p52DM9
nUH9NbLFRgGdUCQyAzxrK+WTCPl5xA==
=u22T
-----END PGP SIGNATURE-----

--Sig_/k0SswMXsNpeYrw=DHqkGzWn--