* Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi all,
>
> Today's linux-next merge of the kmemcheck tree got a conflict in
> arch/x86/mm/Makefile between commit
> fd3fdf11d3c649769e02459c5f1b8081a15e9007 ("trace: add the MMIO-tracer to
> the tracer menu, cleanup") from the ftrace tree and commit
> 385e31b9eae0528bada07d16a189f3f40df23961 ("kmemcheck: add the kmemcheck
> core") from the kmemcheck tree.
>
> Just context changes. I fixed it (see below) and can carry the fix.
> +++ b/arch/x86/mm/Makefile
> @@@ -8,8 -8,11 +8,10 @@@ obj-$(CONFIG_X86_PTDUMP) += dump_pageta
>
> obj-$(CONFIG_HIGHMEM) += highmem_32.o
>
> + obj-$(CONFIG_KMEMCHECK) += kmemcheck/
> +
> -obj-$(CONFIG_MMIOTRACE_HOOKS) += kmmio.o
> obj-$(CONFIG_MMIOTRACE) += mmiotrace.o
> -mmiotrace-y := pf_in.o mmio-mod.o
> +mmiotrace-y := kmmio.o pf_in.o mmio-mod.o
thanks Stephen, that's the correct resolution i have as well.
Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
