linux-kernel - Re: linux-next: manual merge of the limits 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] [day] [month] [year] [list]

Message-Id: <200912141104.04738.arnd@arndb.de>
Date:	Mon, 14 Dec 2009 11:04:04 +0100
From:	Arnd Bergmann <arnd@...db.de>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Jiri Slaby <jirislaby@...il.com>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Neil Horman <nhorman@...driver.com>
Subject: Re: linux-next: manual merge of the limits tree with Linus' tree

On Monday 14 December 2009, Stephen Rothwell wrote:
> @@@ -622,13 -622,13 +622,17 @@@ __SYSCALL(__NR_move_pages, sys_move_pag
>   __SYSCALL(__NR_rt_tgsigqueueinfo, sys_rt_tgsigqueueinfo)
>   #define __NR_perf_event_open 241
>   __SYSCALL(__NR_perf_event_open, sys_perf_event_open)
>  -#define __NR_getprlimit 242
>  +#define __NR_accept4 242
>  +__SYSCALL(__NR_accept4, sys_accept4)
>  +#define __NR_recvmmsg 243
>  +__SYSCALL(__NR_recvmmsg, sys_recvmmsg)
> ++#define __NR_getprlimit 244
> + __SYSCALL(__NR_getprlimit, sys_getprlimit)
>  -#define __NR_setprlimit 243
> ++#define __NR_setprlimit 245
> + __SYSCALL(__NR_setprlimit, sys_setprlimit)
>   
>   #undef __NR_syscalls
> --#define __NR_syscalls 244
> ++#define __NR_syscalls 246

Looks good.

	Arnd
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/