Conflicts:
kernel/trace/trace_export.c
kernel/trace/trace_kprobe.c
Merge reason: This topic branch lacks an important
build fix in tracing/core:
|
||
---|---|---|
.. | ||
events.txt | ||
ftrace.txt | ||
function-graph-fold.vim | ||
kmemtrace.txt | ||
kprobetrace.txt | ||
mmiotrace.txt | ||
power.txt | ||
ring-buffer-design.txt | ||
tracepoints.txt |