Re: linux-next: manual merge of the vfs-brauner tree with the vfs-brauner-fixes tree

[Mark Brown]

On Thu, Mar 26, 2026 at 02:24:26PM +0100, Christian Brauner wrote:
> On Wed, Mar 25, 2026 at 08:13:56AM -0700, Darrick J. Wong wrote:

> > That looks correct to me, thanks for pointing out the merge conflict. :)

> Wait wait, the vfs.fixes tree is merged into the vfs.all tree which
> should have the merge conflict resolution:

I'm still merging the version from next-20260312, see my report from
yesterday:

  https://lore.kernel.org/linux-next/acPV19IY3Gna6Ira@xxxxxxxxxxxxx/T/#u

The initially reported issue was fixed, but there's a rather similar new
issue showed up, I suspect it was masked by the prior issue since it's
in a separate kselftest directory (this is namespaces, prior one was in
filesystems) and the kselftest build system is less good at surfacing
all errors than the main kernel one.

Attachment: signature.asc
Description: PGP signature