Re: [GIT PULL] MM updates for 6.4-rc1
From: Christoph Hellwig
Date: Fri Apr 28 2023 - 01:37:09 EST
On Thu, Apr 27, 2023 at 08:15:56PM -0700, Linus Torvalds wrote:
> Most of the bulk of the conflicts were around __filemap_get_folio()
> now returning an ERR_PTR, particularly then with Willy doing the ext4
> folio conversion.
>
> So Christoph, Willy, mind just double-checking me?
The merge looks fine to me.