Subject: Re: linux-next: build failure after merge of the blackfin tree

From: Mike Frysinger <[email-masked]>
Date: Tue, 9 Mar 2010 09:26:29 -0500

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