From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 11 Jan 2019 17:07:19 +0000 (-0800)
Subject: Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.0-rc2~18
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e8af37f3f488e7adce2b5c6f6dfe8c83c2662e1f;p=linux-2.6-block.git

Merge branch 'x86-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 fixes from Ingo Molnar:
 "A 32-bit build fix, CONFIG_RETPOLINE fixes and rename CONFIG_RESCTRL
  to CONFIG_X86_RESCTRL"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, modpost: Replace last remnants of RETPOLINE with CONFIG_RETPOLINE
  x86/cache: Rename config option to CONFIG_X86_RESCTRL
  samples/seccomp: Fix 32-bit build
---

e8af37f3f488e7adce2b5c6f6dfe8c83c2662e1f