From f7d2e58ed95f68d66fe3095d3fcdd8659f1b9438 Mon Sep 17 00:00:00 2001 From: Ian Maund Date: Mon, 1 Jun 2015 12:41:10 -0700 Subject: Revert "checkpatch.pl: add check for Change-Id" This reverts commit 7ebd05ef1646e8cbef54e38343722741a4744626. Our process requires Change-Id lines in our commit text while upstream considers them to be "noise". Remove the blocking checkpatch error for having a gerrit Change-Id line in the commit text. Change-Id: I21c6f0e11ecd94facfc2b9a3bbfee4ed4d39609f Signed-off-by: Ian Maund --- scripts/checkpatch.pl | 6 ------ 1 file changed, 6 deletions(-) (limited to 'scripts') diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 2da7d6b16c56..85a49599b1a9 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2345,12 +2345,6 @@ sub process { "The 'stable' address should be 'stable\@vger.kernel.org'\n" . $herecurr); } -# 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 if the commit log is in a possible stack dump if ($in_commit_log && !$commit_log_possible_stack_dump && ($line =~ /^\s*(?:WARNING:|BUG:)/ || -- cgit v1.2.3