Merge tag 'x86_cpu_for_6.7_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Oct 2023 22:10:24 +0000 (12:10 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Oct 2023 22:10:24 +0000 (12:10 -1000)
commitca2e9c3beec67dc90944f3d2a72f77652fb9cefc
tree3e41a5a3394c741ba6adfe5fcd535a2488a36522
parent9ab021a1b57007a22761f6f41d91eb4aae10d145
parentb5034c63858d8cb44587bb1ce5a0790a1b4e4a05
Merge tag 'x86_cpu_for_6.7_rc1' of git://git./linux/kernel/git/tip/tip

Pull x86 cpuid updates from Borislav Petkov:

 - Make sure the "svm" feature flag is cleared from /proc/cpuinfo when
   virtualization support is disabled in the BIOS on AMD and Hygon
   platforms

 - A minor cleanup

* tag 'x86_cpu_for_6.7_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/cpu/amd: Remove redundant 'break' statement
  x86/cpu: Clear SVM feature if disabled by BIOS
arch/x86/include/asm/msr-index.h
arch/x86/include/asm/svm.h
arch/x86/kernel/cpu/amd.c
arch/x86/kvm/svm/svm.c