From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 Feb 2015 17:05:41 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep... 
X-Git-Tag: v4.0-rc2~22
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=9ec0de0ee0c9f0ffe4f72da9158194121cc22807;p=linux-2.6-block.git

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

Pull livepatching fixes from Jiri Kosina:
 "Two tiny fixes for livepatching infrastructure:

   - extending RCU critical section to cover all accessess to
     RCU-protected variable, by Petr Mladek

   - proper format string passing to kobject_init_and_add(), by Jiri
     Kosina"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
  livepatch: RCU protect struct klp_func all the time when used in klp_ftrace_handler()
  livepatch: fix format string in kobject_init_and_add()
---

9ec0de0ee0c9f0ffe4f72da9158194121cc22807