From owner-freebsd-virtualization@FreeBSD.ORG Mon Aug 18 14:07:45 2008 Return-Path: Delivered-To: freebsd-virtualization@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 80BF1106567F for ; Mon, 18 Aug 2008 14:07:45 +0000 (UTC) (envelope-from julian@elischer.org) Received: from outR.internet-mail-service.net (outr.internet-mail-service.net [216.240.47.241]) by mx1.freebsd.org (Postfix) with ESMTP id 460ED8FC1D for ; Mon, 18 Aug 2008 14:07:43 +0000 (UTC) (envelope-from julian@elischer.org) Received: from idiom.com (mx0.idiom.com [216.240.32.160]) by out.internet-mail-service.net (Postfix) with ESMTP id 234092412; Mon, 18 Aug 2008 07:07:48 -0700 (PDT) Received: from julian-mac.elischer.org (localhost [127.0.0.1]) by idiom.com (Postfix) with ESMTP id CE3582D60A3; Mon, 18 Aug 2008 07:07:42 -0700 (PDT) Message-ID: <48A98231.2080503@elischer.org> Date: Mon, 18 Aug 2008 07:07:45 -0700 From: Julian Elischer User-Agent: Thunderbird 2.0.0.16 (Macintosh/20080707) MIME-Version: 1.0 To: Marko Zec References: <200808181219.20045.zec@freebsd.org> In-Reply-To: <200808181219.20045.zec@freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: "Bjoern A. Zeeb" , freebsd-virtualization@freebsd.org Subject: Re: Next p4 integ for vimage branch X-BeenThere: freebsd-virtualization@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Discussion of various virtualization techniques FreeBSD supports." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Aug 2008 14:07:45 -0000 Marko Zec wrote: > I'm half through resolving the conflicts there and probably won't be > done with this until tomorrow afternoon after returning home. Will do > the others branches after vimage integ is done. > > Marko commit3 should not be a problem since it is based off commit2 I was going to offer to help with vimage-commit however is base of 'vimage' so merging vimage should allow you to to vimage-commit by cross itegratingthe changes.. then cross integrating between vimage-commit and vimage-commit3 should be possible to merge them.. (the reason that vimage-commit and vimage-commit3 both exist is as a check on eaxh other.. vimage-commit is a cut-down version of vimage, while vmage-commit3 is a built up version of vimage-commit2, but they shuld contain about the same information.. it was my way of comparing 'vimage' with the (originally) machine generated vimage-commit2. so if we merge -current into vomage, teh same changes should also apply into vimage-commit. which should then become very close to vimage-commit3. I vwould then merge those two, and call that teh next commit in other workds I think the next commit candidate (which will still make no actual change to the binaries should be the integration product of vimage-commmit and vimage-commit3 both of which should have been updated to take into account the commit just done. that will be "just about everything else we can do without changing hte binary". I think this should eb the aim of the next commit. "get as much in as we can without actually doing anything" it massively reduces teh diff and puts us in a really god possition for having the MEAT of the diff more visible and available for review. it will also make the differences with Jamie more clear.