Re: linux-next: manual merge of the vfs-brauner tree with the ext4 tree

[Matthew Wilcox]

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.