Commit 035f1456 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching

Pull livepatching fix from Jiri Kosina:
 "Kconfig dependency fix for livepatching infrastructure from Miroslav
  Benes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
  livepatch: Make livepatch dependent on !TRIM_UNUSED_KSYMS
parents f2a025de 5720acf4
...@@ -10,6 +10,7 @@ config LIVEPATCH ...@@ -10,6 +10,7 @@ config LIVEPATCH
depends on SYSFS depends on SYSFS
depends on KALLSYMS_ALL depends on KALLSYMS_ALL
depends on HAVE_LIVEPATCH depends on HAVE_LIVEPATCH
depends on !TRIM_UNUSED_KSYMS
help help
Say Y here if you want to support kernel live patching. Say Y here if you want to support kernel live patching.
This option has no runtime impact until a kernel "patch" This option has no runtime impact until a kernel "patch"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment