linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Avi Kivity <avi@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Randy Dunlap <randy.dunlap@oracle.com>,
	linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
	Marcelo Tosatti <mtosatti@redhat.com>
Subject: Re: linux-next: Tree for June 22 (x86/kvm)
Date: Thu, 25 Jun 2009 14:50:09 +0300	[thread overview]
Message-ID: <4A436471.2070005@redhat.com> (raw)
In-Reply-To: <20090625140122.e75669e6.sfr@canb.auug.org.au>

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<randy.dunlap@oracle.com>  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

      reply	other threads:[~2009-06-25 11:49 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-22  8:19 linux-next: Tree for June 22 Stephen Rothwell
2009-06-22  8:26 ` Stephen Rothwell
2009-06-22 17:23   ` Thorsten Leemhuis
2009-06-23  1:48     ` Stephen Rothwell
2009-06-22 15:51 ` [PATCH -next] hwlat: depends on RING_BUFFER (build fix) Randy Dunlap
2009-06-22 21:14   ` Jon Masters
2009-06-22 16:19 ` linux-next: Tree for June 22 (x86/kvm) Randy Dunlap
2009-06-25  4:01   ` Stephen Rothwell
2009-06-25 11:50     ` Avi Kivity [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4A436471.2070005@redhat.com \
    --to=avi@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mtosatti@redhat.com \
    --cc=randy.dunlap@oracle.com \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).