From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jiri Slaby <jirislaby@gmail•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Chris Metcalf <cmetcalf@tilera•com>
Subject: linux-next: manual merge of the limits tree with the tile tree
Date: Tue, 20 Jul 2010 13:48:33 +1000 [thread overview]
Message-ID: <20100720134833.4082eed4.sfr@canb.auug.org.au> (raw)
Hi Jiri,
Today's linux-next merge of the limits tree got a conflict in
include/asm-generic/unistd.h between commits
5360bd776f73d0a7da571d72a09a03f237e99900 ("Fix up the "generic" unistd.h
ABI to be more useful") and b51cae21ee66f77a368428e6bdf75a0c012c9fd7
("Add wait4() back to the set of <asm-generic/unistd.h> syscalls") from
the tile tree and commit f33ebbe9da2c3c24664a0ad4f8fd83f293547e63
("unistd: add __NR_prlimit64 syscall numbers") from the limits tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc include/asm-generic/unistd.h
index c17cebc,0dfd517..0000000
--- a/include/asm-generic/unistd.h
+++ b/include/asm-generic/unistd.h
@@@ -631,18 -626,11 +631,20 @@@ __SYSCALL(__NR_perf_event_open, sys_per
__SYSCALL(__NR_accept4, sys_accept4)
#define __NR_recvmmsg 243
__SYSCALL(__NR_recvmmsg, sys_recvmmsg)
+ #define __NR_prlimit64 244
+ __SYSCALL(__NR_prlimit64, sys_prlimit64)
+/*
+ * Architectures may provide up to 16 syscalls of their own
+ * starting with this value.
+ */
- #define __NR_arch_specific_syscall 244
++#define __NR_arch_specific_syscall 245
+
+#define __NR_wait4 260
+__SYSCALL(__NR_wait4, sys_wait4)
+
#undef __NR_syscalls
-#define __NR_syscalls 245
+#define __NR_syscalls 261
/*
* All syscalls below here should go away really,
next reply other threads:[~2010-07-20 3:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-20 3:48 Stephen Rothwell [this message]
2010-07-20 4:18 ` linux-next: manual merge of the limits tree with the tile tree Chris Metcalf
2010-07-20 8:01 ` Jiri Slaby
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=20100720134833.4082eed4.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=cmetcalf@tilera$(echo .)com \
--cc=jirislaby@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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