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

From: Mark Brown <broonie@kernel.org>
Date: 2026-09-04 18:42:19
Also in: lkml

On Fri, Sep 04, 2026 at 11:35:58AM -0700, Andrew Morton wrote:

On Fri, 4 Sep 2026 19:11:24 +0100 Mark Brown [off-list ref] wrote:

quoted

Today's linux-next merge of the fs-next tree got a conflict in:

quoted

  tools/testing/selftests/Makefile

quoted

between commit:

quoted

  4ff32f084c158 ("selftests/filesystems: fix missing and stale TARGETS entries")

quoted

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.