diff --git a/.clang-tidy b/.clang-tidy
index 37e8152264c6..ce6d28b014c5 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -19,5 +19,7 @@ Checks: >
     readability-redundant-smartptr-get,
     readability-static-accessed-through-instance
 CheckOptions:
+  - key:             llvm-namespace-comment.ShortNamespaceLines
+    value:           40
   - key:             llvm-namespace-comment.SpacesBeforeComments
     value:           2
diff --git a/gm/pathfill.cpp b/gm/pathfill.cpp
index 28bef368b708..246332a05418 100644
--- a/gm/pathfill.cpp
+++ b/gm/pathfill.cpp
@@ -21,7 +21,7 @@ struct PathDY {
     SkPath   path;
     SkScalar dy;
 };
-} // namespace
+}
 
 typedef PathDY (*MakePathProc)();