8f8ffe2485
Conflicts: kernel/trace/trace_export.c kernel/trace/trace_kprobe.c Merge reason: This topic branch lacks an important build fix in tracing/core: 0dd7b74787eaf7858c6c573353a83c3e2766e674: tracing: Fix double CPP substitution in TRACE_EVENT_FN that prevents from multiple tracepoint headers inclusion crashes. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> |
||
---|---|---|
.. | ||
events.txt | ||
ftrace.txt | ||
function-graph-fold.vim | ||
kmemtrace.txt | ||
kprobetrace.txt | ||
mmiotrace.txt | ||
power.txt | ||
ring-buffer-design.txt | ||
tracepoints.txt |