Received-SPF: pass (google.com: domain of linux-kernel+bounces-82640-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Tue, 27 Feb 2024 14:09:27 +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: linux-next: manual merge of the kvm tree with the loongarch tree
Message-ID: <20240227140927.463df093@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/IncGFwUXhNX8r=SsiFMIfe5";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

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

  arch/loongarch/Kconfig

between commit:

  853f96367535 ("LoongArch: Add kernel livepatching support")

from the loongarch tree and commit:

  f48212ee8e78 ("treewide: remove CONFIG_HAVE_KVM")

from the kvm 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.

--=20
Cheers,
Stephen Rothwell

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

--Sig_/IncGFwUXhNX8r=SsiFMIfe5
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXdUmcACgkQAVBC80lX
0GxlAwf/aw9OJcBpp9BgnnNziBx6e60CoaKJVttb1NXvpuG81efJeE5e6vRRJOp3
MIB/jhmNrFuBokVdu5ROjNQVR7ujoZ30/aevr5zn0mQqXVuuuPFGPqtlWWkTWwWR
dGCveC+3cKDZvzPaPn3JbXA6ofPBfHQ7xyYIg4kyEBXvJb6//kzZMgOF8u8qTL0c
IgCvFP6YrQkBdKl1XI/1vnKj4mBXicbnwi0lWcr0Bhd/ghZYQWhkUzdE2qHOXISg
yj5w9OJwgRitzRU7ygM4PU5xcyvV62Xdq1/tauBqaD8nTnlUzJ10HxFAuMbSg5bt
fkVXefGZ1p7iJFuxU3X2PUmJLHeEvQ==
=3VAg
-----END PGP SIGNATURE-----

--Sig_/IncGFwUXhNX8r=SsiFMIfe5--