From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Theodore Ts'o <tytso@mit•edu>, James Morris <jmorris@namei•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Kees Cook <keescook@chromium•org>
Subject: linux-next: manual merge of the random tree with the security tree
Date: Mon, 21 Jul 2014 17:45:24 +1000 [thread overview]
Message-ID: <20140721174524.03ee7808@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2841 bytes --]
Hi Ted,
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 386474e168a8 ("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 sfr@canb•auug.org.au
diff --cc arch/x86/syscalls/syscall_32.tbl
index 7527eac24122,f484e39e3c7d..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 getrandom sys_getrandom
+354 i386 seccomp sys_seccomp
++355 i386 getrandom sys_getrandom
diff --cc arch/x86/syscalls/syscall_64.tbl
index 16272a6c12b7,6705032c0520..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 getrandom sys_getrandom
+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,cd82f72fc908..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,2926b1d04b88..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_getrandom 277
+#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,
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-07-21 7:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-21 7:45 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-07-28 8:54 linux-next: manual merge of the random tree with the security tree Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140721174524.03ee7808@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=jmorris@namei$(echo .)org \
--cc=keescook@chromium$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tytso@mit$(echo .)edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox