From: Steven Smith <ssmith@weybridge.uk.xensource.com>
Date: Fri, 19 Jun 2009 16:02:54 +0000 (+0100)
Subject: Add a document which briefly describes the repository branch structure,
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e6ec6c9d928502e373acb9524f7df6371666f8ba;p=people%2Fssmith%2Fnc2-2.6.27.git

Add a document which briefly describes the repository branch structure,
because I keep confusing myself.
---

diff --git a/branch-structure.txt b/branch-structure.txt
new file mode 100644
index 00000000..c5329d67
--- /dev/null
+++ b/branch-structure.txt
@@ -0,0 +1,28 @@
+Rough branch structure:
+
+These ones shouldn't change unless we pull from upstream and rebase:
+
+origin/origin -- The original 2.6.27 tree
+origin-plus-patchqueue -- origin/origin with a snapshot of the 2.6.27
+			  patchqueue applied.
+nc2/forklift-over-patchqueue -- origin-plus-patchqueue plus a simple
+				forklift of the 2.6.18 version of the
+				patch.
+
+
+These ones will change as we do development:
+
+nc2/trunk -- nc2/forklift-over-patchqueue plus currently accepted
+	     patches.
+
+defer_allocation -- Goes over the top of nc2/trunk and gets rid of a
+		    lot of the resource allocation by doing the
+		    transmit directly from the netdev start_xmit
+		    method.
+
+read_from_ring -- Goes over the top of defer_allocation and arranges
+		  that we can read messages directly from the ring,
+		  without copying them.
+
+renato_patches -- A bunch of patches which Renato sent me.  Goes over
+		  the top of nc2/trunk.