Re: [GIT PULL] MM updates for 6.3-rc1

From: Andrew Morton
Date: Thu Feb 23 2023 - 20:56:18 EST


On Thu, 23 Feb 2023 17:33:37 -0800 Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:

> On Mon, Feb 20, 2023 at 1:52 PM Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> wrote:
> >
> > Linus, please merge this cycle's MM updates.
>
> Ok, finally got around to this one, and I am not thrilled about it.
>
> A few notes:
>
> - my fs/udf/inode.c is "minimal". Ugly, ugly, I think
> udf_adinicb_writepage() should just be made to actually deal with
> folios inherently, but I did *NOT* do that, and just did
>
> struct page *page = &folio->page;
>
> at the top, and left it at that. I'm not proud of it, but I hope
> Jan might want to do this properly.
>
> That conflict wasn't mentioned, and now I wonder if the UDF changes
> were in -next at all?

This was a mea culpa, sorry. Stephen did encounter and resolve this
(https://lkml.kernel.org/r/20230127165912.0e4a7b66@xxxxxxxxxxxxxxxx)
but I was fixated on his "linux-next: manual merge of the mm-stable
tree with the XXX tree" emails and not his "linux-next: build failure after
merge of the mm tree" emails. Self-LART has been applied.