History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Conflicts are simple overlapping changes.

David S. Miller committed 5 years ago

Commit 5af84df2 parents 090597b 9f42f67371 files · +3766 −3026Browse files

Showing the changes to tools/include/uapi (1 of 371 files). Show all

Unified · Split

tools/include/uapi/asm-generic/unistd.h+6−1
@@ -873,8 +873,13 @@ __SYSCALL(__NR_landlock_add_rule, sys_landlock_add_rule) · 872 unmodified lines
873#define __NR_landlock_restrict_self 446873#define __NR_landlock_restrict_self 446
874__SYSCALL(__NR_landlock_restrict_self, sys_landlock_restrict_self)874__SYSCALL(__NR_landlock_restrict_self, sys_landlock_restrict_self)
875 875
876#ifdef __ARCH_WANT_MEMFD_SECRET
877#define __NR_memfd_secret 447
878__SYSCALL(__NR_memfd_secret, sys_memfd_secret)
879#endif
880
876#undef __NR_syscalls881#undef __NR_syscalls
877#define __NR_syscalls 447882#define __NR_syscalls 448
878 883
879/*884/*
880 * 32 bit systems traditionally used different885 * 32 bit systems traditionally used different