Merge tag 'v4.20-rc5' into x86/cleanups, to sync up the tree

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc arch/x86/kernel/cpu/mcheck/mce_amd.c
Simple merge

diff --cc arch/x86/kernel/process.c
index b7cb5348f37f161ae3ccbf9e764fef066180126c,7d31192296a87d09104ab605540ce4264d56f6bf..90ae0ca51083768df899edd88f6016be224c3316
--- 1/arch/x86/kernel/process.c
--- 2/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@@ -41,8 -39,9 +41,10 @@@
  #include <asm/desc.h>
  #include <asm/prctl.h>
  #include <asm/spec-ctrl.h>
 +#include <asm/proto.h>
  
+ #include "process.h"
+ 
  /*
   * per-CPU TSS segments. Threads are completely 'soft' on Linux,
   * no more per-task TSS's. The TSS size is kept cacheline-aligned

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

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