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 between commit 0fe8f08036a2 ("arm64: Use
generic sys_execve() implementation") 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/kernel/sys_compat.c
index d140b73,fd8ae6e..0000000
--- a/arch/arm64/kernel/sys_compat.c
+++ b/arch/arm64/kernel/sys_compat.c
@@@ -49,21 -49,24 +49,6 @@@ asmlinkage int compat_sys_vfork(struct 
  		       regs, 0, NULL, NULL);
  }
  
- 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_execve(const char __user *filenamei,
 -				 compat_uptr_t argv, compat_uptr_t envp,
 -				 struct pt_regs *regs)
 -{
 -	int error;
 -	struct filename *filename;
 -
 -	filename = getname(filenamei);
 -	error = PTR_ERR(filename);
 -	if (IS_ERR(filename))
 -		goto out;
 -	error = compat_do_execve(filename->name, compat_ptr(argv),
 -					compat_ptr(envp), regs);
 -	putname(filename);
 -out:
 -	return error;
 -}
 -
  static inline void
  do_compat_cache_op(unsigned long start, unsigned long end, int flags)
  {

Attachment: pgp00000.pgp
Description: PGP signature