From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Mar 2016 04:46:32 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep... 
X-Git-Tag: v4.6-rc1~105
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=0f49fc95b86fc77b867d643e2d38bc9f28035ed4;p=sfrench%2Fcifs-2.6.git

Merge branch 'for-linus' of git://git./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
---

0f49fc95b86fc77b867d643e2d38bc9f28035ed4