| Message ID | 20240227140927.463df093@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the kvm tree with the loongarch tree | expand |
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: > > 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 --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.
diff --cc arch/loongarch/Kconfig index 99a0a15ce5f7,eb2139387a54..000000000000 --- a/arch/loongarch/Kconfig
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.