From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 7 Nov 2015 20:15:17 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=99aaa9c64be5fe728975109c96ef297f5650883d;p=deliverable%2Flinux.git

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

Pull livepatching fix from Jiri Kosina:
 "A fix for a kernel oops in case CONFIG_DEBUG_SET_MODULE_RONX is unset
  (as in such case it's possible for module struct to share a page with
  executable text, which is currently not being handled with grace) from
  Josh Poimboeuf"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
  livepatch: Fix crash with !CONFIG_DEBUG_SET_MODULE_RONX
---

99aaa9c64be5fe728975109c96ef297f5650883d