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"

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.

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.