Re: linux-next: manual merge of the staging tree with the char-misc-next tree

From: Stephen Rothwell
Date: Wed Dec 20 2017 - 05:15:16 EST

Hi Greg,

On Wed, 20 Dec 2017 09:55:57 +0100 Greg KH <greg@xxxxxxxxx> wrote:
> Looks good! Sorry for the conflict, I knew it was going to happen :(

I don't mind the trivial ones like this ...

Stephen Rothwell