Merge remote branch 'ca-git-uek/topic/uek-4.1/stable-cherry-picks' into official...

diff --cc Makefile
Simple merge

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

diff --cc arch/x86/mm/fault.c
Simple merge

diff --cc block/blk-core.c
Simple merge

diff --cc drivers/vhost/vhost.c
Simple merge

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

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

diff --cc include/linux/tracepoint.h
index 4ab84ae8e3fdf5012009f4f0f269e88e3fb02f6b,a6e1bca88cc63e52d810e8426f410991744da93a..0886936acf8d91675398ad56d87c681f2d56b28d
--- 1/include/linux/tracepoint.h
--- 2/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
@@@ -14,11 -14,12 +14,13 @@@
   * See the file COPYING for more details.
   */
  
+ #include <linux/smp.h>
  #include <linux/errno.h>
  #include <linux/types.h>
+ #include <linux/cpumask.h>
  #include <linux/rcupdate.h>
  #include <linux/static_key.h>
 +#include <linux/sdt.h>
  
  struct module;
  struct tracepoint;

diff --cc init/main.c
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/module.c
Simple merge

diff --cc kernel/ptrace.c
Simple merge

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

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

diff --cc kernel/signal.c
Simple merge

diff --cc mm/hugetlb.c
Simple merge

diff --cc mm/memcontrol.c
Simple merge

diff --cc virt/kvm/eventfd.c
Simple merge