[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4C0896C9.1000708@cn.fujitsu.com>
Date: Fri, 04 Jun 2010 14:01:45 +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:
> On Fri, 2010-06-04 at 09:39 +0800, Li Zefan wrote:
>
>> 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?
>
> I pushed out a conflict resolution of pulling tip/perf/urgent-2 into
> tip/perf/core-2 (and pushing that as tip/perf/core-4).
>
> I did change a bit.
>
The code looks ok.
But we can simplify the seqfile code based on the fact that the common
fields has been in a global list. I can make an incremental patch.
--
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