[openib-general] Opensm - casting issues

Yael Kalka eitan at mtl001.openib.org
Tue Sep 13 01:43:04 PDT 2005


Hi Hal,

Attached is a patch for comments left by mistake when you merged the
files.

Thanks,
Yael

Signed-off-by:  Yael Kalka <yael at mellanox.co.il>

Index: libvendor/osm_vendor_mlx_anafa.c
===================================================================
--- libvendor/osm_vendor_mlx_anafa.c    (revision 3395)
+++ libvendor/osm_vendor_mlx_anafa.c    (working copy)
@@ -447,11 +447,7 @@ osm_vendor_send (IN osm_bind_handle_t h_
 
        /* Make our operations with the send context atomic */
        osmv_txn_lock (p_bo);
-<<<<<<< .working
-
-=======

->>>>>>> .merge-right.r3275
        if (TRUE == p_bo->is_closing) {
      osm_log (p_bo->p_vendor->p_log, OSM_LOG_ERROR,
               "osm_vendor_send: ERR 7410: "




More information about the general mailing list