linux-next: manual merge of the akpm tree with the signal tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
arch/arm64/kernel/sys_compat.c arch/arm64/include/asm/unistd.h between
commit 8709876911bd ("arm64: sanitize copy_thread(), switch to generic
fork/vfork/clone") from the signal tree and commit "compat: generic
compat_sys_sched_rr_get_interval() implementation" from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm64/include/asm/unistd.h
index d69aeea,1a7c88c..0000000
--- a/arch/arm64/include/asm/unistd.h
+++ b/arch/arm64/include/asm/unistd.h
@@@ -24,9 -24,7 +24,10 @@@
  #define __ARCH_WANT_SYS_SIGPROCMASK
  #define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND
  #define __ARCH_WANT_COMPAT_SYS_SENDFILE
 +#define __ARCH_WANT_SYS_FORK
 +#define __ARCH_WANT_SYS_VFORK
+ #define __ARCH_WANT_COMPAT_SYS_SCHED_RR_GET_INTERVAL
  #endif
  #define __ARCH_WANT_SYS_EXECVE
 +#define __ARCH_WANT_SYS_CLONE
  #include <uapi/asm/unistd.h>
diff --cc arch/arm64/kernel/sys_compat.c
index f7b05ed,c34c81d..0000000
--- a/arch/arm64/kernel/sys_compat.c
+++ b/arch/arm64/kernel/sys_compat.c
@@@ -28,21 -28,17 +28,6 @@@
  #include <asm/cacheflush.h>
  #include <asm/unistd32.h>
  
- asmlinkage int compat_sys_sched_rr_get_interval(compat_pid_t pid,
- 						struct compat_timespec __user *interval)
- {
- 	struct timespec t;
- 	int ret;
- 	mm_segment_t old_fs = get_fs();
- 
- 	set_fs(KERNEL_DS);
- 	ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
- 	set_fs(old_fs);
- 	if (put_compat_timespec(&t, interval))
- 		return -EFAULT;
- 	return ret;
- }
- 
 -asmlinkage int compat_sys_fork(void)
 -{
 -	return do_fork(SIGCHLD, 0, current_pt_regs(), 0, NULL, NULL);
 -}
 -
 -asmlinkage int compat_sys_vfork(void)
 -{
 -	return do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, 0,
 -		       current_pt_regs(), 0, NULL, NULL);
 -}
 -
  static inline void
  do_compat_cache_op(unsigned long start, unsigned long end, int flags)
  {

Attachment: pgp00000.pgp
Description: PGP signature