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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20250107222321.5fd6970a@gandalf.local.home>
Date: Tue, 7 Jan 2025 22:23:21 -0500
From: Steven Rostedt <rostedt@...dmis.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Masami Hiramatsu <mhiramat@...nel.org>, Andrew Morton
 <akpm@...ux-foundation.org>, Kuan-Wei Chiu <visitorckw@...il.com>, Linux
 Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the ftrace tree with Linus' tree

On Wed, 8 Jan 2025 13:32:07 +1100
Stephen Rothwell <sfr@...b.auug.org.au> 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@...b.auug.org.au>
> 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