Merge branches 'tracing/kmemtrace2' and 'tracing/ftrace' into tracing/urgent

diff --cc kernel/trace/Makefile
Simple merge

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

diff --cc kernel/trace/trace.h
index 742fe13,a8b624c..94ed45e
--- 1/kernel/trace/trace.h
--- 2/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@@ -30,11 -28,9 +29,11 @@@ enum trace_type 
        TRACE_GRAPH_ENT,
        TRACE_USER_STACK,
        TRACE_HW_BRANCHES,
 +      TRACE_KMEM_ALLOC,
 +      TRACE_KMEM_FREE,
        TRACE_POWER,
  
-       __TRACE_LAST_TYPE
+       __TRACE_LAST_TYPE,
  };
  
  /*

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

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

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

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