mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Andreas Gruenbacher <agruenba@redhat.com>
To: Mark Brown <broonie@kernel.org>
Cc: Steven Whitehouse <swhiteho@redhat.com>,
	 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	 Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the gfs2 tree with the origin tree
Date: Mon, 26 Jan 2026 14:31:07 +0100	[thread overview]
Message-ID: <CAHc6FU6y4S46nCKHMmxtRHo5rEdbTdMVsxyv_VTzHGCa1A8i6w@mail.gmail.com> (raw)
In-Reply-To: <aXdcYzuVogTFGWyf@sirena.org.uk>

Hello,

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


  reply	other threads:[~2026-01-26 13:31 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-01-26 12:21 Mark Brown
2026-01-26 13:31 ` Andreas Gruenbacher [this message]
2026-11-17 11:50 Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAHc6FU6y4S46nCKHMmxtRHo5rEdbTdMVsxyv_VTzHGCa1A8i6w@mail.gmail.com \
    --to=agruenba@redhat.com \
    --cc=broonie@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=swhiteho@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®