lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  PHC 
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [day] [month] [year] [list]
Date:	Mon, 21 Jul 2014 18:16:02 +1000
From:	Stephen Rothwell <>
To:	Andrew Morton <>,
	James Morris <>
	Vivek Goyal <>,
	Kees Cook <>
Subject: linux-next: manual merge of the akpm-current tree with the security

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
arch/x86/syscalls/syscall_64.tbl between commit 48dc92b9fc39 ("seccomp:
add "seccomp" syscall") from the security tree and commit f5e74a5d7743
("kexec: new syscall kexec_file_load() declaration") from the
akpm-current tree.

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

Stephen Rothwell          

diff --cc arch/x86/syscalls/syscall_64.tbl
index 252c804bb1aa,6d3545914821..000000000000
--- a/arch/x86/syscalls/syscall_64.tbl
+++ b/arch/x86/syscalls/syscall_64.tbl
@@@ -323,8 -323,7 +323,9 @@@
  314	common	sched_setattr		sys_sched_setattr
  315	common	sched_getattr		sys_sched_getattr
  316	common	renameat2		sys_renameat2
 -317	common	kexec_file_load		sys_kexec_file_load
 +317	common	seccomp			sys_seccomp
 +318	common	getrandom		sys_getrandom
++319	common	kexec_file_load		sys_kexec_file_load
  # x32-specific system call numbers start at 512 to avoid cache impact

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)

Powered by blists - more mailing lists