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

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

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 2112 bytes --]

Hi all,

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

  Documentation/filesystems/porting.rst

between commit:

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

from the mm-stable tree and commits:

  3d18f80ce181b ("VFS: rename kern_path_locked() and related functions.")
  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,359b333e89c5a..0000000000000
--- a/Documentation/filesystems/porting.rst
+++ b/Documentation/filesystems/porting.rst
@@@ -1286,7 -1286,24 +1286,27 @@@ 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**
+ 
+ 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
 -=======
++
+ 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.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1066 bytes --]

Hi all,

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

  fs/f2fs/compress.c

between commit:

  8066a7c76e816 ("folio_batch: rename pagevec.h to folio_batch.h")

from the mm-stable tree and commit:

  d82869456217e ("f2fs: support to report fserror")

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 fs/f2fs/compress.c
index 614e00b8ffdc5,f43ff7ffca60f..0000000000000
--- a/fs/f2fs/compress.c
+++ b/fs/f2fs/compress.c
@@@ -13,7 -13,8 +13,9 @@@
  #include <linux/lzo.h>
  #include <linux/lz4.h>
  #include <linux/zstd.h>
 +#include <linux/folio_batch.h>
+ #include <linux/pagevec.h>
+ #include <linux/fserror.h>
  
  #include "f2fs.h"
  #include "node.h"

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the fs-next tree with the mm-stable tree

[Tal Zussman]

On Wed, Mar 25, 2026 at 10:14 AM Mark Brown <broonie@kernel.org> wrote:
>
> Hi all,
>
> Today's linux-next merge of the fs-next tree got a conflict in:
>
>   fs/f2fs/compress.c
>
> between commit:
>
>   8066a7c76e816 ("folio_batch: rename pagevec.h to folio_batch.h")
>
> from the mm-stable tree and commit:
>
>   d82869456217e ("f2fs: support to report fserror")
>
> 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 fs/f2fs/compress.c
> index 614e00b8ffdc5,f43ff7ffca60f..0000000000000
> --- a/fs/f2fs/compress.c
> +++ b/fs/f2fs/compress.c
> @@@ -13,7 -13,8 +13,9 @@@
>   #include <linux/lzo.h>
>   #include <linux/lz4.h>
>   #include <linux/zstd.h>
>  +#include <linux/folio_batch.h>
> + #include <linux/pagevec.h>
> + #include <linux/fserror.h>

This doesn't look right. pagevec.h was renamed to folio_batch.h in
8066a7c76e816 and should no longer exist.

Re: linux-next: manual merge of the fs-next tree with the mm-stable tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 667 bytes --]

On Wed, Mar 25, 2026 at 02:40:15PM -0400, Tal Zussman wrote:
> On Wed, Mar 25, 2026 at 10:14 AM Mark Brown <broonie@kernel.org> wrote:

> > diff --cc fs/f2fs/compress.c
> > index 614e00b8ffdc5,f43ff7ffca60f..0000000000000
> > --- a/fs/f2fs/compress.c
> > +++ b/fs/f2fs/compress.c
> > @@@ -13,7 -13,8 +13,9 @@@
> >   #include <linux/lzo.h>
> >   #include <linux/lz4.h>
> >   #include <linux/zstd.h>
> >  +#include <linux/folio_batch.h>
> > + #include <linux/pagevec.h>
> > + #include <linux/fserror.h>

> This doesn't look right. pagevec.h was renamed to folio_batch.h in
> 8066a7c76e816 and should no longer exist.

Yes, I did fix that up later.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]