6 files changed, 69 insertions, 16 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index b28cc384a5bc..b954de58304f 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -281,6 +281,7 @@ our $signature_tags = qr{(?xi:
         Tested-by:|
         Reviewed-by:|
         Reported-by:|
+        Suggested-by:|
         To:|
         Cc:
 )};
@@ -628,6 +629,13 @@ sub sanitise_line {
         return $res;
 }
 
+sub get_quoted_string {
+        my ($line, $rawline) = @_;
+
+        return "" if ($line !~ m/(\"[X]+\")/g);
+        return substr($rawline, $-[0], $+[0] - $-[0]);
+}
+
 sub ctx_statement_block {
         my ($linenr, $remain, $off) = @_;
         my $line = $linenr - 1;
@@ -1576,7 +1584,8 @@ sub process {
 # Check for incorrect file permissions
                 if ($line =~ /^new (file )?mode.*[7531]\d{0,2}$/) {
                         my $permhere = $here . "FILE: $realfile\n";
-                        if ($realfile =~ /(Makefile|Kconfig|\.c|\.h|\.S|\.tmpl)$/) {
+                        if ($realfile !~ m@scripts/@ &&
+                            $realfile !~ /\.(py|pl|awk|sh)$/) {
                                 ERROR("EXECUTE_PERMISSIONS",
                                       "do not set execute permissions for source files\n" . $permhere);
                         }
@@ -2514,8 +2523,8 @@ sub process {
 
 # check for whitespace before a non-naked semicolon
                 if ($line =~ /^\+.*\S\s+;/) {
-                        CHK("SPACING",
-                            "space prohibited before semicolon\n" . $herecurr);
+                        WARN("SPACING",
+                             "space prohibited before semicolon\n" . $herecurr);
                 }
 
 # Check operator spacing.
@@ -3016,6 +3025,7 @@ sub process {
                             $dstat !~ /^'X'$/ &&                                        # character constants
                             $dstat !~ /$exceptions/ &&
                             $dstat !~ /^\.$Ident\s*=/ &&                                # .foo =
+                            $dstat !~ /^(?:\#\s*$Ident|\#\s*$Constant)\s*$/ &&          # stringification #foo
                             $dstat !~ /^do\s*$Constant\s*while\s*$Constant;?$/ &&       # do {...} while (...); // do {...} while (...)
                             $dstat !~ /^for\s*$Constant$/ &&                            # for (...)
                             $dstat !~ /^for\s*$Constant\s+(?:$Ident|-?$Constant)$/ &&   # for (...) bar()
@@ -3220,7 +3230,7 @@ sub process {
                 }
 
 # check for unnecessary blank lines around braces
-                if (($line =~ /^..*}\s*$/ && $prevline =~ /^.\s*$/)) {
+                if (($line =~ /^.\s*}\s*$/ && $prevline =~ /^.\s*$/)) {
                         CHK("BRACES",
                             "Blank lines aren't necessary before a close brace '}'\n" . $hereprev);
                 }
@@ -3372,6 +3382,15 @@ sub process {
                              "struct spinlock should be spinlock_t\n" . $herecurr);
                 }
 
+# check for seq_printf uses that could be seq_puts
+                if ($line =~ /\bseq_printf\s*\(/) {
+                        my $fmt = get_quoted_string($line, $rawline);
+                        if ($fmt !~ /[^\\]\%/) {
+                                WARN("PREFER_SEQ_PUTS",
+                                     "Prefer seq_puts to seq_printf\n" . $herecurr);
+                        }
+                }
+
 # Check for misused memsets
                 if ($^V && $^V ge 5.10.0 &&
                     defined $stat &&
@@ -3476,6 +3495,13 @@ sub process {
                              "unnecessary cast may hide bugs, see http://c-faq.com/malloc/mallocnocast.html\n" . $herecurr);
                 }
 
+# check for krealloc arg reuse
+                if ($^V && $^V ge 5.10.0 &&
+                    $line =~ /\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*krealloc\s*\(\s*\1\s*,/) {
+                        WARN("KREALLOC_ARG_REUSE",
+                             "Reusing the krealloc arg is almost always a bug\n" . $herecurr);
+                }
+
 # check for alloc argument mismatch
                 if ($line =~ /\b(kcalloc|kmalloc_array)\s*\(\s*sizeof\b/) {
                         WARN("ALLOC_ARRAY_ARGS",
diff --git a/scripts/decodecode b/scripts/decodecode
index 4f8248d5a11f..d8824f37acce 100755
--- a/scripts/decodecode
+++ b/scripts/decodecode
@@ -89,10 +89,16 @@ echo $code >> $T.s
 disas $T
 cat $T.dis >> $T.aa
 
+# (lines of whole $T.oo) - (lines of $T.aa, i.e. "Code starting") + 3,
+# i.e. the title + the "===..=" line (sed is counting from 1, 0 address is
+# special)
+faultlinenum=$(( $(wc -l $T.oo  | cut -d" " -f1) - \
+                 $(wc -l $T.aa  | cut -d" " -f1) + 3))
+
 faultline=`cat $T.dis | head -1 | cut -d":" -f2-`
 faultline=`echo "$faultline" | sed -e 's/\[/\\\[/g; s/\]/\\\]/g'`
 
-cat $T.oo | sed -e "s/\($faultline\)/\*\1     <-- trapping instruction/g"
+cat $T.oo | sed -e "${faultlinenum}s/^\(.*:\)\(.*\)/\1\*\2\t\t<-- trapping instruction/"
 echo
 cat $T.aa
 cleanup
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index ce4cc837b748..5e4fb144a04f 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -611,7 +611,7 @@ sub get_maintainers {
                                     $hash{$tvi} = $value_pd;
                                 }
                             }
-                        } elsif ($type eq 'K') {
+                        } elsif ($type eq 'N') {
                             if ($file =~ m/$value/x) {
                                 $hash{$tvi} = 0;
                             }
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index 33689396953a..4606cdfb859d 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -156,7 +156,6 @@ sub read_kconfig {
 
     my $state = "NONE";
     my $config;
-    my @kconfigs;
 
     my $cont = 0;
     my $line;
@@ -190,7 +189,13 @@ sub read_kconfig {
 
         # collect any Kconfig sources
         if (/^source\s*"(.*)"/) {
-            $kconfigs[$#kconfigs+1] = $1;
+            my $kconfig = $1;
+            # prevent reading twice.
+            if (!defined($read_kconfigs{$kconfig})) {
+                $read_kconfigs{$kconfig} = 1;
+                read_kconfig($kconfig);
+            }
+            next;
         }
 
         # configs found
@@ -250,14 +255,6 @@ sub read_kconfig {
         }
     }
     close($kinfile);
-
-    # read in any configs that were found.
-    foreach my $kconfig (@kconfigs) {
-        if (!defined($read_kconfigs{$kconfig})) {
-            $read_kconfigs{$kconfig} = 1;
-            read_kconfig($kconfig);
-        }
-    }
 }
 
 if ($kconfig) {
@@ -396,6 +393,15 @@ foreach my $module (keys(%modules)) {
         foreach my $conf (@arr) {
             $configs{$conf} = $module;
             dprint "$conf added by direct ($module)\n";
+            if ($debugprint) {
+                my $c=$conf;
+                $c =~ s/^CONFIG_//;
+                if (defined($depends{$c})) {
+                    dprint " deps = $depends{$c}\n";
+                } else {
+                    dprint " no deps\n";
+                }
+            }
         }
     } else {
         # Most likely, someone has a custom (binary?) module loaded.
diff --git a/scripts/mod/devicetable-offsets.c b/scripts/mod/devicetable-offsets.c
index b45260bfeaa0..e66d4d258e1a 100644
--- a/scripts/mod/devicetable-offsets.c
+++ b/scripts/mod/devicetable-offsets.c
@@ -174,5 +174,8 @@ int main(void)
         DEVID_FIELD(x86_cpu_id, model);
         DEVID_FIELD(x86_cpu_id, vendor);
 
+        DEVID(mei_cl_device_id);
+        DEVID_FIELD(mei_cl_device_id, name);
+
         return 0;
 }
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 771ac17f635d..45f9a3377dcd 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -1133,6 +1133,18 @@ static int do_x86cpu_entry(const char *filename, void *symval,
 }
 ADD_TO_DEVTABLE("x86cpu", x86_cpu_id, do_x86cpu_entry);
 
+/* Looks like: mei:S */
+static int do_mei_entry(const char *filename, void *symval,
+                        char *alias)
+{
+        DEF_FIELD_ADDR(symval, mei_cl_device_id, name);
+
+        sprintf(alias, MEI_CL_MODULE_PREFIX "%s", *name);
+
+        return 1;
+}
+ADD_TO_DEVTABLE("mei", mei_cl_device_id, do_mei_entry);
+
 /* Does namelen bytes of name exactly match the symbol? */
 static bool sym_is(const char *name, unsigned namelen, const char *symbol)
 {