From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753639AbbJOPxN (ORCPT <rfc822;w@1wt.eu>);
	Thu, 15 Oct 2015 11:53:13 -0400
Received: from mout.kundenserver.de ([212.227.17.10]:64338 "EHLO
	mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753351AbbJOPxJ (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Thu, 15 Oct 2015 11:53:09 -0400
From: Arnd Bergmann <arnd@arndb.de>
To: linux-arm-kernel@lists.infradead.org
Cc: Jisheng Zhang <jszhang@marvell.com>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Thomas Hebb <tommyhebb@gmail.com>,
        Antoine Tenart <antoine.tenart@free-electrons.com>,
        linux-kernel@vger.kernel.org, linux-next@vger.kernel.org,
        Olof Johansson <olof@lixom.net>,
        Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Subject: Re: linux-next: build failure after merge of the arm-soc tree
Date: Thu, 15 Oct 2015 17:52:59 +0200
Message-ID: <8514405.TqbzRgirza@wuerfel>
User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; )
In-Reply-To: <20151015104045.04136253@xhacker>
References: <20151015101920.7fa592f7@canb.auug.org.au> <20151015104045.04136253@xhacker>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
X-Provags-ID: V03:K0:cDoq4HqEabj/6m1ME4zc+VyKjih1Y1lR1nlDqP5dsQ0CzTlqZNK
 NK0SNjzSFFbOgH35Vpb8UErPMMM/zM7qHZtHB4rNQnIf0vOYSZgILkqcG3gA2uRw25b4pwv
 5MEOKFWLeY8EpfoosIFBzyfj57FGjCodRNvQiRV28TKRgggq62PVNJvQGM9pGvrPYXQTXMG
 OTAlDPGuFyOWUHLVd5sVA==
X-UI-Out-Filterresults: notjunk:1;V01:K0:0aQUJDbwS/A=:vcUUVmmO9/7SvsxFMoEUg6
 RlAr/6YCuRqoiywSRsuWjbnMUAOQox1cgEYr6OBevqxTSUhQuTT61kdwCirhD7Zh3nFhfIFwH
 q/QmrEq4Mt2Ah1JlA3XAMYEqZ7+23kJSNgkhxDfJMWSP03ZRxtmHoE0svzXI/KJq7BWIf1yEL
 4zHTdZz8uFryLhpKPYbFzveH0wk78Q76GYCLZWkOwItqVHytDInMc/sKt3D6pyD55GeO5kBFq
 TgJdIWLdFquT/hfRRQCdvC8q1xDzk2VnSEKmM71FGTCbMBDUCpSFvpXWjcoIH7cgj6ZD/GzRv
 y53IbCMaF3U0WsFqnKwyx23bv4cECpaE31MPP0U1FHuo346w+/5XoNM7DOTqi9jbJ3S+yto4a
 +NRX1xa/0IOXPnBOKQi+xsG9q9Echqn8iKmmc5IFh1Zi20T0h4jo8Dhc5fICkiow6lx/tdfoB
 G+9tgvemsnZYtiCbNSprUhDxMmEo5IVSZmPl4DYR1G1DNogJrMdx4dxB8oTX5UGoM3o38a+Dq
 Rr62TdV/RYWZ+2/Xi2gi3ThnoCWxhuARfRn69MWeymRPRG02tsftKWsTJAf9KFHptc9iL6CZY
 CZyyH60uDbdV1whnlNC5GQ3KNHPCkI7hwvJkWdEKp4g3xkjjizerDhWoFAOzjuVypb0w+eZzu
 LXrG1puTVWV5kmwqw4NElF/oXRudprLROTZn9/eNIjRuT5wRJTGymEdwthPKCRoKasjD0VStz
 TGGRKflh/SA3j84x
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thursday 15 October 2015 10:40:45 Jisheng Zhang wrote:
> On Thu, 15 Oct 2015 10:19:20 +1100
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > Hi all,
> > 
> > After merging the arm-soc tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> > 
> > arch/arm/boot/dts/berlin2q.dtsi:62.24-25 syntax error
> > FATAL ERROR: Unable to parse input tree
> 
> I just checked, this is caused by missing the following two commits
> 
> f72d787d9287 ("clk: berlin: move MAX_CLKS out of drivers/clk/berlin")
> 
> 44b2e5f96d5e ("clk: berlin: add cpuclk")

I've reverted 23998645f6e73 ("ARM: berlin: dts: add the cpufreq-dt
bindings on the BG2Q") on my for-next branch for the time being, to
get a working tree again and am waiting for a proper fixup patch
from Sebastian now to rectify the next/dt branch.

	Arnd