Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Dec 2018 00:26:42 +0000 (16:26 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Dec 2018 00:26:42 +0000 (16:26 -0800)
commit13e1ad2be3a85f5c0f76e82af9806b3d12a574d0
treedb693bd41dbea4d361477175c7431cd4fb5c2bab
parent9f687dddc4e1a3101f1ceb7fbaddbf93f93a7788
parent20c3a2c33e9fdc82e9e8e8d2a6445b3256d20191
Merge branch 'x86-pti-for-linus' of git://git./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
Documentation/admin-guide/kernel-parameters.txt