Merge remote-tracking branch 'signal/for-next'

Conflicts:
	arch/sparc/kernel/sys_sparc_64.c

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/mips/kernel/mips_ksyms.c
Simple merge

diff --cc arch/mips/kernel/scall64-n32.S
Simple merge

diff --cc arch/powerpc/include/asm/unistd.h
Simple merge

diff --cc arch/s390/kernel/entry64.S
Simple merge

diff --cc arch/sparc/include/asm/processor_64.h
Simple merge

diff --cc arch/sparc/include/asm/thread_info_64.h
Simple merge

diff --cc arch/sparc/kernel/process_64.c
Simple merge

diff --cc arch/sparc/kernel/sys_sparc_64.c
index 878ef3d5fec522d6b23d0640df962f33c2b958df,adfe60ece05f5e2c7b5fa810ed29a9041f44ad87..51b85feb8b973a0cbfaf8f8e35ae347227f0e12a
--- 1/arch/sparc/kernel/sys_sparc_64.c
--- 2/arch/sparc/kernel/sys_sparc_64.c
+++ b/arch/sparc/kernel/sys_sparc_64.c
@@@ -729,30 -729,3 +729,8 @@@ SYSCALL_DEFINE5(rt_sigaction, int, sig
  
        return ret;
  }
- /*
-  * Do a system call from kernel instead of calling sys_execve so we
-  * end up with proper pt_regs.
-  */
- int kernel_execve(const char *filename,
-                 const char *const argv[],
-                 const char *const envp[])
- {
-       long __res;
-       register long __g1 __asm__ ("g1") = __NR_execve;
-       register long __o0 __asm__ ("o0") = (long)(filename);
-       register long __o1 __asm__ ("o1") = (long)(argv);
-       register long __o2 __asm__ ("o2") = (long)(envp);
-       asm volatile ("t 0x6d\n\t"
-                     "sub %%g0, %%o0, %0\n\t"
-                     "movcc %%xcc, %%o0, %0\n\t"
-                     : "=r" (__res), "=&r" (__o0)
-                     : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__g1)
-                     : "cc");
-       return __res;
- }
- 
 +
 +asmlinkage long sys_kern_features(void)
 +{
 +      return KERN_FEATURE_MIXED_MODE_STACK;
 +}

diff --cc arch/sparc/kernel/systbls_64.S
Simple merge

diff --cc drivers/staging/gdm72xx/gdm_usb.c
Simple merge

diff --cc fs/file.c
Simple merge

diff --cc include/linux/sched.h
Simple merge