From: Jean Guyader <jean.guyader@eu.citrix.com>
Date: Mon, 30 Nov 2009 16:44:17 +0000 (+0000)
Subject: Revert "Revert "Revert "Remove netchannel2 patches." - needed for domU->domU V2V... 
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3c07eb6958add260d3b6d85130bd28ce8cd65cd0;p=xenclient%2Fxen-pq.git

Revert "Revert "Revert "Remove netchannel2 patches." - needed for domU->domU V2V" - iovm is unhappy"

This reverts commit 44885f2aadf23163d01d484ef9c755087f9ad035.

The problem was in the guest kernel, commit
985779b348db29529a2a91474f862100093763a5 in kernel-pq should fix it.
---

diff --git a/master/series b/master/series
index 5f40840..c4d03ad 100644
--- a/master/series
+++ b/master/series
@@ -1,7 +1,6 @@
 xen-unstable-19932-c0cb307d927f
-
-#xen-unstable-netchannel2
-#xen-unstable-netchannel2-fixes
+xen-unstable-netchannel2
+xen-unstable-netchannel2-fixes
 
 check-open-pv-log-file
 fix_compilation