Re: linux-next: manual merge of the akpm-current tree with the powerpc tree
From: Stephen Rothwell
Date: Mon Feb 25 2019 - 01:44:07 EST
Hi all,
On Mon, 25 Feb 2019 17:42:48 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
This was actually the akpm tree.
--
Cheers,
Stephen Rothwell
Attachment:
pgpVyaFU0pIFQ.pgp
Description: OpenPGP digital signature