[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20171220211424.3cd25fb6@canb.auug.org.au>
Date: Wed, 20 Dec 2017 21:14:24 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Greg KH <greg@...ah.com>
Cc: Arnd Bergmann <arnd@...db.de>,
Linux-Next Mailing List <linux-next@...r.kernel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Uwe Kleine-König
<u.kleine-koenig@...gutronix.de>,
Sagar Dharia <sdharia@...eaurora.org>,
Srinivas Kandagatla <srinivas.kandagatla@...aro.org>,
David Kershner <david.kershner@...sys.com>
Subject: Re: linux-next: manual merge of the staging tree with the
char-misc-next tree
Hi Greg,
On Wed, 20 Dec 2017 09:55:57 +0100 Greg KH <greg@...ah.com> wrote:
>
> Looks good! Sorry for the conflict, I knew it was going to happen :(
I don't mind the trivial ones like this ...
--
Cheers,
Stephen Rothwell
Powered by blists - more mailing lists