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

lists.openwall.net		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 linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20201021180636.75f3c700@canb.auug.org.au>
Date:   Wed, 21 Oct 2020 18:06:36 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     David Howells <dhowells@...hat.com>,
        Andrew Morton <akpm@...ux-foundation.org>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Minchan Kim <minchan@...nel.org>,
        YueHaibing <yuehaibing@...wei.com>
Subject: Re: linux-next: manual merge of the notifications tree with Linus'
 tree

Hi all,

On Wed, 21 Oct 2020 18:02:55 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Hi all,
> 
> On Wed, 21 Oct 2020 12:47:33 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> >
> > diff --cc include/uapi/asm-generic/unistd.h
> > index 2056318988f7,fcdca8c7d30a..000000000000
> > --- a/include/uapi/asm-generic/unistd.h
> > +++ b/include/uapi/asm-generic/unistd.h
> > @@@ -857,8 -857,8 +857,10 @@@ __SYSCALL(__NR_openat2, sys_openat2
> >   __SYSCALL(__NR_pidfd_getfd, sys_pidfd_getfd)
> >   #define __NR_faccessat2 439
> >   __SYSCALL(__NR_faccessat2, sys_faccessat2)
> >  -#define __NR_watch_mount 440
> >  +#define __NR_process_madvise 440
> >  +__SYSCALL(__NR_process_madvise, sys_process_madvise)
> > ++#define __NR_watch_mount 441
> > + __SYSCALL(__NR_watch_mount, sys_watch_mount)
> >   
> >   #undef __NR_syscalls
> >   #define __NR_syscalls 441  
> 
> I missed updating __NR_syscalls to 442 which I will in tomorrow's merge
> resolution.

I presume I need to update __NR_compat_syscalls in
arch/arm64/include/asm/unistd.h as well :-(

I really don't like conflicts between new syscalls :-(
-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped