Re: linux-next: manual merge of the ftrace tree with the tip-fixes tree

[Tomas Glozar]

st 10. 6. 2026 v 17:43 odesílatel Mark Brown <broonie@xxxxxxxxxx> napsal:
>
> Hi all,
>
> Today's linux-next merge of the ftrace tree got conflicts in:
>
>   tools/tracing/rtla/src/common.c
>   tools/tracing/rtla/src/common.h
>   tools/tracing/rtla/src/osnoise_hist.c
>   tools/tracing/rtla/src/osnoise_top.c
>   tools/tracing/rtla/src/timerlat_hist.c
>   tools/tracing/rtla/src/timerlat_top.c
>
> between commit:
>
>   e9e41d3035032e ("rtla: Fix parsing of multi-character short options")
>
> from the tip-fixes tree and commits:
>
>   704fe8f3d97bba ("tools/rtla: Fix --dump-tasks usage in timerlat")
>   f03a59f949176c ("rtla: Stop the record trace on interrupt")
>   5d9af63e80b5a2 ("rtla: Parse cmdline using libsubcmd")
>   03d745b9843560 ("rtla/timerlat: Add -A/--aligned CLI option")
>
> from the ftrace tree.

Good catch. It's actually a fix for 7.1 from our tree
(linux-trace/tools-fixes) and 7.2 queued patches from another of our
trees (linux-trace/tools-for-next). It appears that tip-fixes is based
on master, which is where the tools-fixes commit came from.

>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>

The conflict was because I fixed a regression in 7.0/7.1 in code that
will be removed in 7.2. So it only needs at most a note to the pull
request in the 7.2 merge window, I think.

> [truncated huge diff]

Looks correct:

$ git diff rtla-v7.2 next/master tools/tracing/rtla
$

Tests pass on linux-next/master. Thanks!

Tomas