Re: [PATCHSET 00/24] perf tools: Add support to accumulate histperiods (v6)

From: Jiri Olsa
Date: Thu Jan 23 2014 - 07:50:53 EST


On Wed, Jan 22, 2014 at 11:44:33PM +0000, Namhyung Kim wrote:
> Hi Jiri,
>
> On Wed, Jan 22, 2014 at 1:20 PM, Jiri Olsa <jolsa@xxxxxxxxxx> wrote:
> > I have changes on top of this patchset and all looks great, I was
> > just going throught this again and wanted to send my ack, but it
> > no longer merges to the acme's perf/core.
>
> Thanks, but wasn't it applied to the acme/perf/core? Now I'm rebasing
> it onto the acme/perf/core and it applies without any conflicts. Did
> you see one?

hum, I just merged our v6 on acme's perf/core and got conflicts..
not 100% sure the perf/core was clean though ;-)

>
> >
> > Could you please send updated version, and I'll finish the
> > review.. I promise ;-)
>
> Thanks in advance, I'll send out the v7 right soon. :)

checking.. thanks,
jirka
--
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/