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] [day] [month] [year] [list]

Message-ID: <20250331121231.64ce87c0@gandalf.local.home>
Date: Mon, 31 Mar 2025 12:12:31 -0400
From: Steven Rostedt <rostedt@...dmis.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Masami Hiramatsu <mhiramat@...nel.org>, Masahiro Yamada
 <masahiroy@...nel.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

On Mon, 31 Mar 2025 10:57:08 +1100
Stephen Rothwell <sfr@...b.auug.org.au> wrote:

> > 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.

Thanks. It's a trivial conflict as the file is simply deleted. The change
to that file should just be dropped.

That script has been broken for years and nobody complained about it.

-- Steve