diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-08-05 17:55:52 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-08-05 18:00:32 -0400 |
| commit | b7edaca4e825fd5d7a6ddce3548cc1f7a7337cf8 (patch) | |
| tree | 221d6c5be36fa3b2133200ebc3e520d4382dca8f /scripts | |
| parent | c948c26048ecb1023d2e68222c736f7da41da498 (diff) | |
| parent | cbfe8fa6cd672011c755c3cd85c9ffd4e2d10a6f (diff) | |
Merge branch 'linus' into x86/apic
Pull in upstream changes to avoid conflicts
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/checkpatch.pl | 2 |
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 { | |||
| 2599 | # if LONG_LINE is ignored, the other 2 types are also ignored | 2599 | # if LONG_LINE is ignored, the other 2 types are also ignored |
| 2600 | # | 2600 | # |
| 2601 | 2601 | ||
| 2602 | if ($length > $max_line_length) { | 2602 | if ($line =~ /^\+/ && $length > $max_line_length) { |
| 2603 | my $msg_type = "LONG_LINE"; | 2603 | my $msg_type = "LONG_LINE"; |
| 2604 | 2604 | ||
| 2605 | # Check the allowed long line types first | 2605 | # Check the allowed long line types first |