Merge branch 'tracing/ftrace' into auto-ftrace-next