Re: [PATCH 0/3] [GIT PULL] tracing: rebase of TRACE_EVENT_TEMPLATE

[Ingo Molnar]

* Steven Rostedt <rostedt@xxxxxxxxxxx> wrote:

> 
> Ingo,
> 
> This is the rebase to resolve the conflicts with perf.
> 
> Please pull the latest tip/perf/core tree, which can be found at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
> tip/perf/core
> 
> 
> Steven Rostedt (3):
>       tracing: Create new TRACE_EVENT_TEMPLATE
>       tracing: Create new DEFINE_EVENT_PRINT
>       tracing: Convert some sched trace events to DEFINE_EVENT and _PRINT
> 
> ----
>  include/linux/tracepoint.h   |    6 +
>  include/trace/define_trace.h |   11 ++
>  include/trace/events/sched.h |  170 ++++++++-------------------
>  include/trace/ftrace.h       |  266 +++++++++++++++++++++++++++++++++++-------
>  4 files changed, 292 insertions(+), 161 deletions(-)

Pulled, thanks a lot Steve!

	Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/