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

Posted by Mark Brown 3 weeks ago

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:

  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.

diff --cc tools/testing/selftests/Makefile
index 330d061f6366f,08f228765a930..0000000000000
--- a/tools/testing/selftests/Makefile
+++ b/tools/testing/selftests/Makefile
@@@ -35,11 -35,9 +35,12 @@@ TARGETS += fchmodat
  TARGETS += filesystems
  TARGETS += filesystems/binderfs
  TARGETS += filesystems/epoll
 +TARGETS += filesystems/eventfd
  TARGETS += filesystems/failfs
  TARGETS += filesystems/fat
+ TARGETS += filesystems/file_stressor
 +TARGETS += filesystems/openat2
 +TARGETS += filesystems/open_tree_ns
  TARGETS += filesystems/overlayfs
  TARGETS += filesystems/statmount
  TARGETS += filesystems/mount-notify

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

Posted by Andrew Morton 3 weeks ago

On Fri, 4 Sep 2026 19:11:24 +0100 Mark Brown <broonie@kernel.org> 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.

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

Posted by Mark Brown 3 weeks ago

On Fri, Sep 04, 2026 at 11:35:58AM -0700, Andrew Morton wrote:
> On Fri, 4 Sep 2026 19:11:24 +0100 Mark Brown <broonie@kernel.org> wrote:

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

gitk wasn't picking that up for some reason.