]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'topic/kprobes' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Mon, 24 Apr 2017 14:24:04 +0000 (00:24 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 24 Apr 2017 14:24:04 +0000 (00:24 +1000)
commite622679c93f07a116327c7c1b4146a0629be8240
tree0af5b9f46ee5a79a6abe64ee63eea12f2a99fdbb
parent8467d974f774155fa252c1ca49efddec2ece97c5
parent1159c5b580fdbc3b71467126ca5adf871aeec159
Merge branch 'topic/kprobes' into next

Although most of these kprobes patches are powerpc specific, there's a couple
that touch generic code (with Acks). At the moment there's one conflict with
acme's tree, but it's not too bad. Still just in case some other conflicts show
up, we've put these in a topic branch so another tree could merge some or all of
it if necessary.
arch/powerpc/Kconfig
arch/powerpc/kernel/entry_64.S
arch/powerpc/kernel/kprobes.c