diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-19 03:34:15 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-19 03:34:15 +0300 |
| commit | 705d43dbe10d6e213a75187ac92b61f9bd00af0b (patch) | |
| tree | af1d62843c7140eb6751f6fd75df5425820f6e8f /drivers/acpi/acpica/hwxface.c | |
| parent | dd8fc10e606127e2dffdb6704e7ec203c86a214d (diff) | |
| parent | 7dcd182bec271ab341b05b66b6006995795fc0e7 (diff) | |
| download | linux-705d43dbe10d6e213a75187ac92b61f9bd00af0b.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching
Pull livepatching fixes from Jiri Kosina:
- regression (from 4.4) fix for ordering issue, introduced by an
earlier ftrace change, that broke live patching of modules.
The fix replaces the ftrace module notifier by direct call in order
to make the ordering guaranteed and well-defined. The patch, from
Jessica Yu, has been acked both by Steven and Rusty
- error message fix from Miroslav Benes
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
ftrace/module: remove ftrace module notifier
livepatch: change the error message in asm/livepatch.h header files
Diffstat (limited to 'drivers/acpi/acpica/hwxface.c')
0 files changed, 0 insertions, 0 deletions