Merge branch 'topic/livepatch' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Mon, 18 Apr 2016 10:45:32 +0000 (20:45 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 18 Apr 2016 10:45:32 +0000 (20:45 +1000)
commit8404410b296095c78ed63f163ac5d417ff0647dd
tree542fcea7d106a8fd608c47da1a8c88255f3e2c5f
parent1050e689a63baffdadcd33498c15d859922504c0
parent85baa095497f3e590df9f6c8932121f123efca5c
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.
arch/powerpc/Kconfig
arch/powerpc/kernel/asm-offsets.c
arch/powerpc/kernel/entry_64.S
arch/powerpc/kernel/process.c
arch/powerpc/kernel/setup_64.c
include/linux/ftrace.h
kernel/livepatch/core.c
kernel/trace/ftrace.c