tree 0cd016c2da43e1029538eed1e52897545647cc7c
parent 2322d6c5c7b5e4684a8bd26081568404e5b3ba39
parent 108fab4b5c8f12064ef86e02cb0459992affb30f
author Linus Torvalds <torvalds@linux-foundation.org> 1528647198 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1528647198 -0700

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