diff mbox series

linux-next: manual merge of the kvm tree with the loongarch tree

Message ID 20240227140927.463df093@canb.auug.org.au
State New
Headers
Series linux-next: manual merge of the kvm tree with the loongarch tree |

Commit Message

Stephen Rothwell Feb. 27, 2024, 3:09 a.m. UTC 
  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.
diff mbox series

Patch

diff --cc arch/loongarch/Kconfig
index 99a0a15ce5f7,eb2139387a54..000000000000
--- a/arch/loongarch/Kconfig