lkml.org 
[lkml]   [2011]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the namespace tree with the sh tree
Hi Eric,

Today's linux-next merge of the namespace tree got conflicts in
arch/sh/include/asm/unistd_32.h, arch/sh/include/asm/unistd_64.h,
arch/sh/kernel/syscalls_32.S and arch/sh/kernel/syscalls_64.S between
commit c7434dbf29b4 ("sh: wire up sys_sendmmsg") from the sh 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/sh/include/asm/unistd_32.h
index bb7d270,26c697c..0000000
--- a/arch/sh/include/asm/unistd_32.h
+++ b/arch/sh/include/asm/unistd_32.h
@@@ -373,9 -373,9 +373,10 @@@
#define __NR_open_by_handle_at 360
#define __NR_clock_adjtime 361
#define __NR_syncfs 362
-#define __NR_setns 363
+#define __NR_sendmmsg 363
++#define __NR_setns 364

--#define NR_syscalls 364
++#define NR_syscalls 365

#ifdef __KERNEL__

diff --cc arch/sh/include/asm/unistd_64.h
index 46327ce,330668a..0000000
--- a/arch/sh/include/asm/unistd_64.h
+++ b/arch/sh/include/asm/unistd_64.h
@@@ -394,11 -394,11 +394,12 @@@
#define __NR_open_by_handle_at 371
#define __NR_clock_adjtime 372
#define __NR_syncfs 373
-#define __NR_setns 374
+#define __NR_sendmmsg 374
++#define __NR_setns 375

#ifdef __KERNEL__

--#define NR_syscalls 375
++#define NR_syscalls 376

#define __ARCH_WANT_IPC_PARSE_VERSION
#define __ARCH_WANT_OLD_READDIR
diff --cc arch/sh/kernel/syscalls_32.S
index 7c486f3,67dcf66..0000000
--- a/arch/sh/kernel/syscalls_32.S
+++ b/arch/sh/kernel/syscalls_32.S
@@@ -380,4 -380,4 +380,5 @@@ ENTRY(sys_call_table
.long sys_open_by_handle_at /* 360 */
.long sys_clock_adjtime
.long sys_syncfs
+ .long sys_sendmmsg
+ .long sys_setns
diff --cc arch/sh/kernel/syscalls_64.S
index ba1a737,dade54e..0000000
--- a/arch/sh/kernel/syscalls_64.S
+++ b/arch/sh/kernel/syscalls_64.S
@@@ -400,4 -400,4 +400,5 @@@ sys_call_table
.long sys_open_by_handle_at
.long sys_clock_adjtime
.long sys_syncfs
- .long sys_setns
+ .long sys_sendmmsg
++ .long sys_setns /* 375 */


\
 
 \ /
  Last update: 2011-05-24 04:57    [W:0.083 / U:3.492 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site