From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Eric W. Biederman" <ebiederm@xmission•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Michael Cree <mcree@orcon•net.nz>,
Matt Turner <mattst88@gmail•com>
Subject: linux-next: manual merge of the namespace tree with Linus' tree
Date: Mon, 16 May 2011 13:47:33 +1000 [thread overview]
Message-ID: <20110516134733.e448f6fe.sfr@canb.auug.org.au> (raw)
Hi Eric,
Today's linux-next merge of the namespace tree got a conflict in
arch/alpha/include/asm/unistd.h arch/alpha/kernel/systbls.S between
commit 90b57f35164a ("alpha: Wire up syscalls new to 2.6.39") from Linus'
tree and commit e975ee91dcc1 ("ns: Wire up the setns system call") from
the namespace tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/alpha/include/asm/unistd.h
index b183416,664383d..0000000
--- a/arch/alpha/include/asm/unistd.h
+++ b/arch/alpha/include/asm/unistd.h
@@@ -452,14 -452,11 +452,15 @@@
#define __NR_fanotify_init 494
#define __NR_fanotify_mark 495
#define __NR_prlimit64 496
-#define __NR_setns 497
+#define __NR_name_to_handle_at 497
+#define __NR_open_by_handle_at 498
+#define __NR_clock_adjtime 499
+#define __NR_syncfs 500
++#define __NR_setns 501
#ifdef __KERNEL__
- #define NR_SYSCALLS 501
-#define NR_SYSCALLS 498
++#define NR_SYSCALLS 502
#define __ARCH_WANT_IPC_PARSE_VERSION
#define __ARCH_WANT_OLD_READDIR
diff --cc arch/alpha/kernel/systbls.S
index 15f999d,4663fd5..0000000
--- a/arch/alpha/kernel/systbls.S
+++ b/arch/alpha/kernel/systbls.S
@@@ -513,12 -513,9 +513,13 @@@ sys_call_table
.quad sys_rt_tgsigqueueinfo
.quad sys_perf_event_open
.quad sys_fanotify_init
- .quad sys_fanotify_mark /* 495 */
+ .quad sys_fanotify_mark /* 495 */
.quad sys_prlimit64
+ .quad sys_name_to_handle_at
+ .quad sys_open_by_handle_at
+ .quad sys_clock_adjtime
+ .quad sys_syncfs /* 500 */
+ .quad sys_setns
.size sys_call_table, . - sys_call_table
.type sys_call_table, @object
next reply other threads:[~2011-05-16 3:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-16 3:47 Stephen Rothwell [this message]
2011-05-16 4:00 ` linux-next: manual merge of the namespace tree with Linus' tree Matt Turner
2011-05-16 4:44 ` 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=20110516134733.e448f6fe.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ebiederm@xmission$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mattst88@gmail$(echo .)com \
--cc=mcree@orcon$(echo .)net.nz \
/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