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