Subject: Re: linux-next: manual merge of the tip tree with the origin tree

From: Dave Hansen <[email-masked]>
Date: Thu, 4 May 2023 07:16:30 -0700

On 5/4/23 06:18, Mark Brown wrote:
> diff --cc arch/x86/entry/syscalls/syscall_64.tbl
> index 227538b0ce801,f65c671ce3b14..0000000000000
> --- a/arch/x86/entry/syscalls/syscall_64.tbl
> +++ b/arch/x86/entry/syscalls/syscall_64.tbl
> @@@ -372,7 -372,7 +372,8 @@@
>   448	common	process_mrelease	sys_process_mrelease
>   449	common	futex_waitv		sys_futex_waitv
>   450	common	set_mempolicy_home_node	sys_set_mempolicy_home_node
>  -451	64	map_shadow_stack	sys_map_shadow_stack
>  +451	common	cachestat		sys_cachestat
> ++452	64	map_shadow_stack	sys_map_shadow_stack

Hi Mark,

This will break the shadow stack selftest:

	tools/testing/selftests/x86/test_shadow_stack.c

since it has:

	#define __NR_map_shadow_stack  451

This also missed bumping:

	#define __NR_syscalls 452

in include/uapi/asm-generic/unistd.h.