Fix merge errors

src/core/ext/client_config/subchannel.c

@@ -644,8 +644,8 @@ static void subchannel_connected(grpc_exec_ctx *exec_ctx, void *arg,
         0) {
       gpr_log(GPR_INFO, "Retry immediately");
     } else {
-      gpr_log(GPR_INFO, "Retry in %d.%09d seconds", time_til_next.tv_sec,
+      gpr_log(GPR_INFO, "Retry in %" PRId64 ".%09d seconds",
-              time_til_next.tv_nsec);
+              time_til_next.tv_sec, time_til_next.tv_nsec);
     }
     grpc_timer_init(exec_ctx, &c->alarm, c->next_attempt, on_alarm, c, now);
     grpc_error_free_string(errmsg);

src/core/lib/security/transport/handshake.c

@@ -71,7 +71,7 @@ static void dump_state(const char *state, grpc_security_handshake *h,
   gpr_timespec ttl =
       gpr_time_sub(h->timer.deadline, gpr_now(h->timer.deadline.clock_type));
   const char *msg = grpc_error_string(error);
-  gpr_log(GPR_DEBUG, "%p: %s ttl=%d.%09d err=%s", h, state, ttl.tv_sec,
+  gpr_log(GPR_DEBUG, "%p: %s ttl=%" PRId64 ".%09d err=%s", h, state, ttl.tv_sec,
           ttl.tv_nsec, msg);
   grpc_error_free_string(msg);
   GRPC_ERROR_UNREF(error);