From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 26 Dec 2018 00:26:42 +0000 (-0800)
Subject: Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.0-rc1~167
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/13e1ad2be3a85f5c0f76e82af9806b3d12a574d0

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:
 "No point in speculating what's in this parcel:

   - Drop the swap storage limit when L1TF is disabled so the full space
     is available

   - Add support for the new AMD STIBP always on mitigation mode

   - Fix a bunch of STIPB typos"

* 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/speculation: Add support for STIBP always-on preferred mode
  x86/speculation/l1tf: Drop the swap storage limit restriction when l1tf=off
  x86/speculation: Change misspelled STIPB to STIBP
---

13e1ad2be3a85f5c0f76e82af9806b3d12a574d0