From mboxrd@z Thu Jan  1 00:00:00 1970
From: Shawn Guo <shawn.guo@freescale.com>
Subject: Re: linux-next: manual merge of the clockevents tree with the
 arm-soc tree
Date: Mon, 26 May 2014 15:49:15 +0800
Message-ID: <20140526074913.GD2650@dragon>
References: <20140526154331.7fc6b30c@canb.auug.org.au>
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: <20140526154331.7fc6b30c@canb.auug.org.au>
Sender: linux-kernel-owner@vger.kernel.org
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>, Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>, linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Cosmin Stoica <cosminstefan.stoica@freescale.com>, Xiubo Li <Li.Xiubo@freescale.com>
List-Id: linux-next.vger.kernel.org

Hi Daniel,

On Mon, May 26, 2014 at 03:43:31PM +1000, Stephen Rothwell wrote:
> Hi Daniel,
> 
> Today's linux-next merge of the clockevents tree got a conflict in
> arch/arm/boot/dts/vf610.dtsi between commit 0517fe6aa880 ("ARM: dts:
> vf610-twr: Add support for sdhc1") from the arm-soc tree and commit
> 07513e1330a9 ("ARM: dts: vf610: Add Freescale FlexTimer Module timer
> node") from the clockevents tree.

Next time, please leave the dts patches to go via arch tree, so that we
can save such conflicts.

Shawn