From: "Theodore Ts'o" <tytso@mit.edu>
To: Jan Kara <jack@suse.cz>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Matthew Wilcox <willy@infradead.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the folio tree with the ext4 tree
Date: Tue, 15 Mar 2022 13:44:00 -0400 [thread overview]
Message-ID: <YjDQYKIPaeOEd+7e@mit.edu> (raw)
In-Reply-To: <20220315112512.yl7dewzglimjurh5@quack3.lan>
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
prev parent reply other threads:[~2022-03-15 17:44 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-15 9:40 linux-next: manual merge of the folio tree with the ext4 tree Stephen Rothwell
2022-03-15 11:25 ` Jan Kara
2022-03-15 12:03 ` Stephen Rothwell
2022-03-15 17:44 ` Theodore Ts'o [this message]
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=YjDQYKIPaeOEd+7e@mit.edu \
--to=tytso@mit.edu \
--cc=jack@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=willy@infradead.org \
/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.