diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-19 21:16:12 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-19 21:16:12 +0100 |
commit | a3d66b5a17f81ee84604f95b0e2c9ccf0434c6f0 (patch) | |
tree | 542e78181dcd7ac022fb581942e284fce2c895cd /security | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik... (diff) | |
parent | livepatch: x86: fix relocation computation with kASLR (diff) | |
download | linux-a3d66b5a17f81ee84604f95b0e2c9ccf0434c6f0.tar.xz linux-a3d66b5a17f81ee84604f95b0e2c9ccf0434c6f0.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'security')
0 files changed, 0 insertions, 0 deletions