projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 27eb427 e2391a2)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Nov 2015 20:15:17 +0000 (12:15 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Nov 2015 20:15:17 +0000 (12:15 -0800)
commit99aaa9c64be5fe728975109c96ef297f5650883d
tree7a4338adaafb52fff8e4b3bb767665b9c343aef0tree | snapshot
parent27eb427bdc0960ad64b72da03e3596c801e7a9e9commit | diff
parente2391a2dcaca41c6de0fbc25329969fc7142f20dcommit | diff
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
John Crispins staging tree