From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 26 May 2018 20:24:16 +0000 (-0700)
Subject: Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.19~978
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b2096a5e071ab9e9856375d1da2c6209cc57690f;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'x86-pti-for-linus' of git://git./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
---

b2096a5e071ab9e9856375d1da2c6209cc57690f