Received-SPF: pass (google.com: domain of linux-kernel+bounces-105584-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Mon, 18 Mar 2024 10:10:37 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>, Huacai
 Chen <chenhuacai@loongson.cn>
Cc: Huacai Chen <chenhuacai@kernel.org>, Jinyang He <hejinyang@loongson.cn>,
 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next
 Mailing List <linux-next@vger.kernel.org>, Tiezhu Yang
 <yangtiezhu@loongson.cn>
Subject: Re: linux-next: manual merge of the kvm tree with the loongarch
 tree
Message-ID: <20240318101037.15c93b28@canb.auug.org.au>
In-Reply-To: <20240227140927.463df093@canb.auug.org.au>
References: <20240227140927.463df093@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Xy.qFO_igjTl2LFZZ=SK3OU";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/Xy.qFO_igjTl2LFZZ=SK3OU
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Tue, 27 Feb 2024 14:09:27 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the kvm tree got a conflict in:
>=20
>   arch/loongarch/Kconfig
>=20
> between commit:
>=20
>   853f96367535 ("LoongArch: Add kernel livepatching support")
>=20
> from the loongarch tree and commit:
>=20
>   f48212ee8e78 ("treewide: remove CONFIG_HAVE_KVM")
>=20
> from the kvm tree.
>=20
> 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.
>=20
>=20
> diff --cc arch/loongarch/Kconfig
> index 99a0a15ce5f7,eb2139387a54..000000000000
> --- a/arch/loongarch/Kconfig
> +++ b/arch/loongarch/Kconfig
> @@@ -133,11 -133,8 +133,10 @@@ config LOONGARC
>   	select HAVE_KPROBES
>   	select HAVE_KPROBES_ON_FTRACE
>   	select HAVE_KRETPROBES
> - 	select HAVE_KVM
>  +	select HAVE_LIVEPATCH
>   	select HAVE_MOD_ARCH_SPECIFIC
>   	select HAVE_NMI
>  +	select HAVE_OBJTOOL if AS_HAS_EXPLICIT_RELOCS
>   	select HAVE_PCI
>   	select HAVE_PERF_EVENTS
>   	select HAVE_PERF_REGS

This is now a conflict between the loongarch tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/Xy.qFO_igjTl2LFZZ=SK3OU
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmX3eG0ACgkQAVBC80lX
0GwVcwf/cTp/wYy2XUIRQzjMW8TMU2E1KqntbRLoPJZ0zbAnl5Ea3MUSPDwFf7Rv
G1FVsNp3PZqjLvwZnkoQwg7o0uWtFWmzDR1VLestovnmn1y0DLCoBmbF7es2zh2Q
jgTT4I30CqdjjfcRji2gu5JZ/3nFQuaEcEnmFz0EUgPa3DuGQTr5gwBBW4y3gaCs
iWb/LObiNuFyhcH5vCxWZ5yJiQZAHvto0Z9w3bZTs2QEccQv2rxvg0PgT3UPRzLX
D1AfWXoaIV4Rw2t4uuLZya8PGbQHhQ/iWfAifZiKrkk9l7nX5AnZ2eHOGX8Z5yPD
Pas7Ojn0v9RAdqaXUgG/H4EwcXm6ow==
=WAqf
-----END PGP SIGNATURE-----

--Sig_/Xy.qFO_igjTl2LFZZ=SK3OU--