From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Feb 2016 00:34:15 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep... 
X-Git-Tag: Ubuntu-4.8.0-22.24~1849
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=705d43dbe10d6e213a75187ac92b61f9bd00af0b;p=mirror_ubuntu-zesty-kernel.git

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

Pull livepatching fixes from Jiri Kosina:

 - regression (from 4.4) fix for ordering issue, introduced by an
   earlier ftrace change, that broke live patching of modules.

   The fix replaces the ftrace module notifier by direct call in order
   to make the ordering guaranteed and well-defined.  The patch, from
   Jessica Yu, has been acked both by Steven and Rusty

 - error message fix from Miroslav Benes

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
  ftrace/module: remove ftrace module notifier
  livepatch: change the error message in asm/livepatch.h header files
---

705d43dbe10d6e213a75187ac92b61f9bd00af0b