linux-next: manual merge of the akpm-current tree with the security tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: security/selinux/ss/services.c between commit: 3d252529480c ("SELinux: Remove unused selinux_is_enabled") from the security tree and commit: dd4c293d6d4d ("selinux: convert to kvmalloc") from the akpm-current

linux-next: manual merge of the akpm-current tree with the security tree

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

linux-next: manual merge of the akpm-current tree with the security tree

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.