diff options
| author | Linus Torvalds | 2018-06-10 09:13:18 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2018-06-10 09:13:18 -0700 |
| commit | a2211de0f979aa83e9008fd04f39ea5f63473154 (patch) | |
| tree | 0cd016c2da43e1029538eed1e52897545647cc7c /kernel/futex.c | |
| parent | 2322d6c5c7b5e4684a8bd26081568404e5b3ba39 (diff) | |
| parent | 108fab4b5c8f12064ef86e02cb0459992affb30f (diff) | |
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
Diffstat (limited to 'kernel/futex.c')
0 files changed, 0 insertions, 0 deletions