Re: linux-next: manual merge of the notifications tree with Linus' tree

[Stephen Rothwell]

Hi all,

On Wed, 21 Oct 2020 12:47:33 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the notifications tree got conflicts in:
> 
>   arch/alpha/kernel/syscalls/syscall.tbl
>   arch/arm/tools/syscall.tbl
>   arch/arm64/include/asm/unistd32.h
>   arch/ia64/kernel/syscalls/syscall.tbl
>   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/x86/entry/syscalls/syscall_64.tbl
>   arch/xtensa/kernel/syscalls/syscall.tbl
>   include/uapi/asm-generic/unistd.h
> 
> between commit:
> 
>   ecb8ac8b1f14 ("mm/madvise: introduce process_madvise() syscall: an external memory hinting API")
> 
> from Linus' tree and commit:
> 
>   4cd92d064cb0 ("watch_queue: Implement mount topology and attribute change notifications")
> 
> from the notifications tree.

Just a reminder that I am still getting this conflict.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpvEUAu92nxQ.pgp
Description: OpenPGP digital signature