96200591a3
Conflicts:
arch/x86/kernel/kprobes.c
kernel/trace/Makefile
Merge reason: hw-breakpoints perf integration is looking
good in testing and in reviews, plus conflicts
are mounting up - so merge & resolve.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
||
|---|---|---|
| .. | ||
| kmemcheck | ||
| Makefile | ||
| dump_pagetables.c | ||
| extable.c | ||
| fault.c | ||
| gup.c | ||
| highmem_32.c | ||
| hugetlbpage.c | ||
| init.c | ||
| init_32.c | ||
| init_64.c | ||
| iomap_32.c | ||
| ioremap.c | ||
| k8topology_64.c | ||
| kmmio.c | ||
| memtest.c | ||
| mmap.c | ||
| mmio-mod.c | ||
| numa.c | ||
| numa_32.c | ||
| numa_64.c | ||
| pageattr-test.c | ||
| pageattr.c | ||
| pat.c | ||
| pf_in.c | ||
| pf_in.h | ||
| pgtable.c | ||
| pgtable_32.c | ||
| physaddr.c | ||
| physaddr.h | ||
| setup_nx.c | ||
| srat_32.c | ||
| srat_64.c | ||
| testmmiotrace.c | ||
| tlb.c | ||