From: Matthew Wilcox <willy@infradead.org>
To: Mark Brown <broonie@kernel.org>
Cc: Christian Brauner <brauner@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Mike Rapoport <rppt@kernel.org>, Theodore Ts'o <tytso@mit.edu>
Subject: Re: linux-next: manual merge of the vfs-brauner tree with the ext4 tree
Date: Thu, 11 Jun 2026 15:07:22 +0100 [thread overview]
Message-ID: <airBGjtjTf3Yuy0X@casper.infradead.org> (raw)
In-Reply-To: <aiq8CByJNMlXo6Be@sirena.co.uk>
On Thu, Jun 11, 2026 at 02:45:44PM +0100, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the vfs-brauner tree got a conflict in:
>
> fs/jbd2/journal.c
>
> between commit:
>
> bbe9015f23432b ("jbd2: remove special jbd2 slabs")
>
> from the ext4 tree and commit:
>
> 2f6702dc6fdcf0 ("jbd2: replace __get_free_pages() with kmalloc()")
>
> from the vfs-brauner tree.
2f6702dc6fdcf0 is a subset of bbe9015f23432b and should be dropped from
vfs-brauner.
next prev parent reply other threads:[~2026-06-11 14:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-11 13:45 linux-next: manual merge of the vfs-brauner tree with the ext4 tree Mark Brown
2026-06-11 14:07 ` Matthew Wilcox [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-03-27 17:38 Mark Brown
2026-03-30 8:30 ` Jan Kara
2024-09-03 23:15 Stephen Rothwell
2024-09-16 22:23 ` Stephen Rothwell
2024-05-08 0:34 Stephen Rothwell
2024-05-08 6:47 ` Christoph Hellwig
2024-05-08 6:59 ` Stephen Rothwell
2024-05-08 22:04 ` Theodore Ts'o
2024-05-14 1:28 ` Stephen Rothwell
2023-08-21 0:07 Stephen Rothwell
2023-08-21 0:25 ` Stephen Rothwell
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=airBGjtjTf3Yuy0X@casper.infradead.org \
--to=willy@infradead.org \
--cc=brauner@kernel.org \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rppt@kernel.org \
--cc=tytso@mit.edu \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.