Subject: Re: linux-next: Tree for June 22 (x86/kvm)

From: Avi Kivity <[email-masked]>
Date: Thu, 25 Jun 2009 14:50:09 +0300

On 06/25/2009 07:01 AM, Stephen Rothwell wrote:
> (cc Avi)

(cc Marcelo)

> On Mon, 22 Jun 2009 09:19:21 -0700 Randy Dunlap<[email-masked]>  wrote:
>    
>> 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'
>>      
(many more)

>> config attached.

This is due to CONFIG_KVM_AMD=y and CONFIG_KVM_INTEL=y.  I'm testing a 
patch now.

-- 
error compiling committee.c: too many arguments to function