Subject: Re: linux-next: manual merge of the akpm-current tree with the folio tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 16 Feb 2022 20:49:48 +1100

Hi all,

On Wed, 16 Feb 2022 17:21:09 +1100 Stephen Rothwell <[email-masked]> wrote:
>
> It looks like Andrew now has a new version of Hugh's patches and there
> are quite a few other conflicts as well (see my attempt at mm/gup.c).

I have attached the conflicts I get when I merge the folio tree into
today's linux-next.
-- 
Cheers,
Stephen Rothwell