From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: manual merge of the staging tree with the
 char-misc-next tree
Date: Wed, 20 Dec 2017 21:14:24 +1100
Message-ID: <20171220211424.3cd25fb6@canb.auug.org.au>
References: <20171220133249.37100a10@canb.auug.org.au>
        <20171220085557.GA25945@kroah.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from ozlabs.org ([103.22.144.67]:37873 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1754363AbdLTKO2 (ORCPT <rfc822;linux-next@vger.kernel.org>);
        Wed, 20 Dec 2017 05:14:28 -0500
In-Reply-To: <20171220085557.GA25945@kroah.com>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Greg KH <greg@kroah.com>
Cc: Arnd Bergmann <arnd@arndb.de>, Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Uwe =?UTF-8?B?S2xlaW5lLUvDtm5pZw==?= <u.kleine-koenig@pengutronix.de>, Sagar Dharia <sdharia@codeaurora.org>, Srinivas Kandagatla <srinivas.kandagatla@linaro.org>, David Kershner <david.kershner@unisys.com>

Hi Greg,

On Wed, 20 Dec 2017 09:55:57 +0100 Greg KH <greg@kroah.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