From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 10 Jun 2018 16:13:18 +0000 (-0700)
Subject: Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: tags/kvm-4.18-2~50
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a2211de0f979aa83e9008fd04f39ea5f63473154;p=users%2Fdwmw2%2Flinux.git

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

Pull x86 pti updates from Thomas Gleixner:
 "Three small commits updating the SSB mitigation to take the updated
  AMD mitigation variants into account"

* 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/bugs: Switch the selection of mitigation from CPU vendor to CPU features
  x86/bugs: Add AMD's SPEC_CTRL MSR usage
  x86/bugs: Add AMD's variant of SSB_NO
---

a2211de0f979aa83e9008fd04f39ea5f63473154