From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jason Cooper Subject: Re: linux-next: manual merge of the devicetree tree with the arm-soc tree Date: Thu, 16 Jan 2014 23:35:53 -0500 Message-ID: <20140117043553.GL29184@titan.lakedaemon.net> References: <20140117140853.6faf2c053617c5e66648526f@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <20140117140853.6faf2c053617c5e66648526f@canb.auug.org.au> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Stephen Rothwell Cc: Arnd Bergmann , linux-kernel@vger.kernel.org, Grant Likely , linux-next@vger.kernel.org, Olof Johansson , linux-arm-kernel@lists.infradead.org List-Id: linux-next.vger.kernel.org Stephen, On Fri, Jan 17, 2014 at 02:08:53PM +1100, Stephen Rothwell wrote: > Hi Grant, > > Today's linux-next merge of the devicetree tree got a conflict in > arch/arm/boot/dts/dove.dtsi between commits 40aad3c1a9b6 ("dt/bindings: > Remove all references to device_type "ethernet-phy"") and b31b32119abe > ("ARM: dove: sort DT nodes by address") from the devicetree tree and > commit 351291754df3 ("dt/bindings: remove device_type "network" > references") from the devicetree tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Looks good, thanks. Jason.