Subject: linux-next: manual merge of the fs-next tree with the mm-unstable tree

From: Mark Brown <[email-masked]>
Date: Mon, 15 Sep 2025 18:46:16 +0100

Hi all,

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

  Documentation/filesystems/porting.rst

between commit:

  cf411621eeaa2 ("doc: update porting, vfs documentation for mmap_prepare actions")

from the mm-unstable tree and commit:

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

from the fs-next 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 6743ed0b91126,85702e6fa1f21..0000000000000
--- a/Documentation/filesystems/porting.rst
+++ b/Documentation/filesystems/porting.rst
@@@ -1286,7 -1286,14 +1286,19 @@@ The vm_area_desc provides the minimum r
  to initialise state upon memory mapping of a file-backed region, and output
  parameters for the file system to set this state.
  
 +In nearly all cases, this is all that is required for a filesystem. However, if
 +a filesystem needs to perform an operation such a pre-population of page tables,
 +then that action can be specified in the vm_area_desc->action field, which can
 +be configured using the mmap_action_*() helpers.
++
+ ---
+ 
+ **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.