Re: linux-next: build failure after merge of the clk tree

From: Stephen Boyd
Date: Fri May 03 2019 - 11:56:19 EST

Quoting Stephen Rothwell (2019-05-02 16:25:11)
> Hi all,
> After merging the clk tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> arch/arm/mach-omap2/omap_hwmod.c: In function '_get_clkdm':
> arch/arm/mach-omap2/omap_hwmod.c:669:35: error: 'CLK_IS_BASIC' undeclared (first use in this function); did you mean 'CLOCKS_MASK'?
> if (__clk_get_flags(oh->_clk) & CLK_IS_BASIC)
> ^~~~~~~~~~~~
> arch/arm/mach-omap2/omap_hwmod.c:669:35: note: each undeclared identifier is reported only once for each function it appears in
> Caused by commit
> 7c36ec8a90a8 ("clk: Remove CLK_IS_BASIC clk flag")
> I have used the clk tree from next-20190502 for today. (The above commit
> does not revert cleanly.)

Sorry, I got confused and merged the wrong branch over. Should be fixed
up now.