Merge branch 'topic/livepatch' into next

Merge the support for live patching on ppc64le using mprofile-kernel.
This branch has also been merged into the livepatching tree for v4.7.

diff --cc arch/powerpc/Kconfig
index fbebde0771c8a41cde174a74d0922f37f158ac75,926c0eafbee3c4ef0721cfc4e112e0047a97f1a9..9b5c7bcc06c4aaab91bdece5f451a75a07ac29fb
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -159,7 -159,7 +159,8 @@@ config PP
        select ARCH_HAS_DEVMEM_IS_ALLOWED
        select HAVE_ARCH_SECCOMP_FILTER
        select ARCH_HAS_UBSAN_SANITIZE_ALL
 +      select ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT
+       select HAVE_LIVEPATCH if HAVE_DYNAMIC_FTRACE_WITH_REGS
  
  config GENERIC_CSUM
        def_bool CPU_LITTLE_ENDIAN

diff --cc arch/powerpc/kernel/asm-offsets.c
Simple merge

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

diff --cc arch/powerpc/kernel/process.c
index 4695088e7dd21d0e1bbb84391063720fe6f0593a,a38ce49648cb76e5bf184291ce5b73f11551314d..ad79816f13fe76b79f0a8c5f4c1f11b45efd4218
--- 1/arch/powerpc/kernel/process.c
--- 2/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@@ -56,7 -55,8 +56,9 @@@
  #include <asm/firmware.h>
  #endif
  #include <asm/code-patching.h>
 +#include <asm/exec.h>
+ #include <asm/livepatch.h>
+ 
  #include <linux/kprobes.h>
  #include <linux/kdebug.h>
  

diff --cc arch/powerpc/kernel/setup_64.c
Simple merge

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

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

diff --cc kernel/trace/ftrace.c
Simple merge