Date: Thu, 23 Jan 2014 13:50:10 +0100
From: Jiri Olsa <jolsa@redhat.com>
To: Namhyung Kim <namhyung@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>,
        Peter Zijlstra <a.p.zijlstra@chello.nl>,
        Paul Mackerras <paulus@samba.org>, Ingo Molnar <mingo@kernel.org>,
        Namhyung Kim <namhyung.kim@lge.com>,
        LKML <linux-kernel@vger.kernel.org>,
        Rodrigo Campos <rodrigo@sdfg.com.ar>, Andi Kleen <andi@firstfloor.org>,
        Arun Sharma <asharma@fb.com>, Frederic Weisbecker <fweisbec@gmail.com>
Subject: Re: [PATCHSET 00/24] perf tools: Add support to accumulate hist
 periods (v6)
Message-ID: <20140123125009.GA1491@krava.brq.redhat.com>
References: <1389677157-30513-1-git-send-email-namhyung@kernel.org>
 <20140122132018.GC1132@krava.brq.redhat.com>
 <CAM9d7cj=5JnY+yLnNpR2Ex+_dbfcZCjup0Sa2tBf84DcoYHEHA@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAM9d7cj=5JnY+yLnNpR2Ex+_dbfcZCjup0Sa2tBf84DcoYHEHA@mail.gmail.com>
User-Agent: Mutt/1.5.21 (2010-09-15)
Sender: linux-kernel-owner@vger.kernel.org

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@redhat.com> 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@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/