From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754749AbaEQEWX (ORCPT ); Sat, 17 May 2014 00:22:23 -0400 Received: from top.free-electrons.com ([176.31.233.9]:44242 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750827AbaEQEWW (ORCPT ); Sat, 17 May 2014 00:22:22 -0400 Date: Sat, 17 May 2014 06:22:16 +0200 From: Alexandre Belloni To: Olof Johansson Cc: Nicolas Ferre , Arnd Bergmann , arm@kernel.org, Stephen Rothwell , Linux Kernel list , linux-arm-kernel , Jean-Christophe PLAGNIOL-VILLARD , boris.brezillon@free-electrons.com, linus.walleij@linaro.org, Ludovic Desroches Subject: Re: [GIT PULL] at91: cleanup for 3.16 #1 Message-ID: <20140517042216.GI29318@piout.net> References: <1399484042-27432-1-git-send-email-nicolas.ferre@atmel.com> <536A6FD7.40402@atmel.com> <20140516232635.GB6423@quad.lixom.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20140516232635.GB6423@quad.lixom.net> 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 16/05/2014 at 16:26:35 -0700, Olof Johansson wrote : > On Wed, May 07, 2014 at 07:39:35PM +0200, Nicolas Ferre wrote: > > There is a little conflict with at91-3.16-dt that you already pulled in > > arm-soc: here is the branch that resolves it: > > > > https://github.com/at91linux/linux-at91/commits/at91-3.16-resolved > > That resolution looks odd. Why is one clock under clocks { } and two of them > are at the top level? Shouldn't they all be under the clocks subnode? > > I've merged in now with your resolution, but I think this needs revisiting. > Actually, all the clocks should end up at the root, please refer to: http://lists.infradead.org/pipermail/linux-arm-kernel/2014-March/240219.html I feel that was one of the topics we should have discussed at ELC but we ended up talking about DT ABI stability instead... -- Alexandre Belloni, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com