Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Jan 2018 23:30:02 +0000 (15:30 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Jan 2018 23:30:02 +0000 (15:30 -0800)
commitaaae98a8025bcdd22c986b0168ea8f39d0c4ed10
treeb8b45347c6ea7eeef60fff63bdc9eb4a5c6f3630
parent6bb821193b6e8b9cc40714f700da27b4688cbc22
parentb8b9ce4b5aec8de9e23cabb0a26b78641f9ab1d6
Merge branch 'x86-pti-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 fixlet from Thomas Gleixner.

Remove a warning about lack of compiler support for retpoline that most
people can't do anything about, so it just annoys them needlessly.

* 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/retpoline: Remove compile time warning
arch/x86/Makefile