tree 7413a2751ba9b656884902a78fc77b3d98fe5c1c
parent 2b776b54bca8c6f3b3a37f89bd80863b688bd8dd
parent 6fee2a0be0ecae939d4b6cd8297d88b5cbb61654
author Linus Torvalds <torvalds@linux-foundation.org> 1572174880 -0400
committer Linus Torvalds <torvalds@linux-foundation.org> 1572174880 -0400

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