Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32;
Date:   Wed, 1 Nov 2023 13:36:04 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Marc Zyngier <maz@kernel.org>,
        Catalin Marinas <catalin.marinas@arm.com>,
        Will Deacon <will@kernel.org>,
        Paolo Bonzini <pbonzini@redhat.com>
Cc:     Christoffer Dall <cdall@cs.columbia.edu>,
        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>,
        KVM <kvm@vger.kernel.org>
Subject: Re: linux-next: manual merge of the kvm-arm tree with the arm64
 tree
Message-ID: <20231101133604.4edad0b3@canb.auug.org.au>
In-Reply-To: <20231017123017.3907baac@canb.auug.org.au>
References: <20231017123017.3907baac@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/+QxrnIxb6+.k+HEe3OnigdV";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/+QxrnIxb6+.k+HEe3OnigdV
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Tue, 17 Oct 2023 12:30:17 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the kvm-arm tree got a conflict in:
>=20
>   arch/arm64/kvm/arm.c
>=20
> between commit:
>=20
>   d8569fba1385 ("arm64: kvm: Use cpus_have_final_cap() explicitly")
>=20
> from the arm64 tree and commit:
>=20
>   ef150908b6bd ("KVM: arm64: Add generic check for system-supported vCPU =
features")
>=20
> from the kvm-arm tree.
>=20
> 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.

This is now a conflict between the kvm tree and the arm64 tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/+QxrnIxb6+.k+HEe3OnigdV
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmVBuZQACgkQAVBC80lX
0GwH5wf/RdBQBcblcMFtgM49SEUF4RHWBHhiep/hIg6tPWG7pKPVgKeyold61+3s
a0ifRXxLD0IuXgPuHoiX39UfTE4yH6TcYOaZ8mkZTX3DthWbFGUxINPDgc3TuWMz
tXNYH7xvCVFHPUI1jiSeVBT70BjJ4errJm7aG6OxisEEhbKsBENJJpijmuSaCM5J
lqmyxsyhGWHrEkoVN+Jim7Krr2c8v1glhbpmqK2rR1JY4ORCm1SPPZJ73cM1lKxn
SbBmaOJIqw18H644nM57jPMZcudLI5oXlDK6SzBbbUKShP/Oab6gSR0tgWz94dHP
fImX/y4UFkKfrlrziffVjsnrixEKjw==
=hLaM
-----END PGP SIGNATURE-----

--Sig_/+QxrnIxb6+.k+HEe3OnigdV--