diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-25 10:27:02 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-25 10:27:02 -0700 |
commit | 4a4a28fca6966ff2aee7d8313db6defcc8fcf70b (patch) | |
tree | 154eee3002114479354e809adf04155c60cd765e /MAINTAINERS | |
parent | e3420f98f8984c4ffde72e6a877bccbcc9cad6b6 (diff) | |
parent | 5910f06503aae3cc4890e562683abc3e38857ff9 (diff) |
Merge tag 'x86_misc_for_v6.4_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull misc x86 updates from Borislav Petkov:
- Add a x86 hw vulnerabilities section to MAINTAINERS so that the folks
involved in it can get CCed on patches
- Add some more CPUID leafs to the kcpuid tool and extend its
functionality to be more useful when grepping for CPUID bits
* tag 'x86_misc_for_v6.4_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
MAINTAINERS: Add x86 hardware vulnerabilities section
tools/x86/kcpuid: Dump the CPUID function in detailed view
tools/x86/kcpuid: Update AMD leaf Fn80000001
tools/x86/kcpuid: Fix avx512bw and avx512lvl fields in Fn00000007
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 14fadebf42fd..30cc8f683dc6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -22663,6 +22663,17 @@ S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/asm F: arch/x86/entry/ +X86 HARDWARE VULNERABILITIES +M: Thomas Gleixner <tglx@linutronix.de> +M: Borislav Petkov <bp@alien8.de> +M: Peter Zijlstra <peterz@infradead.org> +M: Josh Poimboeuf <jpoimboe@kernel.org> +R: Pawan Gupta <pawan.kumar.gupta@linux.intel.com> +S: Maintained +F: Documentation/admin-guide/hw-vuln/ +F: arch/x86/include/asm/nospec-branch.h +F: arch/x86/kernel/cpu/bugs.c + X86 MCE INFRASTRUCTURE M: Tony Luck <tony.luck@intel.com> M: Borislav Petkov <bp@alien8.de> |