aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2015-07-17 16:24:01 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-07-17 16:39:53 -0700
commitb4749e96a4a872c2496602566f205547c4e3c950 (patch)
tree5a1378f92719ad85dcc2ffe0e21d902414fbc7a6 /scripts
parentf2abeef9fd6f03ebf417539ed099828a56733098 (diff)
downloadlinux-stericsson-b4749e96a4a872c2496602566f205547c4e3c950.tar.gz
checkpatch: fix long line messages about patch context
Changes in ("checkpatch: categorize some long line length checks") now erroneously reports long line defects in patch context. Fix it. Signed-off-by: Joe Perches <joe@perches.com> Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/checkpatch.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 90e1edc8dd42..d5c8e9a3a73c 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2599,7 +2599,7 @@ sub process {
# if LONG_LINE is ignored, the other 2 types are also ignored
#
- if ($length > $max_line_length) {
+ if ($line =~ /^\+/ && $length > $max_line_length) {
my $msg_type = "LONG_LINE";
# Check the allowed long line types first