linux-kernel - Re: linux-next: manual merge of the block tree with the asm-generic 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 for Android: free password hash cracker in your pocket

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

Message-ID: <20231009203324.4199996a@li-c0a070c6-1ab2-11ed-80f2-9c2dcd447373>
Date:   Mon, 9 Oct 2023 20:33:24 +1100
From:   Stephen Rothwell <sfr@...hwell.id.au>
To:     Peter Zijlstra <peterz@...radead.org>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Jens Axboe <axboe@...nel.dk>, Arnd Bergmann <arnd@...db.de>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Sohil Mehta <sohil.mehta@...el.com>
Subject: Re: linux-next: manual merge of the block tree with the asm-generic
 tree

Hi Peter,

On Mon, 9 Oct 2023 10:48:12 +0200 Peter Zijlstra <peterz@...radead.org> wrote:
>
> >   #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?

Oops, fixed thanks.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped