Re: linux-next: build failure after merge of the kspp-gustavo tree

[Steven Rostedt]

On Mon, 25 Oct 2021 15:30:29 +1100
Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:

> > Which shouldn't need this fix.  
> 
> Well, that is in your tree today, but (1) doesn't help with the build
> failure in Gustavo's tree on its own (i.e. it creates a dependency
> between Gustavo's tree and your tree) and (2) now I will get a conflict
> between the two trees today.  Oh, well.

Gustavo was only holding that commit so that he can have his commit still
build. We knew of the dependency, and was going to let Linus know of it too.

Gustavo should be able to remove the conflicting commit now.

-- Steve