Linus, please pull from git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching.git for-linus to receive livepatching updates for 4.5 merge window: - RO/NX attribute fixes for patch module relocations from Josh Poimboeuf. As part of this effort, module.c has been cleaned up as well and livepatching is piggy-backing on this cleanup. Rusty is OK with this whole lot going through livepatching tree [1] - symbol disambiguation support from Chris J Arges. That series is also Reviewed-by: Miroslav Benes <mbenes@xxxxxxx> but this came in only after I've alredy pushed out. Didn't want to rebase because of that, hence I am mentioning it here. - symbol lookup fix from Miroslav Benes [1] http://lkml.kernel.org/r/87io4f56n2.fsf@xxxxxxxxxxxxxxx Thanks! ---------------------------------------------------------------- Chris J Arges (3): livepatch: add old_sympos as disambiguator field to klp_func livepatch: add sympos as disambiguator field to klp_reloc livepatch: function,sympos scheme in livepatch sysfs directory Josh Poimboeuf (2): module: Use the same logic for setting and unsetting RO/NX livepatch: Cleanup module page permission changes Miroslav Benes (1): module: keep percpu symbols in module's symtab Rusty Russell (3): gcov: use within_module() helper. module: use a structure to encapsulate layout. module: clean up RO/NX handling. Documentation/ABI/testing/sysfs-kernel-livepatch | 6 +- arch/alpha/kernel/module.c | 2 +- arch/arc/kernel/unwind.c | 4 +- arch/arm/kernel/module-plts.c | 2 +- arch/avr32/kernel/module.c | 12 +- arch/ia64/kernel/module.c | 14 +- arch/metag/kernel/module.c | 4 +- arch/mips/kernel/vpe.c | 6 +- arch/parisc/kernel/module.c | 32 +-- arch/powerpc/kernel/module_32.c | 6 +- arch/s390/kernel/module.c | 22 +- arch/x86/kernel/livepatch.c | 29 +- include/linux/livepatch.h | 24 +- include/linux/module.h | 68 +++-- kernel/debug/kdb/kdb_main.c | 4 +- kernel/gcov/base.c | 7 +- kernel/livepatch/core.c | 176 +++++------- kernel/module.c | 349 +++++++++++------------ 18 files changed, 340 insertions(+), 427 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