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

From: Mark Brown <[email-masked]>
Date: Thu, 25 Sep 2025 13:35:34 +0100

Hi all,

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

  Documentation/filesystems/porting.rst

between commit:

  3d18f80ce181b ("VFS: rename kern_path_locked() and related functions.")

from the vfs-brauner tree and commit:

  b28f9eba12a49 ("change the calling conventions for vfs_parse_fs_string()")

from the vfs tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc Documentation/filesystems/porting.rst
index 78c3d07c0c08e,ab48ab3f6eb21..0000000000000
--- a/Documentation/filesystems/porting.rst
+++ b/Documentation/filesystems/porting.rst
@@@ -1290,10 -1290,10 +1290,22 @@@ parameters for the file system to set t
  
  **mandatory**
  
 +Several functions are renamed:
 +
 +-  kern_path_locked -> start_removing_path
 +-  kern_path_create -> start_creating_path
 +-  user_path_create -> start_creating_user_path
 +-  user_path_locked_at -> start_removing_user_path_at
 +-  done_path_create -> end_creating_path
++
++---
++
++**mandatory**
++
+ Calling conventions for vfs_parse_fs_string() have changed; it does *not*
+ take length anymore (value ? strlen(value) : 0 is used).  If you want
+ a different length, use
+ 
+ 	vfs_parse_fs_qstr(fc, key, &QSTR_LEN(value, len))
+ 
+ instead.