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. ------------------------------------------------------------------------- SF.Net email is sponsored by: Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace _______________________________________________ kvm-devel mailing list kvm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-devel
