From: Mike Frysinger <vapier.adi@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Frederic Weisbecker <fweisbec@gmail.com>
Subject: Re: linux-next: build failure after merge of the blackfin tree
Date: Tue, 9 Mar 2010 09:26:29 -0500 [thread overview]
Message-ID: <8bd0f97a1003090626r207042e2lb7d4954e8d38ee3f@mail.gmail.com> (raw)
In-Reply-To: <8bd0f97a1003020115m4016c5f6v643e90a6c6415e74@mail.gmail.com>
On Tue, Mar 2, 2010 at 04:15, Mike Frysinger wrote:
> On Sun, Feb 28, 2010 at 20:03, Stephen Rothwell wrote:
>> After merging the blackfin tree, today's linux-next build (x86_64 allmodconfig)
>> failed like this:
>>
>> kernel/trace/trace_syscalls.c:402: error: redefinition of 'arch_syscall_addr'
>> kernel/trace/trace_syscalls.c:397: note: previous definition of 'arch_syscall_addr' was here
>>
>> Caused by commit d156d1881ea54ec609d92388601661c2679439bb ("ftrace: unify
>> arch_syscall_addr() implementations") from the blackfin tree interacting
>> with commit e7b8e675d9c71b868b66f62f725a948047514719 ("tracing: Unify
>> arch_syscall_addr() implementations") from Linus' tree.
>>
>> These are slightly different versions of the same patch. but merging with the blackfin tree managed to add a second copy of the above function. I have applied the following patch for today.
>
> i'm traveling atm and wont be able to clean up my tree for a few more
> days. i'd suggest you just drop the Blackfin tree as well as your
> local patch. i'll drop a line once things are sane again on my side.
my tree is sane again, so if you could pick it up again, that'd be
great. thanks!
-mike
next prev parent reply other threads:[~2010-03-09 14:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-01 1:03 linux-next: build failure after merge of the blackfin tree Stephen Rothwell
2010-03-01 1:08 ` Frederic Weisbecker
2010-03-01 4:03 ` Stephen Rothwell
2010-03-02 9:15 ` Mike Frysinger
2010-03-09 14:26 ` Mike Frysinger [this message]
2010-03-09 22:02 ` 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=8bd0f97a1003090626r207042e2lb7d4954e8d38ee3f@mail.gmail.com \
--to=vapier.adi@gmail.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).