Merge remote-tracking branch 'rcu/rcu/next'

Conflicts:
	arch/x86/kernel/ptrace.c

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

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

diff --cc arch/x86/kernel/ptrace.c
index 974b67e46dd0edeb38bbffcc77442d4f57e514d5,65b88a5dc1a8a2f5d4cb5ff76b60b1756f8f050d..078c7ff264b2ee79e3cec3985c0e8849ef248e92
--- 1/arch/x86/kernel/ptrace.c
--- 2/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
@@@ -21,8 -21,7 +21,8 @@@
  #include <linux/signal.h>
  #include <linux/perf_event.h>
  #include <linux/hw_breakpoint.h>
- #include <linux/rcupdate.h>
 +#include <linux/module.h>
+ #include <linux/context_tracking.h>
  
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>

diff --cc arch/x86/kernel/signal.c
Simple merge

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

diff --cc init/Kconfig
Simple merge

diff --cc kernel/Makefile
Simple merge

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

diff --cc lib/Kconfig.debug
Simple merge