Trivial conflict in Documentation/filesystems/porting.rst - a chunk added at the end (as always), with other additions from already merged branches. A bunch of odd boilerplate gone from instances - the reason for those was the need to protect yet-to-be-attched mount from mark_mounts_for_expiry() deciding to take it out. That's easy to detect and take care about in mark_mounts_for_expiry() itself; no need to have every instance similate mount being busy by grabbing an extra reference to it, with finish_automount() undoing that once it attaches that mount. Should've done it that way from the very beginning... It's a flagday change, thankfully there are very few instances. The following changes since commit 92a09c47464d040866cf2b4cd052bc60555185fb: Linux 6.15-rc5 (2025-05-04 13:55:04 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git tags/pull-automount for you to fetch changes up to 2dbf6e0df447d1542f8fd158b17a06d2e8ede15e: kill vfs_submount() (2025-05-06 12:49:07 -0400) ---------------------------------------------------------------- automount wart removal Calling conventions of ->d_automount() made saner (flagday change) vfs_submount() is gone - its sole remaining user (trace_automount) had been switched to saner primitives. Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx> ---------------------------------------------------------------- Al Viro (2): saner calling conventions for ->d_automount() kill vfs_submount() Documentation/filesystems/porting.rst | 7 +++++++ Documentation/filesystems/vfs.rst | 4 +--- fs/afs/mntpt.c | 1 - fs/fuse/dir.c | 3 --- fs/namespace.c | 24 +++--------------------- fs/nfs/namespace.c | 1 - fs/smb/client/namespace.c | 1 - fs/super.c | 9 +-------- include/linux/fs.h | 1 - include/linux/mount.h | 3 --- kernel/trace/trace.c | 19 +++++++++++++++---- 11 files changed, 27 insertions(+), 46 deletions(-)