Merge branch 'topic/mprofile-kernel' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Fri, 11 Mar 2016 00:20:15 +0000 (11:20 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Fri, 11 Mar 2016 00:20:15 +0000 (11:20 +1100)
Merge the ftrace changes to support -mprofile-kernel on ppc64le. This is
a prerequisite for live patching, the support for which will be merged
via the livepatch tree based on this topic branch.

1  2 
arch/powerpc/Kconfig
arch/powerpc/include/asm/module.h
arch/powerpc/kernel/entry_64.S
arch/powerpc/kernel/module_64.c

Simple merge
Simple merge
Simple merge
Simple merge