Searched hist:"9 fc84914" (Results 1 – 2 of 2) sorted by relevance
/openbmc/linux/arch/powerpc/kernel/ |
H A D | kprobes.c | 9fc84914 Mon Apr 24 09:24:04 CDT 2017 Michael Ellerman <mpe@ellerman.id.au> 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.
|
/openbmc/linux/arch/powerpc/ |
H A D | Kconfig | 9fc84914 Mon Apr 24 09:24:04 CDT 2017 Michael Ellerman <mpe@ellerman.id.au> 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.
|