* linux-next: build failure after merge of the blackfin tree
@ 2010-03-01 1:03 Stephen Rothwell
2010-03-01 1:08 ` Frederic Weisbecker
2010-03-02 9:15 ` Mike Frysinger
0 siblings, 2 replies; 6+ messages in thread
From: Stephen Rothwell @ 2010-03-01 1:03 UTC (permalink / raw)
To: Mike Frysinger
Cc: linux-next, linux-kernel, Mike Frysinger, Frederic Weisbecker
Hi Mike,
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 1 Mar 2010 11:56:09 +1100
Subject: [PATCH] blackfin: fix mismerge of kernel/trace/trace_syscalls.c
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
kernel/trace/trace_syscalls.c | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index 37ca709..cba47d7 100644
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@ -399,11 +399,6 @@ unsigned long __init arch_syscall_addr(int nr)
return (unsigned long)sys_call_table[nr];
}
-unsigned long __init arch_syscall_addr(int nr)
-{
- return (unsigned long)sys_call_table[nr];
-}
-
int __init init_ftrace_syscalls(void)
{
struct syscall_metadata *meta;
--
1.7.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: linux-next: build failure after merge of the blackfin tree
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
1 sibling, 1 reply; 6+ messages in thread
From: Frederic Weisbecker @ 2010-03-01 1:08 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Mike Frysinger, linux-next, linux-kernel, Mike Frysinger
On Mon, Mar 01, 2010 at 12:03:21PM +1100, Stephen Rothwell wrote:
> Hi Mike,
>
> 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
Oh, why is this patch in the blackfin tree?
> 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.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 1 Mar 2010 11:56:09 +1100
> Subject: [PATCH] blackfin: fix mismerge of kernel/trace/trace_syscalls.c
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> kernel/trace/trace_syscalls.c | 5 -----
> 1 files changed, 0 insertions(+), 5 deletions(-)
>
> diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
> index 37ca709..cba47d7 100644
> --- a/kernel/trace/trace_syscalls.c
> +++ b/kernel/trace/trace_syscalls.c
> @@ -399,11 +399,6 @@ unsigned long __init arch_syscall_addr(int nr)
> return (unsigned long)sys_call_table[nr];
> }
>
> -unsigned long __init arch_syscall_addr(int nr)
> -{
> - return (unsigned long)sys_call_table[nr];
> -}
> -
> int __init init_ftrace_syscalls(void)
> {
> struct syscall_metadata *meta;
Looks like the right patch yeah.
Thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: build failure after merge of the blackfin tree
2010-03-01 1:08 ` Frederic Weisbecker
@ 2010-03-01 4:03 ` Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2010-03-01 4:03 UTC (permalink / raw)
To: Frederic Weisbecker
Cc: Mike Frysinger, linux-next, linux-kernel, Mike Frysinger
[-- Attachment #1: Type: text/plain, Size: 379 bytes --]
Hi Frederic,
On Mon, 1 Mar 2010 02:08:52 +0100 Frederic Weisbecker <fweisbec@gmail.com> wrote:
>
> Oh, why is this patch in the blackfin tree?
I have no idea beyond the fact that Mike is the Blackfin maintainer.
> Looks like the right patch yeah.
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: build failure after merge of the blackfin tree
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-02 9:15 ` Mike Frysinger
2010-03-09 14:26 ` Mike Frysinger
1 sibling, 1 reply; 6+ messages in thread
From: Mike Frysinger @ 2010-03-02 9:15 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Frederic Weisbecker
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.
-mike
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: build failure after merge of the blackfin tree
2010-03-02 9:15 ` Mike Frysinger
@ 2010-03-09 14:26 ` Mike Frysinger
2010-03-09 22:02 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Mike Frysinger @ 2010-03-09 14:26 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Frederic Weisbecker
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: build failure after merge of the blackfin tree
2010-03-09 14:26 ` Mike Frysinger
@ 2010-03-09 22:02 ` Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2010-03-09 22:02 UTC (permalink / raw)
To: Mike Frysinger; +Cc: linux-next, linux-kernel, Frederic Weisbecker
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
Hi Mike,
On Tue, 9 Mar 2010 09:26:29 -0500 Mike Frysinger <vapier.adi@gmail.com> wrote:
>
> my tree is sane again, so if you could pick it up again, that'd be
> great. thanks!
OK, will do from today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-03-09 22:02 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2010-03-09 22:02 ` Stephen Rothwell
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).