]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-4.15/callbacks' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 15 Nov 2017 09:53:24 +0000 (10:53 +0100)
committerJiri Kosina <jkosina@suse.cz>
Wed, 15 Nov 2017 09:54:27 +0000 (10:54 +0100)
commit098d8135e2a10e7f7591d1cd7e6e7fe9127890ea
tree71878da67ed83e19ba6d5e30ebee72e6d3612760
parent1d7dd8c4feb4b2495a8735b57497f90c8cbaa6fa
parent8268d432a3128be179ba7dcca965f71ca67e4936
Merge branch 'for-4.15/callbacks' into for-linus

This pulls in an infrastructure/API that allows livepatch writers to
register pre-patch and post-patch callbacks that allow for running a
glue code necessary for finalizing the patching if necessary.

Conflicts:
kernel/livepatch/core.c
- trivial conflict by adding a callback call into
  module going notifier vs. moving that code block
  to klp_cleanup_module_patches_limited()

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
kernel/livepatch/core.c