Re: linux-next: manual merge of the fs-next tree with the origin tree

[Andrew Morton]

On Fri, 4 Sep 2026 19:11:24 +0100 Mark Brown <broonie@xxxxxxxxxx> wrote:

> Hi all,
> 
> Today's linux-next merge of the fs-next tree got a conflict in:
> 
>   tools/testing/selftests/Makefile
> 
> between commit:
> 
>   4ff32f084c158 ("selftests/filesystems: fix missing and stale TARGETS entries")
> 
> from the origin tree and commit:

"origin tree"?  I assume mm.git's mm-nonmm-unstable was intended.

> 
>   5550456dad376 ("selftests/filesystems: Move file_stressor to dedicated subdirectory")
> 
> from the fs-next tree.
> 
> I fixed it up (see below) 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.

OK, thanks.  I'll send "selftests/filesystems: fix missing and stale
TARGETS entries" over to Christian.