1 files changed, 6 insertions, 0 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index d9b09eb767bb..fbb1b7e88e87 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1924,6 +1924,12 @@ sub process {
                         }
                 }
 
+# Check for unwanted Gerrit info
+                if ($in_commit_log && $line =~ /^\s*change-id:/i) {
+                        ERROR("GERRIT_CHANGE_ID",
+                              "Remove Gerrit Change-Id's before submitting upstream.\n" . $herecurr);
+                }
+
 # Check for wrappage within a valid hunk of the file
                 if ($realcnt != 0 && $line !~ m{^(?:\+|-| |\\ No newline|$)}) {
                         ERROR("CORRUPTED_PATCH",