From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934360AbdJRCT5 (ORCPT ); Tue, 17 Oct 2017 22:19:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:32784 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762663AbdJRCTz (ORCPT ); Tue, 17 Oct 2017 22:19:55 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 460DB218AC Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=shawnguo@kernel.org Date: Wed, 18 Oct 2017 10:19:45 +0800 From: Shawn Guo To: Zhang Rui Cc: Mark Brown , Leonard Crestez , Marco Franchi , linux-arm-kernel@lists.infradead.org, Linux-Next Mailing List , Linux Kernel Mailing List Subject: Re: linux-next: manual merge of the thermal tree with the imx-mxs tree 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 Content-Disposition: inline In-Reply-To: <1508291246.2746.41.camel@intel.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@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