Messages in this thread | | | Date | Tue, 15 Mar 2022 13:44:00 -0400 | From | "Theodore Ts'o" <> | Subject | Re: 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
| |