Merge branches 'tracing/ftrace' and 'linus' into tracing/core