Re: [PATCH V2 0/9] Support branch counters in block annotation

[Arnaldo Carvalho de Melo <acme@kernel.org>]

On Mon, Aug 12, 2024 at 12:39:17PM -0700, Namhyung Kim wrote:
> On Thu, Aug 08, 2024 at 12:33:15PM -0700, kan.liang@linux.intel.com wrote:
> > From: Kan Liang <kan.liang@linux.intel.com>
> > Kan Liang (9):
> >   perf report: Fix --total-cycles --stdio output error
> >   perf report: Remove the first overflow check for branch counters
> >   perf evlist: Save branch counters information
> >   perf annotate: Save branch counters for each block
> >   perf evsel: Assign abbr name for the branch counter events
> >   perf report: Display the branch counter histogram
> >   perf annotate: Display the branch counter histogram
> >   perf script: Add branch counters
> >   perf test: Add new test cases for the branch counter feature
> 
> Acked-by: Namhyung Kim <namhyung@kernel.org>

Clashed with something here, can you please take a look and rebase to
what is in perf-tools-next/perf-tools-next?

- Arnaldo

  ✓ [PATCH v2 9/9] perf test: Add new test cases for the branch counter feature
    + Acked-by: Namhyung Kim <namhyung@kernel.org> (✓ DKIM/kernel.org)
    + Reviewed-by: Andi Kleen <ak@linux.intel.com> (✓ DKIM/intel.com)
    + Link: https://lore.kernel.org/r/20240808193324.2027665-10-kan.liang@linux.intel.com
    + Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  ---
  ✓ Signed: DKIM/intel.com (From: kan.liang@linux.intel.com)
---
Total patches: 9
---
Cover: ./v2_20240808_kan_liang_support_branch_counters_in_block_annotation.cover
 Link: https://lore.kernel.org/r/20240808193324.2027665-1-kan.liang@linux.intel.com
 Base: not specified
       git am ./v2_20240808_kan_liang_support_branch_counters_in_block_annotation.mbx
⬢[acme@toolbox perf-tools-next]$        git am ./v2_20240808_kan_liang_support_branch_counters_in_block_annotation.mbx
Applying: perf report: Fix --total-cycles --stdio output error
Applying: perf report: Remove the first overflow check for branch counters
Applying: perf evlist: Save branch counters information
Applying: perf annotate: Save branch counters for each block
Applying: perf evsel: Assign abbr name for the branch counter events
Applying: perf report: Display the branch counter histogram
error: patch failed: tools/perf/util/annotate.h:551
error: tools/perf/util/annotate.h: patch does not apply
Patch failed at 0006 perf report: Display the branch counter histogram
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
⬢[acme@toolbox perf-tools-next]$