[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <6d385075-41a4-5614-6632-3a1449c73338@huawei.com>
Date: Wed, 14 Oct 2020 18:41:19 +0100
From: John Garry <john.garry@...wei.com>
To: Jiri Olsa <jolsa@...hat.com>
CC: kajoljain <kjain@...ux.ibm.com>,
"acme@...nel.org" <acme@...nel.org>,
"will@...nel.org" <will@...nel.org>,
"mark.rutland@....com" <mark.rutland@....com>,
"irogers@...gle.com" <irogers@...gle.com>,
"leo.yan@...aro.org" <leo.yan@...aro.org>,
"peterz@...radead.org" <peterz@...radead.org>,
"mingo@...hat.com" <mingo@...hat.com>,
"alexander.shishkin@...ux.intel.com"
<alexander.shishkin@...ux.intel.com>,
"namhyung@...nel.org" <namhyung@...nel.org>,
"mathieu.poirier@...aro.org" <mathieu.poirier@...aro.org>,
Linuxarm <linuxarm@...wei.com>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"linux-arm-kernel@...ts.infradead.org"
<linux-arm-kernel@...ts.infradead.org>,
"qiangqing.zhang@....com" <qiangqing.zhang@....com>,
Zhangshaokun <zhangshaokun@...ilicon.com>,
"james.clark@....com" <james.clark@....com>,
"linux-imx@....com" <linux-imx@....com>
Subject: Re: [PATCH RFC v4 00/13] perf pmu-events: Support event aliasing for
system PMUs
On 14/10/2020 12:16, Jiri Olsa wrote:
>> My thought was that since the kernel part needs acceptance first [0], which
>> is based on v5.9-rc7, I would just use the same baseline here.
>>
>> However I suppose I should still use Arnaldo's perf/core from now on as
>> baseline, so I'll look at that now.
> yes please, I can't already apply 2nd patch..
>
> patching file pmu-events/jevents.c
> Hunk #1 succeeded at 82 with fuzz 2 (offset 29 lines).
> Hunk #2 FAILED at 335.
> Hunk #3 FAILED at 354.
> Hunk #4 succeeded at 406 (offset 22 lines).
> Hunk #5 FAILED at 439.
> Hunk #6 FAILED at 531.
> Hunk #7 FAILED at 555.
> Hunk #8 FAILED at 602.
> Hunk #9 FAILED at 698.
> Hunk #10 succeeded at 770 (offset 2 lines).
> Hunk #11 succeeded at 813 (offset 2 lines).
> Hunk #12 succeeded at 1075 (offset 2 lines).
> Hunk #13 succeeded at 1242 (offset 2 lines).
> Hunk #14 succeeded at 1273 (offset 2 lines).
> 7 out of 14 hunks FAILED -- saving rejects to file pmu-events/jevents.c.rej
> can't find file to patch at input line 439
OK, so I already did the rebase and it was quite straightforward - the
conflicts came with the recent changes in jevents.
I will send out soon.
Thanks,
John
Powered by blists - more mailing lists