Subject: Re: linux-next: manual merge of the kvm tree

From: Arjan van de Ven <[email-masked]>
Date: Fri, 12 Sep 2008 12:53:40 -0700

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)