Hi all,
On Mon, 9 Oct 2023 12:31:18 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> 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.
This is now a conflict between the asm-generic tree and Linus' tree.
--
Cheers,
Stephen Rothwell
Attachment:
pgpjE4seCuHAw.pgp
Description: OpenPGP digital signature
