diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-04 11:13:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-04 11:13:03 -0700 |
| commit | 9fb4c5250f10dc4d8257cd766991be690eb25c5b (patch) | |
| tree | f43700415ed1b04542178fcb54e47a54126b09d8 /MAINTAINERS | |
| parent | a789d5f8a99a366778a6e42b3700a246244201a6 (diff) | |
| parent | f55d9895884b1e816f95b5109b4b3827ae18c4ab (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching
Pull livepatching updates from Jiri Kosina:
- simplifications and improvements for issues Peter Ziljstra found
during his previous work on W^X cleanups.
This allows us to remove livepatch arch-specific .klp.arch sections
and add proper support for jump labels in patched code.
Also, this patchset removes the last module_disable_ro() usage in the
tree.
Patches from Josh Poimboeuf and Peter Zijlstra
- a few other minor cleanups
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching:
MAINTAINERS: add lib/livepatch to LIVE PATCHING
livepatch: add arch-specific headers to MAINTAINERS
livepatch: Make klp_apply_object_relocs static
MAINTAINERS: adjust to livepatch .klp.arch removal
module: Make module_enable_ro() static again
x86/module: Use text_mutex in apply_relocate_add()
module: Remove module_disable_ro()
livepatch: Remove module_disable_ro() usage
x86/module: Use text_poke() for late relocations
s390/module: Use s390_kernel_write() for late relocations
s390: Change s390_kernel_write() return type to match memcpy()
livepatch: Prevent module-specific KLP rela sections from referencing vmlinux symbols
livepatch: Remove .klp.arch
livepatch: Apply vmlinux-specific KLP relocations early
livepatch: Disallow vmlinux.ko
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 465210f17948..02cbbe88b65f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9936,10 +9936,12 @@ S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching.git F: Documentation/ABI/testing/sysfs-kernel-livepatch F: Documentation/livepatch/ +F: arch/powerpc/include/asm/livepatch.h +F: arch/s390/include/asm/livepatch.h F: arch/x86/include/asm/livepatch.h -F: arch/x86/kernel/livepatch.c F: include/linux/livepatch.h F: kernel/livepatch/ +F: lib/livepatch/ F: samples/livepatch/ F: tools/testing/selftests/livepatch/ |