Re: linux-next: manual merge of the block tree with the asm-generic tree

[Stephen Rothwell]

Hi Peter,

On Mon, 9 Oct 2023 10:48:12 +0200 Peter Zijlstra <peterz@xxxxxxxxxxxxx> 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

Attachment: pgpn8dzxupted.pgp
Description: OpenPGP digital signature