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

Stephen Rothwell
2021-05-05T05:46:30Z

[-- Attachment #1: Type: text/plain, Size: 380 bytes --]

Hi Michael,

On Wed, 05 May 2021 14:57:18 +1000 Michael Ellerman <mpe@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.