From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1758153AbdJMJLm (ORCPT <rfc822;w@1wt.eu>);
        Fri, 13 Oct 2017 05:11:42 -0400
Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:57304 "EHLO
        foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1757014AbdJMJLi (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Fri, 13 Oct 2017 05:11:38 -0400
Date: Fri, 13 Oct 2017 10:11:42 +0100
From: Will Deacon <will.deacon@arm.com>
To: Ganapatrao Kulkarni <gklkml16@gmail.com>
Cc: mark.rutland@arm.com,
        Ganapatrao Kulkarni <ganapatrao.kulkarni@cavium.com>,
        linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        catalin.marinas@arm.com, Arnaldo Carvalho de Melo <acme@kernel.org>,
        alexander.shishkin@linux.intel.com, peterz@infradead.org,
        mingo@redhat.com, jnair@caviumnetworks.com,
        Zhangshaokun <zhangshaokun@hisilicon.com>, Jonathan.Cameron@huawei.com,
        Robert Richter <Robert.Richter@cavium.com>
Subject: Re: [PATCH v8 0/4] Add support for ThunderX2 pmu events using json
 files
Message-ID: <20171013091141.GA11429@arm.com>
References: <20171012141116.32475-1-ganapatrao.kulkarni@cavium.com>
 <20171012152402.GC5614@arm.com>
 <CAKTKpr6RCzq3QhgptZECZG=YoEmTWCEhM2QaHpzx-ZEtactbHQ@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAKTKpr6RCzq3QhgptZECZG=YoEmTWCEhM2QaHpzx-ZEtactbHQ@mail.gmail.com>
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, Oct 12, 2017 at 10:54:50PM +0530, Ganapatrao Kulkarni wrote:
> On Thu, Oct 12, 2017 at 8:54 PM, Will Deacon <will.deacon@arm.com> wrote:
> > On Thu, Oct 12, 2017 at 07:41:12PM +0530, Ganapatrao Kulkarni wrote:
> >> Extending json/jevent framework for parsing arm64 event files.
> >> Adding jevents for ThunderX2 implementation defined PMU events.
> >>
> >> v8:
> >>    - Rename thunderx2 directory to cavium
> >
> > For the series:
> >
> > Acked-by: Will Deacon <will.deacon@arm.com>
> 
> thanks.
> >
> > Although note that this conflicts against a queued fix from Mark[1], so
> > you'll need to rebase on top of that.
> 
> sure, will do.
> may i know the branch/repo which i can rebase to?

Arnaldo said he was going to apply it to his perf/urgent branch [1],
although I can't spot it there yet. I'm also not sure whether that's the
right thing on which to base 4.15 material. Arnaldo -- what's the best
thing to do here?

Cheers,

Will

[1] http://lkml.kernel.org/r/20171009190000.GL2121@redhat.com