From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Rafael J. Wysocki" Subject: Re: linux-next: build failure after merge of the pm tree Date: Mon, 02 Nov 2015 01:37:46 +0100 Message-ID: <2844514.qaeccbtn3B@vostro.rjw.lan> References: <20151101175718.130f33f2@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7Bit Return-path: In-Reply-To: <20151101175718.130f33f2@canb.auug.org.au> Sender: linux-kernel-owner@vger.kernel.org To: Stephen Rothwell Cc: Olof Johansson , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Matthias Brugger , Marc Zyngier List-Id: linux-next.vger.kernel.org On Sunday, November 01, 2015 05:57:18 PM Stephen Rothwell wrote: > Hi Rafael, Hi, Thanks for the patch! > After merging the pm tree, today's linux-next build (arm > multi_v7_defconfig) failed like this: > > arch/arm/mach-mediatek/mediatek.c: In function 'mediatek_timer_init': > arch/arm/mach-mediatek/mediatek.c:43:2: error: implicit declaration of function 'clocksource_of_init' [-Werror=implicit-function-declaration] > clocksource_of_init(); > ^ > > Caused by commit > > 3722ed2380ad ("clocksource: cosmetic: Drop OF 'dependency' from symbols") > > interacting with commit > > 9821e545c5e0 ("ARM: mediatek: enable gpt6 on boot up to make arch timer working") > > from the arm-soc tree. > > I applied the following merge fix patch for today (someone should tell > Linus when theese trees are merged): I'll do that. Thanks, Rafael