---

yaml
---
r: 140575
b: refs/heads/master
c: 412d0bb
h: refs/heads/master
i:
  140573: acda390
  140571: 677c49c
  140567: 51898a0
  140559: bbddc4d
  140543: 5428660
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3871f2ffe53db3cef4fe0c18993ad9e6e0f69408
+refs/heads/master: 412d0bb553c0227191f1bfd06100f561600bff22

trunk/Documentation/sysrq.txt

@@ -114,8 +114,6 @@ On all -  write a character to /proc/sysrq-trigger.  e.g.:
 
 'x'	- Used by xmon interface on ppc/powerpc platforms.
 
-'z'	- Dump the ftrace buffer
-
 '0'-'9' - Sets the console log level, controlling which kernel messages
           will be printed to your console. ('0', for example would make
           it so that only emergency messages like PANICs or OOPSes would

trunk/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	= "dump-ftrace-buffer(Z)",
+	.help_msg	= "dumpZ-ftrace-buffer",
 	.action_msg	= "Dump ftrace buffer",
 	.enable_mask	= SYSRQ_ENABLE_DUMP,
 };

trunk/kernel/trace/trace_functions_graph.c

@@ -592,6 +592,12 @@ print_graph_comment(struct print_entry *trace, struct trace_seq *s,
 	if (ent->flags & TRACE_FLAG_CONT)
 		trace_seq_print_cont(s, iter);
 
+	/* Strip ending newline */
+	if (s->buffer[s->len - 1] == '\n') {
+		s->buffer[s->len - 1] = '\0';
+		s->len--;
+	}
+
 	ret = trace_seq_printf(s, " */\n");
 	if (!ret)
 		return TRACE_TYPE_PARTIAL_LINE;