tree cdc6297fe95893905d7192df1e7dfb877517eead
parent 49dc2b7173010792c6923930ffcee84b7094b7de
parent 7e545d6eca20ce8ef7f66a63146cbff82b2ba760
author Linus Torvalds <torvalds@linux-foundation.org> 1458276392 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1458276392 -0700

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