commit | 035f1456f9ed256cd1a92ae1b81cc24413359e61 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 02 08:59:17 2017 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 02 08:59:17 2017 -0700 |
tree | 8cadc5b6dae613b4947b70a231a600707e3be709 | |
parent | f2a025defd804be938f8acffe62e4801a3ed1601 [diff] | |
parent | 5720acf4bfc142ba568d5b6782fceaf62ed15e0b [diff] |
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