From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Re: [ANNOUNCE] kvm-56 release Date: Fri, 14 Dec 2007 16:39:33 +0200 Message-ID: <476295A5.9000207@qumranet.com> References: <4761347E.9090806@qumranet.com> <20071213190545.GC9921@thunk.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: kvm-devel To: Theodore Tso Return-path: In-Reply-To: <20071213190545.GC9921-AKGzg7BKzIDYtjvyW6yDsg@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Errors-To: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org List-Id: kvm.vger.kernel.org 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