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

Stephen Rothwell
2019-02-25T06:44:05Z

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

Hi all,

On Mon, 25 Feb 2019 17:42:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:

This was actually the akpm tree.