Re: [ANNOUNCE] kvm-56 release

Avi Kivity
2007-12-14T14:39:33Z

Theodore Tso wrote:
> BTW, there were changes between 2.6.24-rc3 and -rc5 such that there
> are merge conflicts when I tried to do a git pull from kvm/master unto
> Linus's git mainline.
>
>

In general I merge regularly and resolve conflicts. Currently kvm.git is
based on 2.6.24-rc5.

--
Any sufficiently difficult bug is indistinguishable from a feature.