* linux-next: manual merge of the namespace tree with Linus' tree
@ 2011-05-16 3:47 Stephen Rothwell
2011-05-16 4:00 ` Matt Turner
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2011-05-16 3:47 UTC (permalink / raw)
To: Eric W. Biederman; +Cc: linux-next, linux-kernel, Michael Cree, Matt Turner
Hi Eric,
Today's linux-next merge of the namespace tree got a conflict in
arch/alpha/include/asm/unistd.h arch/alpha/kernel/systbls.S between
commit 90b57f35164a ("alpha: Wire up syscalls new to 2.6.39") from Linus'
tree and commit e975ee91dcc1 ("ns: Wire up the setns system call") from
the namespace tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/alpha/include/asm/unistd.h
index b183416,664383d..0000000
--- a/arch/alpha/include/asm/unistd.h
+++ b/arch/alpha/include/asm/unistd.h
@@@ -452,14 -452,11 +452,15 @@@
#define __NR_fanotify_init 494
#define __NR_fanotify_mark 495
#define __NR_prlimit64 496
-#define __NR_setns 497
+#define __NR_name_to_handle_at 497
+#define __NR_open_by_handle_at 498
+#define __NR_clock_adjtime 499
+#define __NR_syncfs 500
++#define __NR_setns 501
#ifdef __KERNEL__
- #define NR_SYSCALLS 501
-#define NR_SYSCALLS 498
++#define NR_SYSCALLS 502
#define __ARCH_WANT_IPC_PARSE_VERSION
#define __ARCH_WANT_OLD_READDIR
diff --cc arch/alpha/kernel/systbls.S
index 15f999d,4663fd5..0000000
--- a/arch/alpha/kernel/systbls.S
+++ b/arch/alpha/kernel/systbls.S
@@@ -513,12 -513,9 +513,13 @@@ sys_call_table
.quad sys_rt_tgsigqueueinfo
.quad sys_perf_event_open
.quad sys_fanotify_init
- .quad sys_fanotify_mark /* 495 */
+ .quad sys_fanotify_mark /* 495 */
.quad sys_prlimit64
+ .quad sys_name_to_handle_at
+ .quad sys_open_by_handle_at
+ .quad sys_clock_adjtime
+ .quad sys_syncfs /* 500 */
+ .quad sys_setns
.size sys_call_table, . - sys_call_table
.type sys_call_table, @object
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the namespace tree with Linus' tree
2011-05-16 3:47 linux-next: manual merge of the namespace tree with Linus' tree Stephen Rothwell
@ 2011-05-16 4:00 ` Matt Turner
2011-05-16 4:44 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Matt Turner @ 2011-05-16 4:00 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Eric W. Biederman, linux-next, linux-kernel, Michael Cree
On Sun, May 15, 2011 at 11:47 PM, Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi Eric,
>
> Today's linux-next merge of the namespace tree got a conflict in
> arch/alpha/include/asm/unistd.h arch/alpha/kernel/systbls.S between
> commit 90b57f35164a ("alpha: Wire up syscalls new to 2.6.39") from Linus'
> tree and commit e975ee91dcc1 ("ns: Wire up the setns system call") from
> the namespace tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
> --
> Cheers,
> Stephen Rothwell sfr@canb•auug.org.au
>
> diff --cc arch/alpha/include/asm/unistd.h
> index b183416,664383d..0000000
> --- a/arch/alpha/include/asm/unistd.h
> +++ b/arch/alpha/include/asm/unistd.h
> @@@ -452,14 -452,11 +452,15 @@@
> #define __NR_fanotify_init 494
> #define __NR_fanotify_mark 495
> #define __NR_prlimit64 496
> -#define __NR_setns 497
> +#define __NR_name_to_handle_at 497
> +#define __NR_open_by_handle_at 498
> +#define __NR_clock_adjtime 499
> +#define __NR_syncfs 500
> ++#define __NR_setns 501
>
> #ifdef __KERNEL__
>
> - #define NR_SYSCALLS 501
> -#define NR_SYSCALLS 498
> ++#define NR_SYSCALLS 502
>
> #define __ARCH_WANT_IPC_PARSE_VERSION
> #define __ARCH_WANT_OLD_READDIR
> diff --cc arch/alpha/kernel/systbls.S
> index 15f999d,4663fd5..0000000
> --- a/arch/alpha/kernel/systbls.S
> +++ b/arch/alpha/kernel/systbls.S
> @@@ -513,12 -513,9 +513,13 @@@ sys_call_table
> .quad sys_rt_tgsigqueueinfo
> .quad sys_perf_event_open
> .quad sys_fanotify_init
> - .quad sys_fanotify_mark /* 495 */
> + .quad sys_fanotify_mark /* 495 */
> .quad sys_prlimit64
> + .quad sys_name_to_handle_at
> + .quad sys_open_by_handle_at
> + .quad sys_clock_adjtime
> + .quad sys_syncfs /* 500 */
> + .quad sys_setns
>
> .size sys_call_table, . - sys_call_table
> .type sys_call_table, @object
Thanks for handling this, Stephen.
I don't know what the best way to avoid this is. Sometimes (and
_sometimes_ is the problem) new syscalls are added through another
tree. Other times, they're added to only x86 and amd64 or something
and leave us to find out later.
So, should all syscall additions go through the respective arch trees,
or should syscall additions make sure to include all architectures?
Thanks,
Matt
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the namespace tree with Linus' tree
2011-05-16 4:00 ` Matt Turner
@ 2011-05-16 4:44 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2011-05-16 4:44 UTC (permalink / raw)
To: Matt Turner; +Cc: Eric W. Biederman, linux-next, linux-kernel, Michael Cree
[-- Attachment #1: Type: text/plain, Size: 899 bytes --]
Hi Matt,
On Mon, 16 May 2011 00:00:15 -0400 Matt Turner <mattst88@gmail•com> wrote:
>
> I don't know what the best way to avoid this is. Sometimes (and
> _sometimes_ is the problem) new syscalls are added through another
> tree. Other times, they're added to only x86 and amd64 or something
> and leave us to find out later.
>
> So, should all syscall additions go through the respective arch trees,
> or should syscall additions make sure to include all architectures?
Any and all of the above should be fine. Mostly, the "only add x86"
model is followed and the other arches catch up later.
Conflicts like these are easy to handle and Linus does not mind fixing
them up as they occur, so for really simple syscalls, adding them to all
architectures should be fine.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-05-16 4:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-16 3:47 linux-next: manual merge of the namespace tree with Linus' tree Stephen Rothwell
2011-05-16 4:00 ` Matt Turner
2011-05-16 4:44 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox