Merge branch 'jn/branch-lift-unnecessary-name-length-limit'

diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
index ef67b53f721f28e5442c00273dec5f1582f555be..ed432a80ca62eeb6a75e08870d9c8f8eaf4ab6d8 100644 (file)
--- a/Documentation/CodingGuidelines
+++ b/Documentation/CodingGuidelines
@@ -126,6 +126,17 @@ For C programs:
    "char * string".  This makes it easier to understand code
    like "char *string, c;".
 
+ - Use whitespace around operators and keywords, but not inside
+   parentheses and not around functions. So:
+
+        while (condition)
+               func(bar + 1);
+
+   and not:
+
+        while( condition )
+               func (bar+1);
+
  - We avoid using braces unnecessarily.  I.e.
 
        if (bla) {