Re: linux-next: manual merge of the gfs2 tree with the origin tree

[Andreas Gruenbacher]

Hello,

On Mon, Jan 26, 2026 at 1:31 PM Mark Brown <broonie@xxxxxxxxxx> wrote:
> Hi all,
>
> Today's linux-next merge of the gfs2 tree got a conflict in:
>
>   fs/gfs2/lops.c
>
> between commit:
>
>   469d71512d135 ("Revert "gfs2: Fix use of bio_chain"")
>
> from the origin tree and commits:
>
>   c0c8c960ab932 ("Revert "gfs2: Fix use of bio_chain"")
>   910869abc1ca8 ("gfs2: gfs2_chain_bio start sector fix")
>
> from the gfs2 tree.

I've updated gfs2's for-next branch to fix this.

Thanks,
Andreas