Re: linux-next: manual merge of the ftrace tree with Linus' tree

[Steven Rostedt]

On Wed, 8 Jan 2025 13:32:07 +1100
Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:

> Hi all,
> 
> Today's linux-next merge of the ftrace tree got a conflict in:
> 
>   scripts/sorttable.h
> 
> between commit:
> 
>   0210d251162f ("scripts/sorttable: fix orc_sort_cmp() to maintain symmetry and transitivity")
> 
> from Linus' tree and commit:
> 
>   4f1d0c914628 ("scripts/sorttable: Move code from sorttable.h into sorttable.c")
> 
> from the ftrace tree.
> 
> I fixed it up (I deleted the file and applied the following merge fix
> patch) 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.
> 
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Wed, 8 Jan 2025 13:23:17 +1100
> Subject: [PATCH] fix up for "scripts/sorttable: Move code from sorttable.h
>  into sorttable.c"
> 
> interacting with commit
> 
>   0210d251162f ("scripts/sorttable: fix orc_sort_cmp() to maintain symmetry and transitivity")
> 
> from Linus' tree.

Thanks for letting me know. I'll likely just rebase it on v6.13-rc6 and
retest it.

-- Steve