From mboxrd@z Thu Jan  1 00:00:00 1970
From: shawnguo@kernel.org (Shawn Guo)
Date: Wed, 18 Oct 2017 10:19:45 +0800
Subject: linux-next: manual merge of the thermal tree with the imx-mxs tree
In-Reply-To: <1508291246.2746.41.camel@intel.com>
References: <20171016091728.gbtoakghi4ndyyt2@sirena.co.uk>
 <1508291246.2746.41.camel@intel.com>
Message-ID: <20171018021944.GE18810@dragon>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

On Wed, Oct 18, 2017 at 09:47:26AM +0800, Zhang Rui wrote:
> Shawn,
> 
> https://patchwork.kernel.org/patch/9841191/
> https://patchwork.kernel.org/patch/9841193/
> Should I drop these two dts patches and leave them to you?

Okay, let's do that to avoid the conflict.

Shawn