From: Arnd Bergmann <arnd@arndb.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jiri Slaby <jirislaby@gmail.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Neil Horman <nhorman@tuxdriver.com>
Subject: Re: linux-next: manual merge of the limits tree with Linus' tree
Date: Mon, 14 Dec 2009 11:04:04 +0100 [thread overview]
Message-ID: <200912141104.04738.arnd@arndb.de> (raw)
In-Reply-To: <20091214143917.f5b90e15.sfr@canb.auug.org.au>
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
next prev parent reply other threads:[~2009-12-14 10:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-14 3:39 linux-next: manual merge of the limits tree with Linus' tree Stephen Rothwell
2009-12-14 10:04 ` Arnd Bergmann [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-12-14 3:39 Stephen Rothwell
2009-12-14 3:39 Stephen Rothwell
2009-12-14 10:10 ` Jiri Slaby
2009-12-14 10:29 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200912141104.04738.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=jirislaby@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nhorman@tuxdriver.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).