Messages in this thread | | | Date | Thu, 6 Dec 2012 10:17:03 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the arm64 tree with Linus' tree |
| |
Hi Catalin,
Today's linux-next merge of the arm64 tree got a conflict in arch/arm64/include/asm/unistd32.h between commit 9d73fc2d641f ("open*(2) compat fixes (s390, arm64)") from Linus' tree and commit 18a80376ddb0 ("arm64: compat for clock_adjtime(2) is miswired") from the arm64 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/arm64/include/asm/unistd32.h index 656a6f2,e067f9d..0000000 --- a/arch/arm64/include/asm/unistd32.h +++ b/arch/arm64/include/asm/unistd32.h @@@ -392,8 -392,8 +392,8 @@@ __SYSCALL(367, sys_fanotify_init __SYSCALL(368, compat_sys_fanotify_mark_wrapper) __SYSCALL(369, sys_prlimit64) __SYSCALL(370, sys_name_to_handle_at) -__SYSCALL(371, sys_open_by_handle_at) +__SYSCALL(371, compat_sys_open_by_handle_at) - __SYSCALL(372, sys_clock_adjtime) + __SYSCALL(372, compat_sys_clock_adjtime) __SYSCALL(373, sys_syncfs) #define __NR_compat_syscalls 374 [unhandled content-type:application/pgp-signature] | |