From a52e328ba418848bbd3573455be1796f9fec825d Mon Sep 17 00:00:00 2001
From: Sylvain Jeaugey <sjeaugey@nvidia.com>
Date: Wed, 30 Mar 2022 02:14:32 -0700
Subject: [PATCH] Fix merging error

[ROCm/rccl commit: 2247152a8ea68170adad865acf3c8783367c9e39]
---
 projects/rccl/src/transport/net_socket.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/rccl/src/transport/net_socket.cc b/projects/rccl/src/transport/net_socket.cc
index ccdca04aa5..9e14aa2d09 100644
--- a/projects/rccl/src/transport/net_socket.cc
+++ b/projects/rccl/src/transport/net_socket.cc
@@ -502,7 +502,7 @@ ncclResult_t ncclSocketTest(void* request, int* done, int* size) {
       char line[SOCKET_NAME_MAXLEN+1];
       WARN("NET/Socket : peer %s message truncated : receiving %d bytes instead of %d. If you believe your socket network is in healthy state, \
           there may be a mismatch in collective sizes or environment settings (e.g. NCCL_PROTO, NCCL_ALGO) between ranks",
-          socketToString(&r->ctrlSock->addr, line), data, r->size);
+          ncclSocketToString(&r->ctrlSock->addr, line), data, r->size);
       return ncclInvalidUsage;
     }
     r->size = data;