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

[Mark Brown]

Hi all,

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

  arch/riscv/kvm/Kconfig

between commit:

  b62a0bf95825a ("KVM: Replace CONFIG_KVM_MMIO with __KVM_NO_MMIO")

from the kvm tree and commit:

  e8b32e3779513 ("KVM: riscv: Implement KVM_PRE_FAULT_MEMORY")

from the kvm-riscv 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/riscv/kvm/Kconfig
index 2e3c4e6c1cd7d,8ac209e8ac870..0000000000000
--- a/arch/riscv/kvm/Kconfig
+++ b/arch/riscv/kvm/Kconfig
@@@ -26,6 -28,8 +26,7 @@@ config KV
  	select KVM_COMMON
  	select KVM_GENERIC_DIRTYLOG_READ_PROTECT
  	select KVM_GENERIC_HARDWARE_ENABLING
+ 	select KVM_GENERIC_PRE_FAULT_MEMORY
 -	select KVM_MMIO
  	select VIRT_XFER_TO_GUEST_WORK
  	select SCHED_INFO
  	select GUEST_PERF_EVENTS if PERF_EVENTS

Attachment: signature.asc
Description: PGP signature