On Wed, Sep 17, 2025 at 11:50:29AM +0200, Christian Brauner wrote:

Perfect, thank you!

All right, #work.mount contains this now:

commit 1b966c4471e6c3862a14f80aeb316ef636d40f84
Merge: 57a7b5b0b6d9 38f4885088fc
Author: Al Viro [off-list ref]
Date:   Wed Sep 17 15:58:06 2025 -0400
 
    Merge branch 'no-rebase-mnt_ns_tree_remove' into work.mount

and vfs/vfs.git #no-rebase-mnt_ns_tree_remove is 38f4885088fc

IOW, merge it into your branch and do your regular changes on top of that -
should be no conflicts in mnt_ns_tree_remove() after that (diff between
no-rebase-mnt_ns_tree_remove and work.mount has nothing in that function)