linux-kernel - Re: linux-next: manual merge of the ftrace tree with the kbuild 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250331105708.331ec145@canb.auug.org.au>
Date: Mon, 31 Mar 2025 10:57:08 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Masami Hiramatsu <mhiramat@...nel.org>, Masahiro Yamada
 <masahiroy@...nel.org>
Cc: Steven Rostedt <rostedt@...dmis.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Uday Shankar <ushankar@...estorage.com>
Subject: Re: linux-next: manual merge of the ftrace tree with the kbuild
 tree

Hi all,

On Mon, 24 Mar 2025 16:41:11 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> 
> Today's linux-next merge of the ftrace tree got a conflict in:
> 
>   scripts/tracing/draw_functrace.py
> 
> between commit:
> 
>   9d702bb1d3c0 ("scripts: make python shebangs specific about desired version")
> 
> from the kbuild tree and commit:
> 
>   a926d15a799a ("scripts/tracing: Remove scripts/tracing/draw_functrace.py")
> 
> from the ftrace tree.
> 
> I fixed it up (I just removed the file) 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.

This is now a conflict between the kbuild tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped