diff options
| author | Linus Torvalds | 2015-06-23 23:07:26 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2015-06-23 23:07:26 +0200 |
| commit | 0faef837e431b4984652f4a14d2075bed108a04d (patch) | |
| tree | 8fae7d48b875190487b94878e55d34be447392b7 /include/uapi/linux/netfilter_bridge | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik... (diff) | |
| parent | Merge branches 'for-4.1/upstream-fixes', 'for-4.2/kaslr' and 'for-4.2/upstrea... (diff) | |
| download | kernel-qcow2-linux-0faef837e431b4984652f4a14d2075bed108a04d.tar.gz kernel-qcow2-linux-0faef837e431b4984652f4a14d2075bed108a04d.tar.xz kernel-qcow2-linux-0faef837e431b4984652f4a14d2075bed108a04d.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching
Pull livepatching fixes from Jiri Kosina:
- symbol lookup locking fix, from Miroslav Benes
- error handling improvements in case of failure of the module coming
notifier, from Minfei Huang
- we were too pessimistic when kASLR has been enabled on x86 and were
dropping address hints on the floor unnecessarily in such case. Fix
from Jiri Kosina
- a few other small fixes and cleanups
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
livepatch: add module locking around kallsyms calls
livepatch: annotate klp_init() with __init
livepatch: introduce patch/func-walking helpers
livepatch: make kobject in klp_object statically allocated
livepatch: Prevent patch inconsistencies if the coming module notifier fails
livepatch: match return value to function signature
x86: kaslr: fix build due to missing ALIGN definition
livepatch: x86: make kASLR logic more accurate
x86: introduce kaslr_offset()
Diffstat (limited to 'include/uapi/linux/netfilter_bridge')
0 files changed, 0 insertions, 0 deletions