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

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/include/asm/processor.h
Simple merge

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

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/parisc/include/asm/unistd.h
Simple merge

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

diff --cc arch/s390/Kconfig
Simple merge

diff --cc arch/sparc/include/asm/ptrace.h
index da43bdc622943bf422a396abba301148151f8f96,1e8b818022630a0b35907808aac0fa41876a4c8f..bdfafd7af46fb48eeb04e25787733b0500f66d07
--- 1/arch/sparc/include/asm/ptrace.h
--- 2/arch/sparc/include/asm/ptrace.h
+++ b/arch/sparc/include/asm/ptrace.h
@@@ -42,22 -45,9 +45,20 @@@ struct global_reg_snapshot 
        struct thread_info      *thread;
        unsigned long           pad1;
  };
 -extern struct global_reg_snapshot global_reg_snapshot[NR_CPUS];
 +
 +struct global_pmu_snapshot {
 +      unsigned long           pcr[4];
 +      unsigned long           pic[4];
 +};
 +
 +union global_cpu_snapshot {
 +      struct global_reg_snapshot      reg;
 +      struct global_pmu_snapshot      pmu;
 +};
 +
 +extern union global_cpu_snapshot global_cpu_snapshot[NR_CPUS];
  
- #define force_successful_syscall_return()         \
- do {  current_thread_info()->syscall_noerror = 1; \
- } while (0)
+ #define force_successful_syscall_return() set_thread_noerror(1)
  #define user_mode(regs) (!((regs)->tstate & TSTATE_PRIV))
  #define instruction_pointer(regs) ((regs)->tpc)
  #define instruction_pointer_set(regs, val) ((regs)->tpc = (val))

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

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