diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-11 18:07:19 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-11 18:07:19 +0100 |
| commit | e8af37f3f488e7adce2b5c6f6dfe8c83c2662e1f (patch) | |
| tree | d91849ad07efae053ed46efec47f077bdfb655f9 /tools/perf/builtin-inject.c | |
| parent | Merge tag 'acpi-5.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/raf... (diff) | |
| parent | x86, modpost: Replace last remnants of RETPOLINE with CONFIG_RETPOLINE (diff) | |
| download | linux-e8af37f3f488e7adce2b5c6f6dfe8c83c2662e1f.tar.xz linux-e8af37f3f488e7adce2b5c6f6dfe8c83c2662e1f.zip | |
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
Diffstat (limited to 'tools/perf/builtin-inject.c')
0 files changed, 0 insertions, 0 deletions