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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAHc6FU6y4S46nCKHMmxtRHo5rEdbTdMVsxyv_VTzHGCa1A8i6w@mail.gmail.com>
Date: Mon, 26 Jan 2026 14:31:07 +0100
From: Andreas Gruenbacher <agruenba@...hat.com>
To: Mark Brown <broonie@...nel.org>
Cc: Steven Whitehouse <swhiteho@...hat.com>, 
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, 
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the gfs2 tree with the origin tree

Hello,

On Mon, Jan 26, 2026 at 1:31 PM Mark Brown <broonie@...nel.org> 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