Re: [PATCH 0/3] ftrace: updates for 2.6.29

[Pekka Paalanen]

On Sun, 11 Jan 2009 04:06:41 +0100
Ingo Molnar <mingo@xxxxxxx> wrote:

> 
> * Steven Rostedt <rostedt@xxxxxxxxxxx> wrote:
> 
> > Ingo,
> > 
> > The following patches are in:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
> > 
> >     branch: tip/devel
> > 
> > 
> > Pekka Paalanen (3):
> >       doc: mmiotrace.txt, buffer size control change
> >       trace: mmiotrace to the tracer menu in Kconfig
> >       mmiotrace: count events lost due to not recording
> > 
> > ----
> >  Documentation/tracers/mmiotrace.txt |    6 ++----
> >  arch/x86/Kconfig.debug              |   24 ++----------------------
> >  kernel/trace/Kconfig                |   23 +++++++++++++++++++++++
> >  kernel/trace/trace_mmiotrace.c      |   14 ++++++++++----
> >  4 files changed, 37 insertions(+), 30 deletions(-)
> 
> pulled into tip/tracing/urgent, thanks Steve!

Hi,

I was just diffing linus/master to Ingo's tip/master, and I see the
"mmiotrace: count events lost due to not recording" being added in
tip/master. The doc and Kconfig updates also, nothing is in linus'.

I thought all these were going into 2.6.29. What happened?

Thanks.
-- 
Pekka Paalanen
http://www.iki.fi/pq/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/