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

diff --cc arch/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

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

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

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

diff --cc kernel/Makefile
index f70396e5a24b8cef95d994ed612aca85beaaac92,9fb670d31e9c1b967af89bbfedf7917586f32786..4363a41e1ff4e0a4f66767a442e20b5c0045b033
--- 1/kernel/Makefile
--- 2/kernel/Makefile
+++ b/kernel/Makefile
@@@ -108,7 -109,17 +108,8 @@@ obj-$(CONFIG_USER_RETURN_NOTIFIER) += u
  obj-$(CONFIG_PADATA) += padata.o
  obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
  obj-$(CONFIG_JUMP_LABEL) += jump_label.o
+ obj-$(CONFIG_UPROBES) += uprobes.o
  
 -ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y)
 -# According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is
 -# needed for x86 only.  Why this used to be enabled for all architectures is beyond
 -# me.  I suspect most platforms don't need this, but until we know that for sure
 -# I turn this off for IA-64 only.  Andreas Schwab says it's also needed on m68k
 -# to get a correct value for the wait-channel (WCHAN in ps). --davidm
 -CFLAGS_sched.o := $(PROFILING) -fno-omit-frame-pointer
 -endif
 -
  $(obj)/configs.o: $(obj)/config_data.h
  
  # config_data.h contains the same information as ikconfig.h but gzipped.

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/signal.c
Simple merge

diff --cc kernel/trace/trace.h
Simple merge

diff --cc tools/perf/builtin-probe.c
Simple merge

diff --cc tools/perf/util/symbol.h
Simple merge