]> git.proxmox.com Git - mirror_ubuntu-kernels.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)
commitfc41efc1843009ebcdb4850b21f1c371ad203f4e
tree71878da67ed83e19ba6d5e30ebee72e6d3612760
parentcb65dc7b89043a66d4459a6a811645d43185b5f0
parent89a9a1c1c89cea5f70975c338c011b9f7024dee5
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