lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  PHC 
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Date:   Wed, 20 Jan 2021 17:19:21 +1100
From:   Stephen Rothwell <>
To:     David Howells <>
Cc:     Andrew Morton <>,
        Heiko Carstens <>,
        Linus Torvalds <>,
        Linux Kernel Mailing List <>,
        Linux Next Mailing List <>,
        Minchan Kim <>,
        Willem de Bruijn <>,
        YueHaibing <>
Subject: Re: linux-next: manual merge of the notifications tree with Linus'

Hi David,

On Mon, 21 Dec 2020 12:02:09 +1100 Stephen Rothwell <> wrote:
> Hi all,
> 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/unistd.h
>   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 commits:
>   b0a0c2615f6f ("epoll: wire up syscall epoll_pwait2")
>   450f68e2425e ("epoll: fix compat syscall wire up of epoll_pwait2")
>   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.
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> If this is not submitted to Linus during this merge window, please
> either drop it from your linux-next included branch, or at least fix it
> up wrt to the sate of Linus' tree.

How are you going with this?

Stephen Rothwell

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists