Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/riscv/Kconfig
between commit:
b63dc8f2b02c ("firmware: include drivers/firmware/Kconfig unconditionally")
from the asm-generic tree and commit:
99cdc6c18c2d ("RISC-V: Add initial skeletal KVM support")
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/riscv/Kconfig
index 0050a2adf67b,f5fe8a7f0e24..000000000000
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -562,3 -561,6 +562,5 @@@ menu "Power management options
source "kernel/power/Kconfig"
endmenu
+
+ source "arch/riscv/kvm/Kconfig"
-source "drivers/firmware/Kconfig"
Attachment:
pgprgmnVMLbIc.pgp
Description: OpenPGP digital signature
