linux-kernel - Re: [PATCH][GIT PULL][v2.6.35] tracing/events: Convert format output to seq

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1275617468.15884.65.camel@gandalf.stny.rr.com>
Date:	Thu, 03 Jun 2010 22:11:08 -0400
From:	Steven Rostedt <rostedt@...dmis.org>
To:	Li Zefan <lizf@...fujitsu.com>
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

On Fri, 2010-06-04 at 09:39 +0800, Li Zefan wrote:
> 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?
> 

Ah sorry. No don't.

We held off your patches to after the merge window. I even reminded Ingo
to pull them in earlier today. But I forgot that these changes would
conflict with yours.

Ingo and I were not sure if your patches were too much for the end of
the merge window, so we held off on them.

This patch set was created when I noticed that the SCSI tracepoints
failed the size limit in the format, and I worked to fix them.

We may still try to push your patches in -rc. I'll do the conflict
resolution, and make it perf/core-4.

IOW, don't worry about it, I'll do the worrying ;-)

Thanks!

-- Steve


--
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/