From mboxrd@z Thu Jan 1 00:00:00 1970 From: Don Zickus Subject: Re: linux-next: build failure after merge of the final tree (tip tree related) Date: Mon, 22 Nov 2010 17:00:40 -0500 Message-ID: <20101122220040.GC18100@redhat.com> References: <20101122133949.93201b15.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mx1.redhat.com ([209.132.183.28]:28142 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757128Ab0KVWA6 (ORCPT ); Mon, 22 Nov 2010 17:00:58 -0500 Content-Disposition: inline In-Reply-To: <20101122133949.93201b15.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, David Miller 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