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

[Mark Brown]

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

Attachment: signature.asc
Description: PGP signature