Merge remote-tracking branch 'ftrace/for-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 10 Dec 2018 04:38:20 +0000 (15:38 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 10 Dec 2018 04:38:20 +0000 (15:38 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Dec 2018 04:38:20 +0000 (15:38 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Dec 2018 04:38:20 +0000 (15:38 +1100)
diff --cc include/linux/ftrace.h
Simple merge
diff --cc kernel/trace/trace.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 10 Dec 2018 04:38:20 +0000 (15:38 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 10 Dec 2018 04:38:20 +0000 (15:38 +1100)
		1	2
include/linux/ftrace.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	patch \|	diff1 \|	diff2 \|	blob \| history