[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4C08594E.2000703@cn.fujitsu.com>
Date: Fri, 04 Jun 2010 09:39:26 +0800
From: Li Zefan <lizf@...fujitsu.com>
To: rostedt@...dmis.org
CC: LKML <linux-kernel@...r.kernel.org>, Ingo Molnar <mingo@...e.hu>,
Frederic Weisbecker <fweisbec@...il.com>,
"Martin K. Petersen" <martin.petersen@...cle.com>,
Kei Tokunaga <tokunaga.keiich@...fujitsu.com>,
James Bottomley <James.Bottomley@...e.de>,
Tomohiro Kusumi <kusumi.tomohiro@...fujitsu.com>,
Xiao Guangrong <xiaoguangrong@...fujitsu.com>
Subject: Re: [PATCH][GIT PULL][v2.6.35] tracing/events: Convert format output
to seq_file
Steven Rostedt wrote:
> Ingo,
>
> Please pull the latest tip/perf/urgent tree, which can be found at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
> tip/perf/urgent
>
>
> Steven Rostedt (1):
> tracing/events: Convert format output to seq_file
>
> ----
> kernel/trace/trace_events.c | 208 +++++++++++++++++++++++++++++--------------
> 1 files changed, 142 insertions(+), 66 deletions(-)
> ---------------------------
> commit 0953fa1f774105fcd6150282b7b9ea7763090f64
> Author: Steven Rostedt <srostedt@...hat.com>
> Date: Thu Jun 3 15:21:34 2010 -0400
>
> tracing/events: Convert format output to seq_file
>
This patch seriously conflicts with my patch that extracts common fields
from every trace event to a global list, which is already in your perf/core2
branch. Should I rebase and resend it?
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists