Linus,
please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching.git for-linus
to receive
==========
- 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
==========
Thanks.
----------------------------------------------------------------
Jessica Yu (1):
ftrace/module: remove ftrace module notifier
Miroslav Benes (1):
livepatch: change the error message in asm/livepatch.h header files
arch/s390/include/asm/livepatch.h | 2 +-
arch/x86/include/asm/livepatch.h | 2 +-
include/linux/ftrace.h | 6 ++++--
kernel/module.c | 4 ++++
kernel/trace/ftrace.c | 36 +-----------------------------------
5 files changed, 11 insertions(+), 39 deletions(-)
--
Jiri Kosina
SUSE Labs
