Should be ok. I cherry-picked the patch on to a local checkout of perf/urgent and sent as an in-reply-to here: https://lore.kernel.org/lkml/20200917190026.gb1426...@kernel.org/T/#m6c12d6a224540ed5f222e58fff9807f1cdc4238f
Thanks, Ian On Thu, Sep 17, 2020 at 12:00 PM Arnaldo Carvalho de Melo <a...@kernel.org> wrote: > > Em Fri, Sep 11, 2020 at 12:07:35PM +0900, Namhyung Kim escreveu: > > On Fri, Sep 11, 2020 at 3:02 AM Ian Rogers <irog...@google.com> wrote: > > > v3. cleans up searching for the same event within metric_events to use a > > > helper and avoids a redundant search. It uses a continue loop to > > > make the search for similarly named events shorter. > > > v2. avoids iterating over the whole evlist as suggested by > > > namhy...@kernel.org. It also fixes the metric_leader computation > > > that was broken in the same commits. > > > > > > Erroneous duplication introduced in: > > > commit 2440689d62e9 ("perf metricgroup: Remove duped metric group > > > events"). > > > > > > Fixes: ded80bda8bc9 ("perf expr: Migrate expr ids table to a hashmap"). > > > Reported-by: Jin Yao <yao....@linux.intel.com> > > > Signed-off-by: Ian Rogers <irog...@google.com> > > > > Acked-by: Namhyung Kim <namhy...@kernel.org> > > On my perf/urgent branch (upstream should be the same): > > [acme@five perf]$ patch -p1 < /wb/1.patch > patching file tools/perf/util/metricgroup.c > Hunk #1 succeeded at 150 with fuzz 2 (offset 1 line). > Hunk #2 succeeded at 192 (offset 1 line). > Hunk #3 succeeded at 223 (offset 1 line). > Hunk #4 succeeded at 252 (offset 1 line). > Hunk #5 succeeded at 260 (offset 1 line). > [acme@five perf]$ > > I'm fixing it up, please check that doing this is safe on your side. > > - Arnaldo