From: Li Zefan <lizf@cn.fujitsu.com>
To: rostedt@goodmis.org
Cc: LKML <linux-kernel@vger.kernel.org>, Ingo Molnar <mingo@elte.hu>,
Frederic Weisbecker <fweisbec@gmail.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Kei Tokunaga <tokunaga.keiich@jp.fujitsu.com>,
James Bottomley <James.Bottomley@suse.de>,
Tomohiro Kusumi <kusumi.tomohiro@jp.fujitsu.com>,
Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Subject: Re: [PATCH][GIT PULL][v2.6.35] tracing/events: Convert format output to seq_file
Date: Fri, 04 Jun 2010 09:39:26 +0800 [thread overview]
Message-ID: <4C08594E.2000703@cn.fujitsu.com> (raw)
In-Reply-To: <1275594103.15884.35.camel@gandalf.stny.rr.com>
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@redhat.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?
next prev parent reply other threads:[~2010-06-04 1:36 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-03 19:41 [PATCH][GIT PULL][v2.6.35] tracing/events: Convert format output to seq_file Steven Rostedt
2010-06-04 1:39 ` Li Zefan [this message]
2010-06-04 2:11 ` Steven Rostedt
2010-06-04 4:14 ` Steven Rostedt
2010-06-04 6:01 ` Li Zefan
2010-06-04 2:11 ` Li Zefan
2010-06-04 2:13 ` Steven Rostedt
2010-06-04 2:26 ` Li Zefan
2010-06-04 3:27 ` [PATCH v2][GIT " Steven Rostedt
2010-06-07 7:57 ` Kei Tokunaga
2010-06-07 21:00 ` Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4C08594E.2000703@cn.fujitsu.com \
--to=lizf@cn.fujitsu.com \
--cc=James.Bottomley@suse.de \
--cc=fweisbec@gmail.com \
--cc=kusumi.tomohiro@jp.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=mingo@elte.hu \
--cc=rostedt@goodmis.org \
--cc=tokunaga.keiich@jp.fujitsu.com \
--cc=xiaoguangrong@cn.fujitsu.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox