Messages in this thread | | | Date | Fri, 04 Jun 2010 14:01:45 +0800 | From | Li Zefan <> | 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.
| |