On Mon, 2011-07-25 at 20:06 +0000, tip-bot for Jesper Juhl wrote: > Commit-ID: f629299b544b6cc12b4e3e85fec96f4ce5809482 > Gitweb: http://git.kernel.org/tip/f629299b544b6cc12b4e3e85fec96f4ce5809482 > Author: Jesper Juhl <jj@xxxxxxxxxxxxx> > AuthorDate: Sun, 24 Jul 2011 23:15:42 +0200 > Committer: Ingo Molnar <mingo@xxxxxxx> > CommitDate: Mon, 25 Jul 2011 09:37:21 +0200 > > trace events: Update version number reference to new 3.x scheme for EVENT_POWER_TRACING_DEPRECATED > > What was scheduled to be 2.6.41 is now going to be 3.1 . I see the comment here also states that this code would be removed in 3.1, where as we are now heading towards 3.3 and Arjan said it doesn't hurt to keep the code. I guess this comment needs to be removed too? -- Steve > > Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx> > Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> > Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> > Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx> > Cc: Steven Rostedt <rostedt@xxxxxxxxxxx> > Link: http://lkml.kernel.org/r/alpine.LNX.2.00.1107250929370.8080@xxxxxxxxxxxxxxxxxxxxxxxxx > Signed-off-by: Ingo Molnar <mingo@xxxxxxx> > --- > kernel/trace/Kconfig | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig > index 2ad39e5..cd31345 100644 > --- a/kernel/trace/Kconfig > +++ b/kernel/trace/Kconfig > @@ -82,7 +82,7 @@ config EVENT_POWER_TRACING_DEPRECATED > power:power_frequency > This is for userspace compatibility > and will vanish after 5 kernel iterations, > - namely 2.6.41. > + namely 3.1. > > config CONTEXT_SWITCH_TRACER > bool -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|