From: Arjan van de Ven <arjan@linux.intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Avi Kivity <avi@qumranet.com>,
linux-next@vger.kernel.org, Marcelo Tosatti <mtosatti@redhat.com>
Subject: Re: linux-next: manual merge of the kvm tree
Date: Fri, 12 Sep 2008 12:53:40 -0700 [thread overview]
Message-ID: <48CAC8C4.90302@linux.intel.com> (raw)
In-Reply-To: <20080913055017.f54fbf66.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
> Hi Avi,
>
> Today's linux-next merge of the kvm tree got a conflict in
> arch/x86/kvm/i8254.c between commit
> beb20d52d03a51218827fb4a36a4b583debb03f9 ("hrtimer: convert kvm to the
> new hrtimer apis") from the timers tree and commit
> 3dceed526eaab43af90bcec3476c4f534f98dd41 ("KVM: PIT: fix injection logic
> and count") from the kvm tree.
>
> Just contextual. I fixed it up (see below) and can carry the fix.
Stephen: one option is to push the "introduce the new apis" patch to Linus
now (it just adds apis, nothing more); with that done it's possible to
push all the conversions via the separate maintainer git trees...
(not that it's all THAT painful right now, but still)
next prev parent reply other threads:[~2008-09-12 19:53 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-12 19:50 linux-next: manual merge of the kvm tree Stephen Rothwell
2008-09-12 19:53 ` Arjan van de Ven [this message]
2008-09-12 19:59 ` 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-08-26 4:45 Stephen Rothwell
2008-08-26 7:39 ` Avi Kivity
2008-08-26 7:41 ` 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=48CAC8C4.90302@linux.intel.com \
--to=arjan@linux.intel.com \
--cc=avi@qumranet.com \
--cc=linux-next@vger.kernel.org \
--cc=mtosatti@redhat.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).