Stephen Rothwell wrote:
> Hi all,
> 
> Changes since 20090619:
> 
> 
> The kvm tree lost its conflict and build failure.


arch/x86/kvm/kvm-amd.o: In function `ftrace_raw_output_kvm_cr':
(.text+0x58ed): multiple definition of `ftrace_raw_output_kvm_cr'
arch/x86/kvm/kvm-intel.o:(.text+0x6b66): first defined here
arch/x86/kvm/kvm-amd.o: In function `ftrace_raw_output_kvm_msr':
(.text+0x5a04): multiple definition of `ftrace_raw_output_kvm_msr'
arch/x86/kvm/kvm-intel.o:(.text+0x6c7d): first defined here
arch/x86/kvm/kvm-amd.o: In function `ftrace_raw_output_kvm_inj_virq':
(.text+0x5c0f): multiple definition of `ftrace_raw_output_kvm_inj_virq'
arch/x86/kvm/kvm-intel.o:(.text+0x6e88): first defined here
arch/x86/kvm/kvm-amd.o: In function `ftrace_define_fields_kvm_page_fault':
(.text+0x3d2d): multiple definition of `ftrace_define_fields_kvm_page_fault'
arch/x86/kvm/kvm-intel.o:(.text+0x2e2c): first defined here
arch/x86/kvm/kvm-amd.o: In function `ftrace_define_fields_kvm_msr':
(.text+0x3b04): multiple definition of `ftrace_define_fields_kvm_msr'
arch/x86/kvm/kvm-intel.o:(.text+0x2c03): first defined here
arch/x86/kvm/kvm-amd.o:(__tracepoints+0x80): multiple definition of `__tracepoint_kvm_cr'
arch/x86/kvm/kvm-intel.o:(__tracepoints+0x80): first defined here
arch/x86/kvm/kvm-amd.o: In function `ftrace_define_fields_kvm_exit':
(.text+0x40c5): multiple definition of `ftrace_define_fields_kvm_exit'
arch/x86/kvm/kvm-intel.o:(.text+0x31c4): first defined here
arch/x86/kvm/kvm-amd.o:(__tracepoints+0x40): multiple definition of `__tracepoint_kvm_page_fault'
arch/x86/kvm/kvm-intel.o:(__tracepoints+0x40): first defined here
arch/x86/kvm/kvm-amd.o:(__tracepoints+0x20): multiple definition of `__tracepoint_kvm_inj_virq'
arch/x86/kvm/kvm-intel.o:(__tracepoints+0x20): first defined here
arch/x86/kvm/kvm-amd.o: In function `ftrace_raw_output_kvm_page_fault':
(.text+0x5b1b): multiple definition of `ftrace_raw_output_kvm_page_fault'
arch/x86/kvm/kvm-intel.o:(.text+0x6d94): first defined here
arch/x86/kvm/kvm-amd.o:(__tracepoints+0x60): multiple definition of `__tracepoint_kvm_msr'
arch/x86/kvm/kvm-intel.o:(__tracepoints+0x60): first defined here
arch/x86/kvm/kvm-amd.o: In function `ftrace_raw_output_kvm_exit':
(.text+0x42af): multiple definition of `ftrace_raw_output_kvm_exit'
arch/x86/kvm/kvm-intel.o:(.text+0x33ae): first defined here
arch/x86/kvm/kvm-amd.o:(__tracepoints+0x0): multiple definition of `__tracepoint_kvm_exit'
arch/x86/kvm/kvm-intel.o:(__tracepoints+0x0): first defined here
arch/x86/kvm/kvm-amd.o: In function `ftrace_define_fields_kvm_inj_virq':
(.text+0x3f17): multiple definition of `ftrace_define_fields_kvm_inj_virq'
arch/x86/kvm/kvm-intel.o:(.text+0x3016): first defined here
arch/x86/kvm/kvm-amd.o: In function `ftrace_define_fields_kvm_cr':
(.text+0x38db): multiple definition of `ftrace_define_fields_kvm_cr'
arch/x86/kvm/kvm-intel.o:(.text+0x29da): first defined here



config attached.

-- 
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/