Fixes

src/core/lib/iomgr/ev_epoll1_linux.c

@@ -515,9 +515,9 @@ static grpc_error *pollset_kick_all(grpc_exec_ctx *exec_ctx,
           GRPC_STATS_INC_POLLSET_KICKED_AGAIN(exec_ctx);
           break;
         case UNKICKED:
-          GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(exec_ctx);
           SET_KICK_STATE(worker, KICKED);
           if (worker->initialized_cv) {
+            GRPC_STATS_INC_POLLSET_KICK_WAKEUP_CV(exec_ctx);
             gpr_cv_signal(&worker->cv);
           }
           break;

src/core/lib/iomgr/ev_epollex_linux.c

@@ -666,12 +666,8 @@ static grpc_error *pollset_kick_inner(grpc_exec_ctx *exec_ctx,
 /* p->po.mu must be held before calling this function */
 static grpc_error *pollset_kick(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset,
                                 grpc_pollset_worker *specific_worker) {
-<<<<<<< HEAD
-  pollable *p = pollset->current_pollable;
-  GRPC_STATS_INC_POLLSET_KICK(exec_ctx);
-=======
   pollable_t *p = pollset->current_pollable;
->>>>>>> d1fefe89dacf198a721053f2b1a3e173f1f24948
+  GRPC_STATS_INC_POLLSET_KICK(exec_ctx);
   if (p != &pollset->pollable) {
     gpr_mu_lock(&p->po.mu);
   }