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

Conflicts:
	arch/cris/include/asm/Kbuild
	arch/h8300/include/asm/Kbuild
	arch/m32r/include/asm/Kbuild
	arch/x86/kernel/signal.c

diff --cc arch/alpha/kernel/process.c
Simple merge

diff --cc arch/arm/include/asm/thread_info.h
Simple merge

diff --cc arch/cris/include/asm/Kbuild
index 28b690de797116ca4f5deb292021b75e72924e82,b68ad4bfa088cffd5293fc4c3cfad53e6b060c45..f5ae9de736d37f460d433548108fa59ce7168759
--- 1/arch/cris/include/asm/Kbuild
--- 2/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@@ -8,4 -8,4 +8,5 @@@ header-y += etraxgpio.
  header-y += rs485.h
  header-y += sync_serial.h
  
 +generic-y += module.h
+ generic-y += exec.h

diff --cc arch/h8300/include/asm/Kbuild
index 871382d239fef60105b37f50424afe24ed6773e3,3a2af1a2974fc49e21586455c608d3b192f613f4..883a0be9f69f7921b993698a576b176460bec0cd
--- 1/arch/h8300/include/asm/Kbuild
--- 2/arch/h8300/include/asm/Kbuild
+++ b/arch/h8300/include/asm/Kbuild
@@@ -1,3 -1,2 +1,4 @@@
  include include/asm-generic/Kbuild.asm
 +
 +generic-y     += module.h
+ generic-y += exec.h

diff --cc arch/m32r/include/asm/Kbuild
index 871382d239fef60105b37f50424afe24ed6773e3,708340339b057e16c4accba616fd5d37ffa53838..883a0be9f69f7921b993698a576b176460bec0cd
--- 1/arch/m32r/include/asm/Kbuild
--- 2/arch/m32r/include/asm/Kbuild
+++ b/arch/m32r/include/asm/Kbuild
@@@ -1,3 -1,3 +1,4 @@@
  include include/asm-generic/Kbuild.asm
  
 +generic-y     += module.h
+ generic-y += exec.h

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

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

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

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

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

diff --cc arch/s390/kernel/process.c
Simple merge

diff --cc arch/sparc/include/asm/Kbuild
Simple merge

diff --cc arch/x86/ia32/sys_ia32.c
Simple merge

diff --cc arch/x86/include/asm/sys_ia32.h
Simple merge

diff --cc arch/x86/include/asm/thread_info.h
Simple merge

diff --cc arch/x86/kernel/Makefile
Simple merge

diff --cc arch/x86/kernel/entry_32.S
Simple merge

diff --cc arch/x86/kernel/entry_64.S
Simple merge

diff --cc arch/x86/kernel/signal.c
index bca0ab903e577dd96c017cd2b1deeded1e28ea60,c648fc5298729b76e1ab677df263d7d3a1f3551e..6b18d3717fec900adf2c5f7fc67bf78012bd9646
--- 1/arch/x86/kernel/signal.c
--- 2/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
@@@ -802,12 -800,6 +802,8 @@@ do_notify_resume(struct pt_regs *regs, 
        }
        if (thread_info_flags & _TIF_USER_RETURN_NOTIFY)
                fire_user_return_notifiers();
- #ifdef CONFIG_X86_32
-       clear_thread_flag(TIF_IRET);
- #endif /* CONFIG_X86_32 */
- 
 +
 +      rcu_user_enter();
  }
  
  void signal_fault(struct pt_regs *regs, void __user *frame, char *where)

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

diff --cc kernel/sched/core.c
Simple merge