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

diff --cc Makefile
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/mm/init_64.c
Simple merge

diff --cc kernel/printk.c
Simple merge

diff --cc kernel/sched.c
Simple merge