Linus, please pull from git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching.git for-linus to receive livepatching updates for 4.6 merge window: ========== - cleanup of module notifiers; this depends on module.c cleanup which has been acked by Rusty; from Jessica Yu - small assorted fixes and MAINTAINERS update ========== ---------------------------------------------------------------- Jessica Yu (2): modules: split part of complete_formation() into prepare_coming_module() livepatch/module: remove livepatch module notifier Jiri Kosina (1): klp: remove CONFIG_LIVEPATCH dependency from klp headers Josh Poimboeuf (1): livepatch: Update maintainers Miroslav Benes (1): klp: remove superfluous errors in asm/livepatch.h Petr Mladek (1): livepatch: Fix the error message about unresolvable ambiguity MAINTAINERS | 5 +- arch/s390/include/asm/livepatch.h | 4 - arch/x86/include/asm/livepatch.h | 4 - include/linux/livepatch.h | 9 +++ kernel/livepatch/core.c | 151 ++++++++++++++++++-------------------- kernel/module.c | 36 +++++++-- 6 files changed, 113 insertions(+), 96 deletions(-) -- Jiri Kosina SUSE Labs -- To unsubscribe from this list: send the line "unsubscribe live-patching" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html