Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1193799
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | linux-next: manual merge of the akpm-current tree with the tip tree |
| Date | 2015-07-28 08:10 +0200 |
| Message-ID | <pR6fo-DL-17@gated-at.bofh.it> (permalink) |
| Organization | linux.* mail to news gateway |
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/x86/entry/syscalls/syscall_32.tbl
between commit:
9dea5dc921b5 ("x86/entry/syscalls: Wire up 32-bit direct socket calls")
from the tip tree and commit:
0a36ab281187 ("userfaultfd: activate syscall")
f721d9f04de4 ("mm: mlock: add new mlock, munlock, and munlockall system calls")
from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/x86/entry/syscalls/syscall_32.tbl
index 25e3cf1cd8fd,d68b13925aa4..000000000000
--- a/arch/x86/entry/syscalls/syscall_32.tbl
+++ b/arch/x86/entry/syscalls/syscall_32.tbl
@@@ -365,18 -365,7 +365,22 @@@
356 i386 memfd_create sys_memfd_create
357 i386 bpf sys_bpf
358 i386 execveat sys_execveat stub32_execveat
-359 i386 userfaultfd sys_userfaultfd
-360 i386 mlock2 sys_mlock2
-361 i386 munlock2 sys_munlock2
-362 i386 munlockall2 sys_munlockall2
+359 i386 socket sys_socket
+360 i386 socketpair sys_socketpair
+361 i386 bind sys_bind
+362 i386 connect sys_connect
+363 i386 listen sys_listen
+364 i386 accept4 sys_accept4
+365 i386 getsockopt sys_getsockopt compat_sys_getsockopt
+366 i386 setsockopt sys_setsockopt compat_sys_setsockopt
+367 i386 getsockname sys_getsockname
+368 i386 getpeername sys_getpeername
+369 i386 sendto sys_sendto
+370 i386 sendmsg sys_sendmsg compat_sys_sendmsg
+371 i386 recvfrom sys_recvfrom compat_sys_recvfrom
+372 i386 recvmsg sys_recvmsg compat_sys_recvmsg
+373 i386 shutdown sys_shutdown
++374 i386 userfaultfd sys_userfaultfd
++375 i386 mlock2 sys_mlock2
++376 i386 munlock2 sys_munlock2
++377 i386 munlockall2 sys_munlockall2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread
linux-next: manual merge of the akpm-current tree with the tip tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-07-28 08:10 +0200 Re: linux-next: manual merge of the akpm-current tree with the tip tree Andrea Arcangeli <aarcange@redhat.com> - 2015-07-30 17:40 +0200
csiph-web