Re: linux-next: manual merge of the block tree with the asm-generic tree

[Peter Zijlstra]

On Mon, Oct 09, 2023 at 12:31:18PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the block tree got conflicts in:
> 
>   arch/alpha/kernel/syscalls/syscall.tbl
>   arch/arm/tools/syscall.tbl
>   arch/arm64/include/asm/unistd.h
>   arch/arm64/include/asm/unistd32.h
>   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/xtensa/kernel/syscalls/syscall.tbl
>   include/uapi/asm-generic/unistd.h
> 
> between commits:
> 
>   2fd0ebad27bc ("arch: Reserve map_shadow_stack() syscall number for all architectures")
> 
> from the asm-generic tree and commits:
> 
>   9f6c532f59b2 ("futex: Add sys_futex_wake()")
>   cb8c4312afca ("futex: Add sys_futex_wait()")
>   0f4b5f972216 ("futex: Add sys_futex_requeue()")
> 
> from the block tree.

fun fun fun..


> diff --cc arch/alpha/kernel/syscalls/syscall.tbl
> index 5d05ab716a74,b1865f9bb31e..000000000000
> --- a/arch/alpha/kernel/syscalls/syscall.tbl
> +++ b/arch/alpha/kernel/syscalls/syscall.tbl
> @@@ -492,4 -492,6 +492,7 @@@
>   560	common	set_mempolicy_home_node		sys_ni_syscall
>   561	common	cachestat			sys_cachestat
>   562	common	fchmodat2			sys_fchmodat2
>  -563	common	futex_wake			sys_futex_wake
>  -564	common	futex_wait			sys_futex_wait
>  -565	common	futex_requeue			sys_futex_requeue
>  +563	common	map_shadow_stack		sys_map_shadow_stack
> ++564	common	futex_wake			sys_futex_wake
> ++565	common	futex_wait			sys_futex_wait
> ++566	common	futex_requeue			sys_futex_requeue

So this renumbers the (futex) stuff on Alpha, does anybody care? AFAICT
Alpha does not follow the unistd order and meh.

> diff --cc include/uapi/asm-generic/unistd.h
> index 00df5af71ca1,d9e9cd13e577..000000000000
> --- a/include/uapi/asm-generic/unistd.h
> +++ b/include/uapi/asm-generic/unistd.h
> @@@ -822,12 -822,15 +822,18 @@@ __SYSCALL(__NR_cachestat, sys_cachestat
>   
>   #define __NR_fchmodat2 452
>   __SYSCALL(__NR_fchmodat2, sys_fchmodat2)
> + #define __NR_futex_wake 454
> + __SYSCALL(__NR_futex_wake, sys_futex_wake)
> + #define __NR_futex_wait 455
> + __SYSCALL(__NR_futex_wait, sys_futex_wait)
> + #define __NR_futex_requeue 456
> + __SYSCALL(__NR_futex_requeue, sys_futex_requeue)
>   
>  +#define __NR_map_shadow_stack 453
>  +__SYSCALL(__NR_map_shadow_stack, sys_map_shadow_stack)
>  +
>   #undef __NR_syscalls
> - #define __NR_syscalls 454
> + #define __NR_syscalls 457
>   
>   /*
>    * 32 bit systems traditionally used different

This seems to have the hunks in the wrong order, 453 should come before
454 no?