From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Herring Subject: Re: linux-next: manual merge of the dt-rh tree with the l2-mtd tree Date: Fri, 06 Jul 2012 07:18:31 -0500 Message-ID: <4FF6D797.6040307@gmail.com> References: <20120706145131.2d590abbdd53af03f4913846@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ob0-f174.google.com ([209.85.214.174]:55223 "EHLO mail-ob0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750786Ab2GFMSf (ORCPT ); Fri, 6 Jul 2012 08:18:35 -0400 In-Reply-To: <20120706145131.2d590abbdd53af03f4913846@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Josh Wu , Hong Xu , Artem Bityutskiy , =?ISO-8859-1?Q?Uwe_Kleine-K=F6nig?= On 07/05/2012 11:51 PM, Stephen Rothwell wrote: > Hi Rob, > > Today's linux-next merge of the dt-rh tree got a conflict in > Documentation/devicetree/bindings/mtd/atmel-nand.txt between commit > 348d200508b1 ("mtd: at91: add dt parameters for Atmel PMECC") from the > l2-mtd tree and commit e7e88f9f8aeb ("of: fix a few typos in the binding > documentation") from the dt-rh tree. > > The former replaced the text (and fixed the typo) fixed by the latter, so > I used that. I've dropped the conflicting hunk from that patch. Rob