Re: [RFC] [GIT PULL] "Performance Counters" -> "PerformanceEvents" rename

[Ingo Molnar]

* Ingo Molnar <mingo@xxxxxxx> wrote:

> * Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:
> 
> > On Mon, 21 Sep 2009, Ingo Molnar wrote:
> > > 
> > > Please consider pulling the following tree (which is relative to the 
> > > perfcounters-fixes-for-linus pull request i just sent) that renames 
> > > "performance counters" to "performance events":
> > 
> > Fine, pulled. But it conflicted with the tracers tree. I fixed it up, 
> > but somebody more well-versed in the code should double-check.
> 
> Will do, thanks!

I double checked, it looks good! I already had those conflicts resolved 
and tested locally. You did the same resolutions except a small 
stylistic detail in include/trace/ftrace.h where your version is better.

Thanks,

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