Linux / linux / fcb45a2 / Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Linux/linux fcb45a2 — arch/x86/include/asm intel-family.h mwait.h, arch/x86/kernel/cpu vmware.c

2019-10-12 21:46:14 UTC by Linus Torvalds on ⎇

master

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Ingo Molnar:
 "A handful of fixes: a kexec linking fix, an AMD MWAITX fix, a vmware
  guest support fix when built under Clang, and new CPU model number
  definitions"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/cpu: Add Comet Lake to the Intel CPU models header
  lib/string: Make memzero_explicit() inline instead of external
  x86/cpu/vmware: Use the full form of INL in VMWARE_PORT
  x86/asm: Fix MWAITX C-state hint value

Delta		File
+20	-1	include/linux/string.h
+0	-21	lib/string.c
+2	-2	arch/x86/lib/delay.c
+3	-0	arch/x86/include/asm/intel-family.h
+1	-1	arch/x86/include/asm/mwait.h
+1	-1	arch/x86/kernel/cpu/vmware.c
+27	-26	6 files

Unified Split Raw