| commit | e8af37f3f488e7adce2b5c6f6dfe8c83c2662e1f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 11 09:07:19 2019 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 11 09:07:19 2019 -0800 |
| tree | d91849ad07efae053ed46efec47f077bdfb655f9 | |
| parent | 8e1b295b693cbf2d8499c24fbb1f8f50c58771e3 [diff] | |
| parent | e4f358916d528d479c3c12bd2fd03f2d5a576380 [diff] |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/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