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

[Stephen Rothwell]

Hi all,

On Mon, 25 Feb 2019 17:42:48 +1100 Stephen Rothwell <s...@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.

-- 
Cheers,
Stephen Rothwell

pgpPothP9uC2A.pgp
Description: OpenPGP digital signature