lkml.org 
[lkml]   [2012]   [Jun]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the tip tree with Linus' tree
Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/x86/syscalls/syscall_32.tbl arch/x86/syscalls/syscall_64.tbl between
commit d97b46a64674 ("syscalls, x86: add __NR_kcmp syscall") from Linus'
tree and commit a2dae61eb839 ("sched/numa: Introduce sys_numa_{t,m}bind()")
from the tip 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/x86/syscalls/syscall_32.tbl
index 7a35a6e,38954c5..0000000
--- a/arch/x86/syscalls/syscall_32.tbl
+++ b/arch/x86/syscalls/syscall_32.tbl
@@@ -355,4 -355,5 +355,6 @@@
346 i386 setns sys_setns
347 i386 process_vm_readv sys_process_vm_readv compat_sys_process_vm_readv
348 i386 process_vm_writev sys_process_vm_writev compat_sys_process_vm_writev
-349 i386 numa_mbind sys_numa_mbind compat_sys_numa_mbind
-350 i386 numa_tbind sys_numa_tbind compat_sys_numa_tbind
+349 i386 kcmp sys_kcmp
++350 i386 numa_mbind sys_numa_mbind compat_sys_numa_mbind
++351 i386 numa_tbind sys_numa_tbind compat_sys_numa_tbind
diff --cc arch/x86/syscalls/syscall_64.tbl
index 51171ae,63c5285..0000000
--- a/arch/x86/syscalls/syscall_64.tbl
+++ b/arch/x86/syscalls/syscall_64.tbl
@@@ -318,8 -318,8 +318,10 @@@
309 common getcpu sys_getcpu
310 64 process_vm_readv sys_process_vm_readv
311 64 process_vm_writev sys_process_vm_writev
-312 64 numa_mbind sys_numa_mbind
-313 64 numa_tbind sys_numa_tbind
+312 64 kcmp sys_kcmp
++313 64 numa_mbind sys_numa_mbind
++314 64 numa_tbind sys_numa_tbind
+
#
# x32-specific system call numbers start at 512 to avoid cache impact
# for native 64-bit operation.
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-06-04 06:21    [W:0.023 / U:0.548 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site