diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2017-11-15 10:53:24 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-11-15 10:54:27 +0100 |
| commit | fc41efc1843009ebcdb4850b21f1c371ad203f4e (patch) | |
| tree | 71878da67ed83e19ba6d5e30ebee72e6d3612760 /samples/auxdisplay/Makefile | |
| parent | Merge branch 'for-4.15/shadow-variables' into for-linus (diff) | |
| parent | livepatch: __klp_disable_patch() should never be called for disabled patches (diff) | |
| download | linux-dev-fc41efc1843009ebcdb4850b21f1c371ad203f4e.tar.xz linux-dev-fc41efc1843009ebcdb4850b21f1c371ad203f4e.zip | |
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>
Diffstat (limited to 'samples/auxdisplay/Makefile')
0 files changed, 0 insertions, 0 deletions