diff --git a/.checkpatch.conf b/.checkpatch.conf
index f7b9b32519..f194cedc3d 100644
--- a/.checkpatch.conf
+++ b/.checkpatch.conf
@@ -1,9 +1,6 @@
 # Not Linux, so don't expect a Linux tree.
 --no-tree
 
-# Require every Kconfig symbol to have at least two lines in their description.
---min-conf-desc-length=2
-
 # Ignore aspects we don't follow here.
 --ignore C99_COMMENTS
 --ignore GLOBAL_INITIALISERS
@@ -15,3 +12,15 @@
 --ignore PREFER_PRINTF
 --ignore SPLIT_STRING
 --ignore BLOCK_COMMENT_STYLE
+--ignore AVOID_EXTERNS
+--ignore VOLATILE
+--ignore CONFIG_DESCRIPTION
+
+# FILE_PATH_CHANGES seems to not be working correctly. It will
+# choke on added / deleted files even if the MAINTAINERS file
+# is touched.
+--ignore FILE_PATH_CHANGES
+
+# This one has a linux path hard coded, so it would choke on
+# some commits unnecessarily.
+--ignore EXECUTE_PERMISSIONS