summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-10-27 07:14:40 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2019-10-27 07:14:40 -0400
commit153a971ff578e9c8c5eadc9463c1d73a6adc8693 (patch)
tree7413a2751ba9b656884902a78fc77b3d98fe5c1c /Makefile
parent2b776b54bca8c6f3b3a37f89bd80863b688bd8dd (diff)
parent6fee2a0be0ecae939d4b6cd8297d88b5cbb61654 (diff)
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Thomas Gleixner: "Two fixes for the VMWare guest support: - Unbreak VMWare platform detection which got wreckaged by converting an integer constant to a string constant. - Fix the clang build of the VMWAre hypercall by explicitely specifying the ouput register for INL instead of using the short form" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/cpu/vmware: Fix platform detection VMWARE_PORT macro x86/cpu/vmware: Use the full form of INL in VMWARE_HYPERCALL, for clang/llvm
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions