[Cbe-oss-dev] [PATCH 04/14] spufs: add spu stats in sysfs and ctx stat file in spufs

[Arnd Bergmann]

On Friday 20 July 2007, Andrew Morton wrote:
> And what's up with all these powerpc people sending out patchbombs after
> the merge window has opened?  Formally, _all_ of this:
> 
...
> 
> should be pushed back into 2.6.24 because it all arrived too late.
> 
> I guess you're all doing that to Paul on a regular basis.  Bad.

Yes, I'm particularly bad at this usually.

However, for the ps3 drivers and oprofile, the problem was really
miscommunication about who gets to merge what first, because there
were interdependencies with other subsystems: Paul wanted to have
that code merged through other subsystems maintainers, which for
different reasons just did not happen at first.

The spufs patches mostly basically fixes that came up after all the
other spufs code got merged.

I'm also still sitting on the fixes (and two new drivers) that I
submitted to you earlier this week, and asked Linus to pull consequently.
My plan was to ask Linus again for merging them today, together
with Jeremy's spufs patches and the updated oprofile stuff and another
patch from Christoph.

Would you prefer me to discard my new git tree and only ask him to pull
what I had last week instead. Just trying to find out how to avoid
merge conflicts on this.

	Arnd <><