commit f40794953e361b2b5094fe825532498bee2f8ebd
author Alexander Polcyn <apolcyn@google.com> Fri Jan 05 11:29:56 2018 -0800
committer Alexander Polcyn <apolcyn@google.com> Fri Jan 05 11:29:56 2018 -0800
tree 2df675e19bd02b999504544351ba30acf619806b
parent ce1be0c8b0fc55d3dd912152b5d116c7086d705a

Manual merge conflict resolve: remove exec_ctx param from tcp_free

src/core/lib/iomgr/tcp_uv.cc

diff --git a/src/core/lib/iomgr/tcp_uv.cc b/src/core/lib/iomgr/tcp_uv.cc
index c227f5a..baa49d5 100644
--- a/src/core/lib/iomgr/tcp_uv.cc
+++ b/src/core/lib/iomgr/tcp_uv.cc
@@ -76,7 +76,7 @@
       grpc_slice_from_copied_string(tcp->peer_string));
 }
 
-static void tcp_free(grpc_exec_ctx* exec_ctx, grpc_tcp* tcp) {
+static void tcp_free(grpc_tcp* tcp) {
   grpc_resource_user_unref(tcp->resource_user);
   gpr_free(tcp->handle);
   gpr_free(tcp->peer_string);