From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 11 Mar 2026 17:01:55 +0000 (+0100)
Subject: Merge tag 'kvm-x86-generic-7.0-rc3' of https://github.com/kvm-x86/linux into HEAD
X-Git-Tag: v7.0-rc4~4^2~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=94fe3e6515ddca2fd33ca1ec53d3635e54fbe456;p=thirdparty%2Fkernel%2Flinux.git

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.
---

94fe3e6515ddca2fd33ca1ec53d3635e54fbe456
diff --cc include/linux/kvm_host.h
index 34759a262b289,7428d9949382f..6b76e7a6f4c22
--- a/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))