diff options
| author | Chris Zankel <chris@zankel.net> | 2015-08-29 23:55:58 +0000 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2015-08-29 23:55:58 +0000 |
| commit | 650c919798c71fb34b77a6f2ba03a06907f06a76 (patch) | |
| tree | d1c60012d4d86846d25f1d0b783b5122c26a2e31 /scripts | |
| parent | 895fb3159280fe7695b35ec7c87ec19e13ca5b6e (diff) | |
| parent | 64291f7db5bd8150a74ad2036f1037e6a0428df2 (diff) | |
Merge tag 'v4.2' into for_next
Linux 4.2
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/checkpatch.pl | 2 | ||||
| -rwxr-xr-x | scripts/kconfig/streamline_config.pl | 2 |
2 files changed, 2 insertions, 2 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 diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl index 9cb8522d8d22..f3d3fb42b873 100755 --- a/scripts/kconfig/streamline_config.pl +++ b/scripts/kconfig/streamline_config.pl @@ -137,7 +137,7 @@ my $ksource = ($ARGV[0] ? $ARGV[0] : '.'); my $kconfig = $ARGV[1]; my $lsmod_file = $ENV{'LSMOD'}; -my @makefiles = `find $ksource -name Makefile 2>/dev/null`; +my @makefiles = `find $ksource -name Makefile -or -name Kbuild 2>/dev/null`; chomp @makefiles; my %depends; |