Merge branch 'tracing/core-v2' into tracing-for-linus

Conflicts:
	include/linux/slub_def.h
	lib/Kconfig.debug
	mm/slob.c
	mm/slub.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
index ebea9b2c30a5..6de020d078e1 100644
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
@@ -283,7 +283,7 @@ static void sysrq_ftrace_dump(int key, struct tty_struct *tty)
 }
 static struct sysrq_key_op sysrq_ftrace_dump_op = {
         .handler        = sysrq_ftrace_dump,
-        .help_msg       = "dumpZ-ftrace-buffer",
+        .help_msg       = "dump-ftrace-buffer(Z)",
         .action_msg     = "Dump ftrace buffer",
         .enable_mask    = SYSRQ_ENABLE_DUMP,
 };