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

Pull livepatching update from Jiri Kosina:

 - cleanup of module notifiers; this depends on a module.c cleanup which
   has been acked by Rusty; from Jessica Yu

 - small assorted fixes and MAINTAINERS update

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
  livepatch/module: remove livepatch module notifier
  modules: split part of complete_formation() into prepare_coming_module()
  livepatch: Update maintainers
  livepatch: Fix the error message about unresolvable ambiguity
  klp: remove CONFIG_LIVEPATCH dependency from klp headers
  klp: remove superfluous errors in asm/livepatch.h

1 files changed, 3 insertions, 2 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index e32f4847e251..94ea42b76b30 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6596,9 +6596,10 @@ F:	drivers/platform/x86/hp_accel.c
 
 LIVE PATCHING
 M:      Josh Poimboeuf <jpoimboe@redhat.com>
-M:      Seth Jennings <sjenning@redhat.com>
+M:      Jessica Yu <jeyu@redhat.com>
 M:      Jiri Kosina <jikos@kernel.org>
-M:      Vojtech Pavlik <vojtech@suse.com>
+M:      Miroslav Benes <mbenes@suse.cz>
+R:      Petr Mladek <pmladek@suse.com>
 S:      Maintained
 F:      kernel/livepatch/
 F:      include/linux/livepatch.h