[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAHk-=wjaYXeWKsyifQCS=gJf4mxav-b6cdf5boKpMO6M1C-2LQ@mail.gmail.com>
Date: Thu, 27 Apr 2023 20:15:56 -0700
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: Andrew Morton <akpm@...ux-foundation.org>,
Christoph Hellwig <hch@....de>,
Matthew Wilcox <willy@...radead.org>
Cc: mm-commits@...r.kernel.org, linux-mm@...ck.org,
linux-kernel@...r.kernel.org, Lorenzo Stoakes <lstoakes@...il.com>,
Vlastimil Babka <vbabka@...e.cz>
Subject: Re: [GIT PULL] MM updates for 6.4-rc1
On Thu, Apr 27, 2023 at 3:33 PM Andrew Morton <akpm@...ux-foundation.org> wrote:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm tags/mm-stable-2023-04-27-15-30
Ok, so all the merge conflicts looked straightforward enough (except
the one I asked Vlastimil to look at - and that conflict was tiny and
straightforward too, it was just in a really grotty place).
However, let's not get cocky - so I'd ask people double-check my
conflict resolution, even if it looked fairly straightforward.
Mistakes happen.
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?
Linus
Powered by blists - more mailing lists