Branch HEAD

update b_som from the proper branch

diff --git a/build/buildcvs b/build/buildcvs
index 57ff664..b2ed333 100644 (file)
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -195,7 +195,7 @@ case "$lustretag" in
        ;;
 
     # CMD3
-    b_post_cmd3|b_new_cmd_sles10|b1_6_head_sync|b_mixed_layout_req|b_mount_perm|b1_8_gns|b1_8_interop_server|b_som)
+    b_post_cmd3|b_new_cmd_sles10|b1_6_head_sync|b_mixed_layout_req|b_mount_perm|b1_8_gns|b1_8_interop_server)
         # Update b1_8 above when changing this.
         ldiskfstag="$ldiskfstag_head"
         ;;
@@ -303,7 +303,7 @@ case "$lustretag" in
 
     # Branches that have been updated to include
     # the libcfs split should be added here
-    HEAD|b_head_quota|b_hd_cfld|b_hd_changelog|b_hd_sptlrpc|HD_SPTLRPC_BASE)
+    HEAD|b_head_quota|b_hd_cfld|b_hd_changelog|b_hd_sptlrpc|HD_SPTLRPC_BASE|b_som)
         lnettag="HEAD"
         ldiskfstag="$ldiskfstag_head"
         libcfstag="HEAD"