From: Ingo Molnar on

* Frederic Weisbecker <fweisbec(a)gmail.com> wrote:

> Ingo,
>
> Please pull the perf/core branch that can be found at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
> perf/core
>
> Thanks,
> Frederic
> ---
>
> Frederic Weisbecker (2):
> tracing: Remove sysprof ftrace plugin
> tracing: Remove special traces
>
> Arnd Bergmann (1):
> tracing: Use generic_file_llseek for debugfs
>
>
> include/linux/kernel.h | 5 -
> include/linux/sched.h | 12 --
> kernel/trace/Kconfig | 9 -
> kernel/trace/Makefile | 1 -
> kernel/trace/trace.c | 73 ++-------
> kernel/trace/trace.h | 10 --
> kernel/trace/trace_entries.h | 17 --
> kernel/trace/trace_output.c | 66 --------
> kernel/trace/trace_selftest.c | 33 ----
> kernel/trace/trace_sysprof.c | 330 -----------------------------------------
> 10 files changed, 15 insertions(+), 541 deletions(-)

Pulled, thanks Frederic!

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