Merge github.com:grpc/grpc into flowctl+millis

2 files changed, 3 insertions, 2 deletions

diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc
index e29b39ac5a..59dd8fd2fe 100644
--- a/src/core/lib/iomgr/ev_epollex_linux.cc
+++ b/src/core/lib/iomgr/ev_epollex_linux.cc
@@ -58,7 +58,8 @@ typedef enum {
   PO_POLLSET,
   PO_FD,
   /* ordering is important: we always want to lock pollsets before fds:
-            this guarantees that using an fd as a pollable is safe */ PO_EMPTY_POLLABLE,
+     this guarantees that using an fd as a pollable is safe */
+  PO_EMPTY_POLLABLE,
   PO_COUNT
 } polling_obj_type;
 
diff --git a/src/core/lib/support/log_posix.cc b/src/core/lib/support/log_posix.cc
index 38a136e646..29530c858f 100644
--- a/src/core/lib/support/log_posix.cc
+++ b/src/core/lib/support/log_posix.cc
@@ -58,7 +58,7 @@ void gpr_log(const char *file, int line, gpr_log_severity severity,
 }
 
 extern "C" void gpr_default_log(gpr_log_func_args *args) {
-  char *final_slash;
+  const char *final_slash;
   const char *display_file;
   char time_buffer[64];
   time_t timer;