From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752965AbbG2HED (ORCPT ); Wed, 29 Jul 2015 03:04:03 -0400 Received: from ozlabs.org ([103.22.144.67]:36304 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751891AbbG2HEB (ORCPT ); Wed, 29 Jul 2015 03:04:01 -0400 Date: Wed, 29 Jul 2015 17:03:59 +1000 From: Stephen Rothwell To: Andrew Morton Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Guenter Roeck Subject: linux-next: build failure after merge of the akpm-current tree Message-ID: <20150729170359.1a8e05cf@canb.auug.org.au> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.28; i586-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au