lkml.org 
[lkml]   [2022]   [Mar]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the folio tree with the ext4 tree
On Tue, Mar 15, 2022 at 12:25:12PM +0100, Jan Kara wrote:
> Thanks for the notice Stephen! The resolution should be like:
>
> - WARN_ON_ONCE(!page_has_buffers(page));
> + WARN_ON_ONCE(!folio_buffers(folio));
>
> How are we going to handle this conflict Ted? Just tell Linus about the
> conflict and resolution?

Agreed, I think that's the simplest approach.

- Ted

\
 
 \ /
  Last update: 2022-09-17 16:17    [W:0.034 / U:1.648 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site