Skip to content
Commit fc41efc1 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

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: default avatarJiri Kosina <jkosina@suse.cz>
parents cb65dc7b 89a9a1c1
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment