summaryrefslogtreecommitdiff
path: root/sound/soc/sh/rcar/gen.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-02-19 03:34:15 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2016-02-19 03:34:15 +0300
commit705d43dbe10d6e213a75187ac92b61f9bd00af0b (patch)
treeaf1d62843c7140eb6751f6fd75df5425820f6e8f /sound/soc/sh/rcar/gen.c
parentdd8fc10e606127e2dffdb6704e7ec203c86a214d (diff)
parent7dcd182bec271ab341b05b66b6006995795fc0e7 (diff)
downloadlinux-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 'sound/soc/sh/rcar/gen.c')
0 files changed, 0 insertions, 0 deletions