aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
authorIngo Molnar <mingo@kernel.org>2026-05-29 09:51:00 +0200
committerIngo Molnar <mingo@kernel.org>2026-05-29 09:51:00 +0200
commitee5ce6e9ef0dff9f58c182509212f26dd634b3f7 (patch)
treee4f1776663bc1496f46dba4c6a299abcb536161b /MAINTAINERS
parentaf9ae836224a746a9bba3a155b7035b60ebd29ce (diff)
parentd1161f56d83f400637b11dcad324651b3175de41 (diff)
downloadlinux-next-history-ee5ce6e9ef0dff9f58c182509212f26dd634b3f7.tar.gz
Merge branch into tip/master: 'x86/merge'
# New commits in x86/merge: 1458ade7469d ("x86/microcode: Fix comment in microcode_loader_disabled()") 00e05495c572 ("scripts/x86/intel: Add a script to update the old microcode list") 515c6b216021 ("x86/microcode/intel: Refresh old_microcode defines with Nov 2025 release") Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 461a3eed61295..7d4fdc9d0582e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -28888,6 +28888,7 @@ S: Maintained
F: Documentation/admin-guide/hw-vuln/
F: arch/x86/include/asm/nospec-branch.h
F: arch/x86/kernel/cpu/bugs.c
+F: scripts/update-intel-ucode-defs.py
X86 MCE INFRASTRUCTURE
M: Tony Luck <tony.luck@intel.com>