From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5ECBCC433F5 for ; Tue, 12 Oct 2021 09:31:56 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2CEEF610C7 for ; Tue, 12 Oct 2021 09:31:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 2CEEF610C7 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=microchip.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:CC:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=/QSl4GsjySy0al46qN+sWmnROBH4yfdQiOXoGjCnwrs=; b=Pg4dTDgc/Y/PAMCTc2jjbmh4qB xYpsePASO9m3osRZDmWDMXtUt56xNRhqqlSTDTHE4Hwn4jMOUNKM8RgthOHxeN8P3cbCjz0URkbE7 RLsdaWYuV/rvRoifdi7a1NEf11XvDmORGtppbJVSc+1aZtEkdiwJc42jHugmHx0g0AqO8MCHK9P0t Rgt4g7oho9D84t5zA6YUvT2X6SesUtk05vCZCDa/sldqX6qNy96y7L+6j9P7zDz5dSc4T15KWUmb8 meAs5zex3yeXb+6TqJQN3aVdPlosuiwpe0jU67rpM/WkMMztazLl0ALnc7PpWnliW2901nlTlv928 RFp2o8VA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1maE66-00CFiQ-9D; Tue, 12 Oct 2021 09:29:22 +0000 Received: from esa.microchip.iphmx.com ([68.232.154.123]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1maE60-00CFhL-8N for linux-arm-kernel@lists.infradead.org; Tue, 12 Oct 2021 09:29:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1634030956; x=1665566956; h=subject:to:cc:references:from:message-id:date: mime-version:in-reply-to:content-transfer-encoding; bh=f3zZcvsgAiAmDQe4g9mSaMYXTlCLVZMEuAwXlFHxwYU=; b=PROOUY2LLjCc5Ox+QHNbqEH4ADwCtA8Bou/TMtE3jw6Qmx5dFY5rA1l1 SxQe6PZAdujgyNp5Woi5cTrhbQoco45aOqcQKjaeKGEf7Da7w418jCZcI CnHY5odB4AOROB3feSvWAffxug5VJKf6IvfJ9dxd0ZQipP58Q8hPaW65j 7b+psXplEZG8y/Fa373ksZG4qVFJ7o2ugeMqwRvJGGZIVaVakwVWl4NiQ on2bWTRyXe+0pBxAEc3oo52F0F+1eRuh0JtUd/NFwh4+2z0ndEkE56sYc GEk60dKmFoBZn8fUD2Vb2+Pcm5gIe+KKJSyRKeBE9OpPXbOGheplXh+kF w==; IronPort-SDR: y87y+K9Hh6Mb34RNV4RLDg1P1CZg9BjmWlrrkj20sLlK+WnHeIdMJUhE0fx+bu++F63I5NqA1j ARsNUVvJ83mEMboIgRNHJ/TZmFXEGd+c+s6cKubypHAS28l49/0+Eir33DTFMFh89fuL4Ltabz WZrgpA/TYy1y56h7w6bz9KEVoMYfNdcujXNMtAKw6oP0fpmBxNULYogaIFxgq8CVLciWEYnLya kA8GPCmBFWg7KR+UVsu4bLm9auP7pcG95c78AHqX3kmOu5sITPv20CXsLELyWMpx0wQx00FbR2 kAl5IDcHJoc8zJaWSYaylyb0 X-IronPort-AV: E=Sophos;i="5.85,367,1624345200"; d="scan'208";a="72636433" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa6.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 12 Oct 2021 02:29:14 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Tue, 12 Oct 2021 02:29:13 -0700 Received: from [10.159.245.112] (10.10.115.15) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server id 15.1.2176.14 via Frontend Transport; Tue, 12 Oct 2021 02:29:12 -0700 Subject: Re: linux-next: build failure after merge of the arm-soc tree To: Arnd Bergmann CC: Stephen Rothwell , Olof Johansson , ARM , Linux Kernel Mailing List , Linux Next Mailing List References: <20211012110309.17d51c3e@canb.auug.org.au> <97e578a3-b12e-1975-717d-a0cf663673f0@microchip.com> From: Nicolas Ferre Organization: microchip Message-ID: Date: Tue, 12 Oct 2021 11:29:09 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211012_022916_395518_A84FEDE4 X-CRM114-Status: GOOD ( 21.85 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 12/10/2021 at 09:56, Arnd Bergmann wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > On Tue, Oct 12, 2021 at 9:35 AM Nicolas Ferre > wrote: >> On 12/10/2021 at 02:03, Stephen Rothwell wrote: >>> >>> After merging the arm-soc tree, today's linux-next build (arm >>> multi_v7_defconfig) failed like this: >>> >>> Error: arch/arm/boot/dts/sama7g5.dtsi:167.3-7 syntax error >>> FATAL ERROR: Unable to parse input tree >>> >>> Caused by commit >>> >>> 9be4be3ed1ec ("Merge branch 'arm/dt' into for-next") > > Thank you for the report! > > I had verified the arm/dt branch by itself, but didn't recheck it after I > merged it into the for-next branch. At least that one is easy to fix > up as I don't send the combined branch to Linus, and the arm/dt > branch does not have the problem. > >> I had following patch to have the nodes in alphabetical order: >> > ... >> >> Sorry for not having mentioned this conflict in the pull-request. > > No worries, > > I had assumed you had them sorted by unit-address, so I had them > in the wrong order as well. Fixing up both issues in for-next > now by redoing the merge. OMG, you're right, it's by unit-address: I'm removing my at91-next for now to not cause more confusion and merge conflicts. Not a big deal if you already re-did the merge. Best regards, Nicolas -- Nicolas Ferre _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel