From: liangzhen <liangzhen>
Date: Fri, 22 Aug 2008 05:41:12 +0000 (+0000)
Subject: Branch HEAD
X-Git-Tag: v1_7_110~69
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=8a6ada97a8896712a4d0131c1b464ca7123686b0;p=fs%2Flustre-release.git

Branch HEAD

LNet branch for new o2iblnd protocol (b15983, b13621, b14425, b14358)
---

diff --git a/build/buildcvs b/build/buildcvs
index 10e069ab..4347e79 100644
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -166,6 +166,15 @@ case "$lustretag" in
     b_hd_lnet_smp)
         # LNet grained locking and SMP improvement branch
         lnettag="b_hd_lnet_smp"
+        ldiskfstag="$ldiskfstag_head"
+        lustretag="HEAD"
+        libcfstag="HEAD"
+        ;;
+
+    b_hd_o2ib_new_proto)
+        # LNet branch for new o2iblnd protocol (15983, 13621, 14425, 14358)
+        lnettag="b_hd_o2ib_new_proto"
+        ldiskfstag="$ldiskfstag_head"
         lustretag="HEAD"
         libcfstag="HEAD"
         ;;