Subject: Re: linux-next: manual merge of the folio tree with the ext4 tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 15 Mar 2022 23:03:56 +1100

Hi Jan,

On Tue, 15 Mar 2022 12:25:12 +0100 Jan Kara <[email-masked]> wrote:
>
> Thanks for the notice Stephen! The resolution should be like:
> 
> - 	WARN_ON_ONCE(!page_has_buffers(page));
> + 	WARN_ON_ONCE(!folio_buffers(folio));

Thanks, I have updated "git rerere"s resolution for tomorrow.

-- 
Cheers,
Stephen Rothwell