linux-kernel - Re: linux-next: manual merge of the mm tree with the fsverity 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: <20230119160202.3de5506f@canb.auug.org.au>
Date:   Thu, 19 Jan 2023 16:02:02 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>,
        Eric Biggers <ebiggers@...nel.org>,
        "Theodore Y. Ts'o" <tytso@....edu>
Cc:     Eric Biggers <ebiggers@...gle.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        "Matthew Wilcox (Oracle)" <willy@...radead.org>
Subject: Re: linux-next: manual merge of the mm tree with the fsverity tree

Hi all,

On Tue, 10 Jan 2023 13:25:19 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the mm tree got a conflict in:
> 
>   fs/buffer.c
> 
> between commit:
> 
>   2a042de143b2 ("fs/buffer.c: support fsverity in block_read_full_folio()")

this is now commit

  4fa512ce7051 ("fs/buffer.c: support fsverity in block_read_full_folio()")

> from the fsverity tree and commit:
> 
>   a0ab20df28e6 ("buffer: replace obvious uses of b_page with b_folio")

this is now commit

  abc8a8a2c7dc ("buffer: replace obvious uses of b_page with b_folio")

> from the mm tree.

from the mm-stable tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped