Messages in this thread | | | Subject | Re: [PATCH] oprofile: remove double ring buffering | From | Steven Rostedt <> | Date | Sun, 04 Apr 2010 09:07:38 -0400 |
| |
On Sun, 2010-04-04 at 12:01 +0200, Andi Kleen wrote:
> > Note, I just sent out a patch set yesterday which will conflict with > > this change. > > > > I Cc'd both you and Andi on that patch. > > Steve, is your ring buffer patch intended for stable? > > I plan to submit the oprofile patch for stable and if your is not > it would be more convenient if your patch was based on mine instead > of the other way round. If yours is for stable I can rebase on top > of yours.
No, my patch is not intended for stable, and in fact, is intended for 35.
When yours gets into Linus's tree, we can fix the conflict. It should be trivial to fix, since the conflict is just me adding another parameter (NULL) to a function you changed.
I just wanted you to be aware of the change, you don't need to do anything about it.
-- Steve
| |