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
Date: Tue, 27 Feb 2024 14:09:27 +1100 [thread overview]
Message-ID: <20240227140927.463df093@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1211 bytes --]
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.
--
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-02-27 3:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-27 3:09 Stephen Rothwell [this message]
2024-03-17 23:10 ` linux-next: manual merge of the kvm tree with the loongarch tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2024-05-15 2:54 Stephen Rothwell
2024-05-16 23:42 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240227140927.463df093@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=chenhuacai@kernel$(echo .)org \
--cc=chenhuacai@loongson$(echo .)cn \
--cc=hejinyang@loongson$(echo .)cn \
--cc=kvm@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=pbonzini@redhat$(echo .)com \
--cc=yangtiezhu@loongson$(echo .)cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox