The following commit has been merged in the linux branch: commit cc77cdca5209c1199deb33f3a83df191ac32f4d6 Author: Andy Whitcroft apw@canonical.com Date: Mon Oct 26 16:50:13 2009 -0700

checkpatch: correctly stop scanning at the bottom of a hunk

We are allowing context scanning checks to apply against the first line of context outside at the end of the hunk. This can lead to false matches to patch names leading to various perl warnings. Correctly stop at the bottom of the hunk.

Signed-off-by: Andy Whitcroft apw@canonical.com Signed-off-by: Andrew Morton akpm@linux-foundation.org Signed-off-by: Linus Torvalds torvalds@linux-foundation.org

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index b43e309..1eca1e1 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1234,7 +1234,6 @@ sub process { $linenr++;

my $rawline = $rawlines[$linenr - 1]; - my $hunk_line = ($realcnt != 0);

#extract the line range in the file after the patch is applied if ($line=~/^@@ -\d+(?:,\d+)? +(\d+)(,(\d+))? @@/) { @@ -1274,6 +1273,8 @@ sub process { $realcnt--; }

+ my $hunk_line = ($realcnt != 0); + #make up the handle for any error we report on this line $prefix = "$filename:$realline: " if ($emacs && $file); $prefix = "$filename:$linenr: " if ($emacs && !$file);