From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Joel Becker <Joel.Becker@oracle•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the ocfs2 tree with Linus' tree
Date: Wed, 23 Sep 2009 10:45:37 +1000 [thread overview]
Message-ID: <20090923104537.2885f67a.sfr@canb.auug.org.au> (raw)
Hi Joel,
Today's linux-next merge of the ocfs2 tree got conflicts in
arch/x86/ia32/ia32entry.S, arch/x86/include/asm/unistd_32.h,
arch/x86/include/asm/unistd_64.h and arch/x86/kernel/syscall_table_32.S
between various commits from Linus' tree and commit
25767b48501de19421ae86c406b2dd42df37baf3 ("fs: Add the reflink()
operation and reflinkat(2) system call") from the ocfs2 tree.
I fixed it up (see below) and can carry the fix for a short while. Given
the ongoing discussions about this patch with Linus, however, it may be
worth dropping for now?
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/x86/ia32/ia32entry.S
index 74619c4,5fede3e..0000000
--- a/arch/x86/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
@@@ -831,5 -831,6 +831,6 @@@ ia32_sys_call_table
.quad compat_sys_preadv
.quad compat_sys_pwritev
.quad compat_sys_rt_tgsigqueueinfo /* 335 */
- .quad sys_perf_counter_open
+ .quad sys_perf_event_open
+ .quad sys_reflinkat
ia32_syscall_end:
diff --cc arch/x86/include/asm/unistd_32.h
index 6fb3c20,a7924e9..0000000
--- a/arch/x86/include/asm/unistd_32.h
+++ b/arch/x86/include/asm/unistd_32.h
@@@ -341,12 -341,11 +341,13 @@@
#define __NR_preadv 333
#define __NR_pwritev 334
#define __NR_rt_tgsigqueueinfo 335
-#define __NR_perf_counter_open 336
+#define __NR_perf_event_open 336
+ #define __NR_reflinkat 337
#ifdef __KERNEL__
- #define NR_syscalls 337
++#define NR_syscalls 338
+
#define __ARCH_WANT_IPC_PARSE_VERSION
#define __ARCH_WANT_OLD_READDIR
#define __ARCH_WANT_OLD_STAT
diff --cc arch/x86/include/asm/unistd_64.h
index 8d3ad0a,b8df7a2..0000000
--- a/arch/x86/include/asm/unistd_64.h
+++ b/arch/x86/include/asm/unistd_64.h
@@@ -659,8 -659,10 +659,10 @@@ __SYSCALL(__NR_preadv, sys_preadv
__SYSCALL(__NR_pwritev, sys_pwritev)
#define __NR_rt_tgsigqueueinfo 297
__SYSCALL(__NR_rt_tgsigqueueinfo, sys_rt_tgsigqueueinfo)
-#define __NR_perf_counter_open 298
-__SYSCALL(__NR_perf_counter_open, sys_perf_counter_open)
+#define __NR_perf_event_open 298
+__SYSCALL(__NR_perf_event_open, sys_perf_event_open)
+ #define __NR_reflinkat 299
+ __SYSCALL(__NR_reflinkat, sys_reflinkat)
#ifndef __NO_STUBS
#define __ARCH_WANT_OLD_READDIR
diff --cc arch/x86/kernel/syscall_table_32.S
index 0157cd2,d3b6ebe..0000000
--- a/arch/x86/kernel/syscall_table_32.S
+++ b/arch/x86/kernel/syscall_table_32.S
@@@ -335,4 -335,5 +335,5 @@@ ENTRY(sys_call_table
.long sys_preadv
.long sys_pwritev
.long sys_rt_tgsigqueueinfo /* 335 */
- .long sys_perf_counter_open
+ .long sys_perf_event_open
+ .long sys_reflinkat
next reply other threads:[~2009-09-23 0:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-23 0:45 Stephen Rothwell [this message]
2009-09-23 3:14 ` linux-next: manual merge of the ocfs2 tree with Linus' tree Joel Becker
2009-09-23 5:25 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2009-12-17 23:51 Stephen Rothwell
2010-08-13 0:33 Stephen Rothwell
2011-03-28 1:00 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=20090923104537.2885f67a.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Joel.Becker@oracle$(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