Subject: Re: linux-next: build failure after merge of the final tree (tip tree related)

From: Don Zickus <[email-masked]>
Date: Mon, 22 Nov 2010 17:00:40 -0500

On Mon, Nov 22, 2010 at 01:39:49PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the final tree, today's linux-next build (sparc64 defconfig)
> failed like this:
> 
> arch/sparc/kernel/nmi.c:54: error: redefinition of 'touch_nmi_watchdog'
> include/linux/nmi.h:21: note: previous definition of 'touch_nmi_watchdog' was here
> 
> Caused (or, at least exposed) by commit
> 5f2b0ba4d94b3ac23cbc4b7f675d98eb677a760a ("x86, nmi_watchdog: Remove the
> old nmi_watchdog").  Sparc appears to have a touch_nmi_watchdog() and
> defines ARCH_HAS_NMI_WATCHDOG but not CONFIG_HARDLOCKUP_DETECTOR.

Sorry about that.  I'll push another patch to Ingo to fix this.

Cheers,
Don