linux-next: manual merge of the akpm-current tree with the powerpc tree

[Stephen Rothwell]

Hi Michael,

On Wed, 05 May 2021 14:57:18 +1000 Michael Ellerman <mpe at ellerman.id.au> wrote:
>
> Urgh, I did check linux-next to see if that patch would conflict but
> didn't think it would conflict *that* badly.

Its not as bad as it looks, the akpm-current patches just added three
selects and just need to be put in the proper place.

-- 
Cheers,
Stephen Rothwell
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20210505/88762ef9/attachment-0001.sig>