Merge tag 'kvm-x86-generic-7.0-rc3' of https://github.com/kvm-x86/linux into HEAD

KVM generic changes for 7.0

 - Remove a subtle pseudo-overlay of kvm_stats_desc, which, aside from being
   unnecessary and confusing, triggered compiler warnings due to
   -Wflex-array-member-not-at-end.

 - Document that vcpu->mutex is take outside of kvm->slots_lock and
   kvm->slots_arch_lock, which is intentional and desirable despite being
   rather unintuitive.

diff --cc arch/loongarch/kvm/vcpu.c
Simple merge

diff --cc arch/loongarch/kvm/vm.c
Simple merge

diff --cc arch/mips/kvm/mips.c
Simple merge

diff --cc arch/riscv/kvm/vm.c
Simple merge

diff --cc arch/s390/kvm/kvm-s390.c
Simple merge

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc include/linux/kvm_host.h
index 34759a262b2892b54d2bef78029c06b55fff58e1,7428d9949382fdc1cea30f6c5f9fffb628006ecb..6b76e7a6f4c2244e5f1686f191895876649f27a9
--- 1/include/linux/kvm_host.h
--- 2/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@@ -2111,10 -2085,11 +2098,10 @@@ static inline void kvm_stats_log_hist_u
  
  
  extern const struct kvm_stats_header kvm_vm_stats_header;
- extern const struct _kvm_stats_desc kvm_vm_stats_desc[];
+ extern const struct kvm_stats_desc kvm_vm_stats_desc[];
  extern const struct kvm_stats_header kvm_vcpu_stats_header;
- extern const struct _kvm_stats_desc kvm_vcpu_stats_desc[];
+ extern const struct kvm_stats_desc kvm_vcpu_stats_desc[];
  
 -#ifdef CONFIG_KVM_GENERIC_MMU_NOTIFIER
  static inline int mmu_invalidate_retry(struct kvm *kvm, unsigned long mmu_seq)
  {
        if (unlikely(kvm->mmu_invalidate_in_progress))

diff --cc include/uapi/linux/kvm.h
Simple merge

diff --cc virt/kvm/kvm_main.c
Simple merge