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

[Guenter Roeck]

On 07/29/2015 12:03 AM, Stephen Rothwell wrote:
> Hi Andrew,
>
> After merging the akpm-current tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> kernel/watchdog.c:654:6: error: redefinition of 'watchdog_nmi_enable_all'
>   void watchdog_nmi_enable_all(void) {}
>        ^
> In file included from kernel/watchdog.c:16:0:
> include/linux/nmi.h:34:20: note: previous definition of 'watchdog_nmi_enable_all' was here
>   static inline void watchdog_nmi_enable_all(void) {}
>                      ^
> kernel/watchdog.c:655:6: error: redefinition of 'watchdog_nmi_disable_all'
>   void watchdog_nmi_disable_all(void) {}
>        ^
> In file included from kernel/watchdog.c:16:0:
> include/linux/nmi.h:33:20: note: previous definition of 'watchdog_nmi_disable_all' was here
>   static inline void watchdog_nmi_disable_all(void) {}
>                      ^
>
> Caused by commit
>
>    7e6e3bfa2820 ("kernel/watchdog: move NMI function header declarations from watchdog.h to nmi.h")
>
> I have reverted that commit for today.


v2 with a fix submitted already, after the zero day build bots alerted me.

Sorry for the trouble; I didn't expect that there would be two sets of dummy functions.
No excuse, of course :-(.

Guenter

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/