On Fri, Apr 11, 2014 at 1:24 PM, Martin Schwidefsky <schwidefsky@xxxxxxxxxx> wrote: > On Fri, 11 Apr 2014 12:25:47 +0200 > Miklos Szeredi <miklos@xxxxxxxxxx> wrote: > >> From: Miklos Szeredi <mszeredi@xxxxxxx> >> >> Signed-off-by: Miklos Szeredi <mszeredi@xxxxxxx> >> Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> >> --- >> arch/s390/include/uapi/asm/unistd.h | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/arch/s390/include/uapi/asm/unistd.h b/arch/s390/include/uapi/asm/unistd.h >> index 5eb5c9ddb120..57194268fe63 100644 >> --- a/arch/s390/include/uapi/asm/unistd.h >> +++ b/arch/s390/include/uapi/asm/unistd.h >> @@ -282,7 +282,7 @@ >> #define __NR_finit_module 344 >> #define __NR_sched_setattr 345 >> #define __NR_sched_getattr 346 >> -#define NR_syscalls 345 >> +#define NR_syscalls 347 >> >> /* >> * There are some system calls that are not present on 64 bit, some > > Is this patch part of a patch series that does upstream directly? > I am asking because Heiko already created a patch for this and we have > added it to the linux-s390:fixes branch for upstream integration. No, I don't mean to upstream directly. So you can just drop my submission... Thanks, Miklos -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
