diff --git a/[refs] b/[refs]
index 1be04b799ecf..d4216efc44c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76c4e5eafe93df0d03c9d1dc2e4e3efd344be34b
+refs/heads/master: 389834b680c13f4727c14f70fa71c2c5678b6081
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index 914e45a63731..39339529b99b 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -290,8 +290,8 @@ sub process {
 		}
 
 #make up the handle for any error we report on this line
-		$here = "PATCH: $ARGV:$linenr:";
-		$here .= "\nFILE: $realfile:$realline:" if ($realcnt != 0);
+		$here = "#$linenr: ";
+		$here .= "FILE: $realfile:$realline:" if ($realcnt != 0);
 
 		my $herecurr = "$here\n$line\n\n";
 		my $hereprev = "$here\n$prevline\n$line\n\n";