Em Mon, May 07, 2018 at 03:06:18PM -0400, Liang, Kan escreveu:
> On 5/7/2018 2:39 PM, Arnaldo Carvalho de Melo wrote:
> > Em Fri, May 04, 2018 at 03:21:16PM -0300, Arnaldo Carvalho de Melo escreveu:
> > > Em Fri, May 04, 2018 at 01:57:33PM -0400, Liang, Kan escreveu:
> > > > On 5/1/2018 12:33 PM, Jiri Olsa wrote:
> > > > > Acked-by: Jiri Olsa <[email protected]>
> > 
> > > > Thanks Jirka.
> > 
> > > > Are you OK with the patch?
> > > > It looks like Jirka has another patch which will touch the same code.
> > > > If it's OK for you, could you please merge the patch? So he can do the
> > > > changes on top of this patch.
> > > Yeah, I'm applying to my perf/core branch and pushing it out now.
> > 
> > So, this will probably break when merging with perf/urgent due to the
> > revert of a patch that touches the parser files, just a heads out.
 
> Yes, it probably be a conflict.
> Do you want me to send a re-base version of this patch after the revert?

That would be nice, please do so.

- Arnaldo

Reply via email to