From: Avi Kivity <avi@qumranet.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, Adrian Bunk <bunk@kernel.org>,
Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
Subject: Re: linux-next: manual merge of the kvm tree
Date: Tue, 26 Aug 2008 10:39:49 +0300 [thread overview]
Message-ID: <48B3B345.9000409@qumranet.com> (raw)
In-Reply-To: <20080826144542.9dabd12e.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
> Hi Avi,
>
> Today's linux-next merge of the kvm tree got a conflict in
> include/linux/kvm.h between commit
> 1327138e294ffda120a50c8f31d792addb196c79 ("KVM: fix userspace ABI
> breakage") from Linus' tree (a version of which which also exists in the
> kvm tree) and commit b8486fbae0046883437c91e9b475f1878888fe72 ("KVM:
> kvmtrace: replace get_cycles with ktime_get v3") from the kvm tree.
>
> I used the version from the kvm tree.
>
Fixed it up; thanks.
--
error compiling committee.c: too many arguments to function
next prev parent reply other threads:[~2008-08-26 7:39 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-26 4:45 linux-next: manual merge of the kvm tree Stephen Rothwell
2008-08-26 7:39 ` Avi Kivity [this message]
2008-08-26 7:41 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2009-06-12 2:57 Stephen Rothwell
2009-06-12 7:19 ` Avi Kivity
2009-01-02 0:44 Stephen Rothwell
2008-12-29 5:11 Stephen Rothwell
2008-12-22 3:52 Stephen Rothwell
2008-12-22 5:13 ` Benjamin Herrenschmidt
2008-12-22 21:39 ` Hollis Blanchard
2008-12-22 21:41 ` Benjamin Herrenschmidt
2008-12-22 22:03 ` Hollis Blanchard
2008-12-22 22:11 ` Benjamin Herrenschmidt
2008-12-22 22:29 ` Paul Mackerras
2008-12-22 22:44 ` Hollis Blanchard
2008-12-23 0:07 ` Paul Mackerras
2008-12-23 1:02 ` Hollis Blanchard
2008-12-23 1:38 ` Benjamin Herrenschmidt
2008-11-25 6:49 Stephen Rothwell
2008-10-29 2:58 Stephen Rothwell
2008-10-29 9:55 ` Avi Kivity
2008-10-29 10:35 ` Stephen Rothwell
2008-10-15 5:27 Stephen Rothwell
2008-09-17 5:50 Stephen Rothwell
2008-09-17 5:24 Stephen Rothwell
2008-09-15 0:14 Stephen Rothwell
2008-09-15 6:53 ` Ingo Molnar
2008-09-12 19:50 Stephen Rothwell
2008-09-12 19:53 ` Arjan van de Ven
2008-09-12 19:59 ` Stephen Rothwell
2008-08-15 4:46 Stephen Rothwell
2008-08-04 3:13 Stephen Rothwell
2008-07-22 3:43 Stephen Rothwell
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=48B3B345.9000409@qumranet.com \
--to=avi@qumranet.com \
--cc=bunk@kernel.org \
--cc=ehrhardt@linux.vnet.ibm.com \
--cc=linux-next@vger.kernel.org \
--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).