Subject: linux-next: manual merge of the random tree with the security tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 28 Jul 2014 18:54:08 +1000

Hi Theodore,

Today's linux-next merge of the random tree got conflicts in
arch/x86/syscalls/syscall_32.tbl, arch/x86/syscalls/syscall_64.tbl,
include/linux/syscalls.h and include/uapi/asm-generic/unistd.h between
commit 48dc92b9fc39 ("seccomp: add "seccomp" syscall") from the
security tree and commit fd6f349345c7 ("random: introduce getrandom(2)
system call") from the random tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc arch/x86/syscalls/syscall_32.tbl
index 7527eac24122,5b46a618aeb1..000000000000
--- a/arch/x86/syscalls/syscall_32.tbl
+++ b/arch/x86/syscalls/syscall_32.tbl
@@@ -360,4 -360,4 +360,5 @@@
  351	i386	sched_setattr		sys_sched_setattr
  352	i386	sched_getattr		sys_sched_getattr
  353	i386	renameat2		sys_renameat2
 +354	i386	seccomp			sys_seccomp
+ 355	i386	getrandom		sys_getrandom
diff --cc arch/x86/syscalls/syscall_64.tbl
index 16272a6c12b7,0dc4bf891460..000000000000
--- a/arch/x86/syscalls/syscall_64.tbl
+++ b/arch/x86/syscalls/syscall_64.tbl
@@@ -323,7 -323,7 +323,8 @@@
  314	common	sched_setattr		sys_sched_setattr
  315	common	sched_getattr		sys_sched_getattr
  316	common	renameat2		sys_renameat2
 +317	common	seccomp			sys_seccomp
+ 318	common	getrandom		sys_getrandom
  
  #
  # x32-specific system call numbers start at 512 to avoid cache impact
diff --cc include/linux/syscalls.h
index 1713977ee26f,43324a897cf2..000000000000
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@@ -866,6 -866,7 +866,9 @@@ asmlinkage long sys_process_vm_writev(p
  asmlinkage long sys_kcmp(pid_t pid1, pid_t pid2, int type,
  			 unsigned long idx1, unsigned long idx2);
  asmlinkage long sys_finit_module(int fd, const char __user *uargs, int flags);
 +asmlinkage long sys_seccomp(unsigned int op, unsigned int flags,
 +			    const char __user *uargs);
+ asmlinkage long sys_getrandom(char __user *buf, size_t count,
+ 			      unsigned int flags);
+ 
  #endif
diff --cc include/uapi/asm-generic/unistd.h
index 65acbf0e2867,1d104a2ca643..000000000000
--- a/include/uapi/asm-generic/unistd.h
+++ b/include/uapi/asm-generic/unistd.h
@@@ -699,11 -699,11 +699,13 @@@ __SYSCALL(__NR_sched_setattr, sys_sched
  __SYSCALL(__NR_sched_getattr, sys_sched_getattr)
  #define __NR_renameat2 276
  __SYSCALL(__NR_renameat2, sys_renameat2)
 +#define __NR_seccomp 277
 +__SYSCALL(__NR_seccomp, sys_seccomp)
+ #define __NR_getrandom 278
+ __SYSCALL(__NR_getrandom, sys_getrandom)
  
  #undef __NR_syscalls
- #define __NR_syscalls 278
+ #define __NR_syscalls 279
  
  /*
   * All syscalls below here should go away really,