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

[Mark Brown]

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@xxxxxxxxxx> 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: signature.asc
Description: PGP signature