tree 216e106b1c8e1ebae0105d4f1108ee4ca74cd27c
parent 32c6cdf75c9270848d2d0ed7c814eba05b47081f
parent 1df37383a8aeabb9b418698f0bcdffea01f4b1b2
author Linus Torvalds <torvalds@linux-foundation.org> 1517171076 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1517171076 -0800

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

Pull x86 retpoline fixlet from Thomas Gleixner:
 "Remove the ESP/RSP thunks for retpoline as they cannot ever work.

  Get rid of them before they show up in a release"

* 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/retpoline: Remove the esp/rsp thunk