From: Ingo Molnar <mingo@elte.hu>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Don Zickus <dzickus@redhat.com>,
David Miller <davem@davemloft.net>
Subject: Re: linux-next: build failure after merge of the final tree (tip tree related)
Date: Mon, 29 Nov 2010 09:29:16 +0100 [thread overview]
Message-ID: <20101129082916.GA12374@elte.hu> (raw)
In-Reply-To: <20101129135023.4a931f86.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> On Mon, 22 Nov 2010 13:39:49 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > 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.
> >
> > I have reverted that commit for today (as well as commit
> > 072b198a4ad48bd722ec6d203d65422a4698eae7 "x86, nmi_watchdog: Remove all
> > stub function calls from old nmi_watchdog" that depends on it).
>
> This build failure is back, so I have reverted the above commits again.
Don, have you got a fix for that?
Thanks,
Ingo
next prev parent reply other threads:[~2010-11-29 8:29 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-22 2:39 linux-next: build failure after merge of the final tree (tip tree related) Stephen Rothwell
2010-11-22 22:00 ` Don Zickus
2010-11-29 2:50 ` Stephen Rothwell
2010-11-29 8:29 ` Ingo Molnar [this message]
2010-11-29 14:30 ` Don Zickus
2010-12-07 1:58 ` Stephen Rothwell
2010-12-07 15:37 ` Don Zickus
-- strict thread matches above, loose matches on Subject: below --
2011-04-12 4:00 Stephen Rothwell
2011-04-12 6:20 ` Ingo Molnar
2011-04-12 6:25 ` David Miller
2010-11-29 2:50 Stephen Rothwell
2010-11-29 22:30 ` Peter Zijlstra
2010-12-07 1:56 ` Stephen Rothwell
2010-10-14 5:49 Stephen Rothwell
2010-10-14 6:31 ` Ingo Molnar
2010-09-13 14:29 Stephen Rothwell
2010-09-16 6:32 ` Stephen Rothwell
2010-09-16 6:39 ` Ingo Molnar
2010-09-16 7:08 ` Russell King - ARM Linux
2010-09-16 7:34 ` Ingo Molnar
2010-09-16 9:02 ` Russell King - ARM Linux
2010-09-16 7:09 ` Stephen Rothwell
2010-09-16 7:20 ` Yinghai Lu
2010-09-16 7:27 ` Stephen Rothwell
2010-09-13 14:06 Stephen Rothwell
2010-09-13 19:17 ` Matt Fleming
2010-09-13 19:22 ` Peter Zijlstra
2010-08-02 16:23 Stephen Rothwell
2010-08-02 16:28 ` Russell King
2010-08-02 16:32 ` H. Peter Anvin
2010-08-03 1:07 ` Benjamin Herrenschmidt
2010-08-03 1:42 ` Benjamin Herrenschmidt
2010-08-03 3:13 ` H. Peter Anvin
2010-08-03 4:32 ` Benjamin Herrenschmidt
2010-08-03 5:29 ` Ingo Molnar
2010-08-02 16:28 ` Stephen Rothwell
2010-08-03 1:41 ` Benjamin Herrenschmidt
2010-06-23 16:31 Stephen Rothwell
2010-06-23 16:55 ` Frederic Weisbecker
2010-06-23 23:31 ` Stephen Rothwell
2010-06-24 0:37 ` Stephen Rothwell
2010-06-23 0:50 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101129082916.GA12374@elte.hu \
--to=mingo@elte.hu \
--cc=davem@davemloft.net \
--cc=dzickus@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).