From: Linus Torvalds Date: Thu, 19 Nov 2015 20:16:12 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep... X-Git-Tag: v4.4-rc2~23 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=a3d66b5a17f81ee84604f95b0e2c9ccf0434c6f0;p=linux-2.6-block.git Merge branch 'for-linus' of git://git./linux/kernel/git/jikos/livepatching Pull livepatching fix from Jiri Kosina: "A fix for module handling in case kASLR has been enabled, from Zhou Chengming" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching: livepatch: x86: fix relocation computation with kASLR --- a3d66b5a17f81ee84604f95b0e2c9ccf0434c6f0