From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752959AbcFFDkb (ORCPT ); Sun, 5 Jun 2016 23:40:31 -0400 Received: from mail-oi0-f50.google.com ([209.85.218.50]:33158 "EHLO mail-oi0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752536AbcFFDk3 (ORCPT ); Sun, 5 Jun 2016 23:40:29 -0400 MIME-Version: 1.0 In-Reply-To: <20160606095559.67cf4f00@canb.auug.org.au> References: <20160606095559.67cf4f00@canb.auug.org.au> Date: Sun, 5 Jun 2016 20:40:28 -0700 Message-ID: Subject: Re: linux-next: build failure after merge of the amlogic tree From: Kevin Hilman To: Stephen Rothwell Cc: linux-next@vger.kernel.org, lkml , Neil Armstrong , Philipp Zabel Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Stephen, On Sun, Jun 5, 2016 at 4:55 PM, Stephen Rothwell wrote: > Hi Kevin, > > After merging the amlogic tree, today's linux-next build (arm > multi_v7_defconfig) failed like this: > > In file included from arch/arm/boot/dts/meson8b-mxq.dts:48:0: > arch/arm/boot/dts/meson8b.dtsi:49:53: fatal error: dt-bindings/reset/amlogic,meson8b-reset.h: No such file or directory > In file included from arch/arm/boot/dts/meson8b-odroidc1.dts:48:0: > arch/arm/boot/dts/meson8b.dtsi:49:53: fatal error: dt-bindings/reset/amlogic,meson8b-reset.h: No such file or directory > > Caused by commit > > bf205ad75a17 ("ARM: dts: amlogic: Enable Reset Controller on Meson8b platforms") > > I guess a file was forgotten. Not forgotten, but merged through Philip's reset tree, which I thought was already in linux-next. Sorry about that. Kevin