diff --git a/.checkpatch.conf b/.checkpatch.conf
index ac261a413b..f57474d79e 100644
--- a/.checkpatch.conf
+++ b/.checkpatch.conf
@@ -1,3 +1,6 @@
+# Override checkpatch's default max line length 100
+--max-line-length=96
+
 # Not Linux, so don't expect a Linux tree.
 --no-tree