commit b2096a5e071ab9e9856375d1da2c6209cc57690f
author Linus Torvalds <torvalds@linux-foundation.org> Sat May 26 13:24:16 2018 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Sat May 26 13:24:16 2018 -0700
tree 120d49d858b853e0a3cdc4b907b761bda267713d
parent cc71efda829413b734a2349ed4b9de1ac012bbc2
parent 8ecc4979b1bd9c94168e6fc92960033b7a951336

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

Pull x86 store buffer fixes from Thomas Gleixner:
 "Two fixes for the SSBD mitigation code:

   - expose SSBD properly to guests. This got broken when the CPU
     feature flags got reshuffled.

   - simplify the CPU detection logic to avoid duplicate entries in the
     tables"

* 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/speculation: Simplify the CPU bug detection logic
  KVM/VMX: Expose SSBD properly to guests