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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <YjDQYKIPaeOEd+7e@mit.edu>
Date:   Tue, 15 Mar 2022 13:44:00 -0400
From:   "Theodore Ts'o" <tytso@....edu>
To:     Jan Kara <jack@...e.cz>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Matthew Wilcox <willy@...radead.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
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