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

Commit Message

Stephen Rothwell July 17, 2024, 3:58 a.m. UTC

Hi all,

Today's linux-next merge of the kvm-x86 tree got conflicts in:

  arch/x86/kvm/x86.c
  include/uapi/linux/kvm.h

between commits:

  bc1a5cd00211 ("KVM: Add KVM_PRE_FAULT_MEMORY vcpu ioctl to pre-populate guest memory")
  6e01b7601dfe ("KVM: x86: Implement kvm_arch_vcpu_pre_fault_memory()")

from the kvm tree and commits:

  6fef518594bc ("KVM: x86: Add a capability to configure bus frequency for APIC timer")
  85542adb65ec ("KVM: x86: Add KVM_RUN_X86_GUEST_MODE kvm_run flag")

from the kvm-x86 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.

Patch

diff --cc arch/x86/kvm/x86.c
index a6968eadd418,994743266480..000000000000
--- a/arch/x86/kvm/x86.c
diff --cc include/uapi/linux/kvm.h
index e5af8c692dc0,e065d9fe7ab2..000000000000
--- a/include/uapi/linux/kvm.h