From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jeremy Fitzhardinge <jeremy@goop.org>
Subject: Re: [PATCH 00/17] Netchannel2 for a modern git kernel
Date: Tue, 06 Oct 2009 10:12:08 -0700
Message-ID: <4ACB7A68.9030306@goop.org>
References: <cover.1254667618.git.ssmith@weybridge.uk.xensource.com>
	<4AC92B44.5020208@goop.org>
	<20091005092937.GA1036@weybridge.uk.xensource.com>
	<4ACA638A.5060209@goop.org>
	<20091006090616.GA21511@weybridge.uk.xensource.com>
	<20091006163543.GA12403@weybridge.uk.xensource.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <20091006163543.GA12403@weybridge.uk.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Steven Smith <steven.smith@citrix.com>
Cc: Steven Smith <Steven.Smith@eu.citrix.com>, "xen-devel@lists.xensource.com" <xen-devel@lists.xensource.com>, Keir Fraser <Keir.Fraser@eu.citrix.com>, "joserenato.santos@hp.com" <joserenato.santos@hp.com>
List-Id: xen-devel@lists.xenproject.org

On 10/06/09 09:35, Steven Smith wrote:
>>> What dependencies does it have on the rest of the xen changes?  In
>>> general I like to avoid basing branches on xen/master, because it makes
>>> them fairly brittle to rebase or otherwise rearrange.  Ideally I like to
>>> base each topic branch on a mainline kernel version (like v2.6.31), or
>>> if there are too many dependencies on other Xen topic branches, the most
>>> specific one that covers the dependencies (xen/core, xen/dom0/core, for
>>> example).
>>>       
>> I needed to make some changes to netback to make forwarding packets
>> between NC1 and NC2 interfaces work, but apart from that it's fairly
>> self-contained.  Would you like me to rebase to
>> xen/dom0/backend/netback?
>>     
> Hmm... xen/dom0/backend/netback doesn't actually boot on my test box,
> so that could be a little tricky:
>   

Yeah, I wouldn't expect the netback to boot on its own.  It is
functionally self-contained, but it doesn't have the other functionality
of the other branches.

My normal workflow is:

   1. git checkout -b hackingabout xen/master
   2. git merge xen/dom0/backend/netback
   3. (git tag hackbase)

Hack about (lots of little ad-hoc commits).
When happy:

   1. git rebase -i --onto xen/dom0/backend/netback hackbase (squash all
      the little commits into sensible groups, remove crud, reorder, etc)
   2. make sure it still works
   3. git checkout xen/dom0/backend/netback
   4. git reset --hard hackingabout
   5. git branch -d hackingabout
   6. git tag -d hackbase

    J