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

[Steven Rostedt]

On Mon, 31 Mar 2025 10:57:08 +1100
Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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