Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
Date:   Tue, 17 Oct 2023 12:30:17 +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:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Mark Rutland <mark.rutland@arm.com>,
        Oliver Upton <oliver.upton@linux.dev>
Subject: linux-next: manual merge of the kvm-arm tree with the arm64 tree
Message-ID: <20231017123017.3907baac@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/50XVF6ViMpX4.y.BB1WplxR";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/50XVF6ViMpX4.y.BB1WplxR
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/arm.c

between commit:

  d8569fba1385 ("arm64: kvm: Use cpus_have_final_cap() explicitly")

from the arm64 tree and commit:

  ef150908b6bd ("KVM: arm64: Add generic check for system-supported vCPU fe=
atures")

from the kvm-arm tree.

I fixed it up (I just used the latter) 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_/50XVF6ViMpX4.y.BB1WplxR
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUt46kACgkQAVBC80lX
0GxkHAgAhlQlvJz1zakFg+zxpviTi/spDGQRUfRn/V99p7H4qFfphq0GaW6/LBrL
ZwBc6KeoECdVKHAIqUAqBn4A3gj4+ccqrTzKQBFx1DYiigvaYfbdiP2TkyPxVIEG
D8Z6NWqDMs7cloluXLgKKoByQVPkmGql4/15q8Q70e0wORLl8HfgR66RI7hPOEsF
sV2dXXBEMdQrGgnVymp1eS6seUKs+Pnj4FH7f/gs4UQYZkWhqNJnwpl5vS5onh3N
SJmG4lSu+t6Cb3FcLWC0Escl1BJMvSWyjmZLqQDl2vPUOynQzeCbrGEFZpMMsKNv
wDdiABlOzF2ikSVoS+33FKbM1TJBPw==
=piPe
-----END PGP SIGNATURE-----

--Sig_/50XVF6ViMpX4.y.BB1WplxR--