Merge branch 'for-next/trace/tracefs' into trace/for-next

diff --cc fs/Makefile
Simple merge

diff --cc kernel/trace/ftrace.c
Simple merge

diff --cc kernel/trace/trace.c
Simple merge

diff --cc kernel/trace/trace_kprobe.c
Simple merge

diff --cc kernel/trace/trace_probe.h
Simple merge