History

Merge 6.11-rc3 into char-misc-next

We need the char/misc fixes in here as well.

Greg Kroah-Hartman committed 2 years ago

Commit 9ca12e52 parents 5c4efc6 7c626ce588 files · +5972 −3305Browse files

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

Unified · Split

include/uapi/asm-generic/unistd.h+1−4
@@ -841,11 +841,8 @@ __SYSCALL(__NR_lsm_list_modules, sys_lsm_list_modules) · 840 unmodified lines
841841 #define __NR_mseal 462
842842 __SYSCALL(__NR_mseal, sys_mseal)
843843
844−#define __NR_uretprobe 463
845−__SYSCALL(__NR_uretprobe, sys_uretprobe)
846−
847844 #undef __NR_syscalls
848−#define __NR_syscalls 464
845+#define __NR_syscalls 463
849846
850847 /*
851848 * 32 bit systems traditionally used different