]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'security/next-testing'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 04:18:21 +0000 (14:18 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 04:18:21 +0000 (14:18 +1000)
commit43066796c46c0d6284ae1833d26bd7b6751e4739
tree328ff7ec9bbea20975c1780e783387507f00b728
parent8142b996d938c3bd6cc6770e7195f6dc0628c438
parentb0ccf48b958e643809bbf2c775c2350df6f1643b
Merge remote-tracking branch 'security/next-testing'

# Conflicts:
# arch/alpha/kernel/syscalls/syscall.tbl
# arch/arm/tools/syscall.tbl
# arch/arm64/include/asm/unistd.h
# arch/arm64/include/asm/unistd32.h
# arch/ia64/kernel/syscalls/syscall.tbl
# arch/m68k/kernel/syscalls/syscall.tbl
# arch/microblaze/kernel/syscalls/syscall.tbl
# arch/mips/kernel/syscalls/syscall_n32.tbl
# arch/mips/kernel/syscalls/syscall_n64.tbl
# arch/mips/kernel/syscalls/syscall_o32.tbl
# arch/parisc/kernel/syscalls/syscall.tbl
# arch/powerpc/kernel/syscalls/syscall.tbl
# arch/s390/kernel/syscalls/syscall.tbl
# arch/sh/kernel/syscalls/syscall.tbl
# arch/sparc/kernel/syscalls/syscall.tbl
# arch/x86/entry/syscalls/syscall_32.tbl
# arch/x86/entry/syscalls/syscall_64.tbl
# arch/xtensa/kernel/syscalls/syscall.tbl
# include/uapi/asm-generic/unistd.h
24 files changed:
Documentation/userspace-api/index.rst
MAINTAINERS
arch/Kconfig
arch/alpha/kernel/syscalls/syscall.tbl
arch/arm/tools/syscall.tbl
arch/arm64/include/asm/unistd32.h
arch/ia64/kernel/syscalls/syscall.tbl
arch/m68k/kernel/syscalls/syscall.tbl
arch/microblaze/kernel/syscalls/syscall.tbl
arch/mips/kernel/syscalls/syscall_n32.tbl
arch/mips/kernel/syscalls/syscall_n64.tbl
arch/mips/kernel/syscalls/syscall_o32.tbl
arch/parisc/kernel/syscalls/syscall.tbl
arch/powerpc/kernel/syscalls/syscall.tbl
arch/s390/kernel/syscalls/syscall.tbl
arch/sh/kernel/syscalls/syscall.tbl
arch/sparc/kernel/syscalls/syscall.tbl
arch/x86/entry/syscalls/syscall_32.tbl
arch/x86/entry/syscalls/syscall_64.tbl
arch/xtensa/kernel/syscalls/syscall.tbl
include/linux/syscalls.h
include/uapi/asm-generic/unistd.h
kernel/sys_ni.c
security/selinux/ss/services.c