Linus, please pull from git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching.git for-linus to receive livepatching update for 4.1 ===== These are mostly smaller things that got accumulated during the development cycle. The unified solution is still being worked on and is not mature enough for 4.1 yet. - s390 livepatching support, from Jiri Slaby (has Ack from s390 maintainers) - error handling simplification, from Josh Poimboeuf - two minor code cleanups from Josh Poimboeuf and Miroslav Benes ===== Thanks. ---------------------------------------------------------------- Jiri Slaby (1): livepatch: add support on s390 Josh Poimboeuf (2): livepatch: simplify disable error path livepatch: remove unnecessary call to klp_find_object_module() Miroslav Benes (1): livepatch: remove extern specifier from header files arch/s390/Kconfig | 3 ++ arch/s390/include/asm/livepatch.h | 43 ++++++++++++++++++++++++ arch/x86/include/asm/livepatch.h | 4 +-- include/linux/livepatch.h | 8 ++--- kernel/livepatch/core.c | 69 ++++++++++----------------------------- 5 files changed, 69 insertions(+), 58 deletions(-) create mode 100644 arch/s390/include/asm/livepatch.h -- 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