]> 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)
commit003f523911f408c8a7e4d778a036d97bb66e5074
tree0af5b9f46ee5a79a6abe64ee63eea12f2a99fdbb
parent6bf966cbc363ee9a014d52a0f8505bea8835529b
parent12c5954e956b3c188fade3181a356edce9d14836
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