[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <aXfUNewGdbqqQL18@x1>
Date: Mon, 26 Jan 2026 17:53:09 -0300
From: Arnaldo Carvalho de Melo <acme@...nel.org>
To: Ian Rogers <irogers@...gle.com>
Cc: Peter Zijlstra <peterz@...radead.org>, Ingo Molnar <mingo@...hat.com>,
Namhyung Kim <namhyung@...nel.org>,
Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
Jiri Olsa <jolsa@...nel.org>,
Adrian Hunter <adrian.hunter@...el.com>,
James Clark <james.clark@...aro.org>,
Shimin Guo <shimin.guo@...dio.com>, Andi Kleen <ak@...ux.intel.com>,
Leo Yan <leo.yan@....com>, Yujie Liu <yujie.liu@...el.com>,
linux-kernel@...r.kernel.org, linux-perf-users@...r.kernel.org
Subject: Re: [PATCH v1 0/3] perf more ELF machine usage
On Mon, Jan 26, 2026 at 05:52:39PM -0300, Arnaldo Carvalho de Melo wrote:
> On Fri, Jan 23, 2026 at 04:16:08PM -0800, Ian Rogers wrote:
> > Switch 3 more cases where the perf_env arch was being used to
> > determine the architecture type and switch to using the ELF
> > machine. This includes the addition of minimal instruction parsing in
> > perf script for architectures other than x86, or x86 when
> > cross-platform.
> >
> > Note: this series will conflict with the e_flags series:
> > https://lore.kernel.org/lkml/20260123222209.1181249-1-irogers@google.com/
> > that adds an additional out argument to thread__e_machine. In all the
> > cases here that argument should be NULL. So:
> > thread__e_machine(thread, machine)
> > becomes:
> > thread__e_machine(thread, machine, /*e_flags=*/NULL)
>
> This one isn't applying.
⬢ [acme@...lbx perf-tools-next]$ git am ./20260123_irogers_perf_more_elf_machine_usage.mbx
Applying: perf script: Fix script_fetch_insn for more than just x86
Applying: perf callchain: Switch callchain_param_setup from an arch to an e_machine
error: patch failed: tools/perf/util/callchain.c:31
error: tools/perf/util/callchain.c: patch does not apply
Patch failed at 0002 perf callchain: Switch callchain_param_setup from an arch to an e_machine
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
⬢ [acme@...lbx perf-tools-next]$
- Arnaldo
Powered by blists - more mailing lists