Re: linux-next: manual merge of the akpm-current tree with the powerpc tree
From: Stephen Rothwell
Date: Wed May 05 2021 - 01:46:34 EST
On Wed, 05 May 2021 14:57:18 +1000 Michael Ellerman <mpe@xxxxxxxxxxxxxx> 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.
Description: OpenPGP digital signature