From mboxrd@z Thu Jan  1 00:00:00 1970
From: Shawn Guo <shawnguo@kernel.org>
Subject: Re: linux-next: manual merge of the thermal tree with the imx-mxs
 tree
Date: Wed, 18 Oct 2017 10:19:45 +0800
Message-ID: <20171018021944.GE18810@dragon>
References: <20171016091728.gbtoakghi4ndyyt2@sirena.co.uk>
 <1508291246.2746.41.camel@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-kernel-owner@vger.kernel.org>
Content-Disposition: inline
In-Reply-To: <1508291246.2746.41.camel@intel.com>
Sender: linux-kernel-owner@vger.kernel.org
To: Zhang Rui <rui.zhang@intel.com>
Cc: Mark Brown <broonie@kernel.org>, Leonard Crestez <leonard.crestez@nxp.com>, Marco Franchi <marco.franchi@nxp.com>, linux-arm-kernel@lists.infradead.org, Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
List-Id: linux-next.vger.kernel.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