Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest

3 files changed, 21 insertions, 4 deletions

diff --git a/scripts/bloat-o-meter b/scripts/bloat-o-meter
index 6501a50e17f0..6129020c41a9 100755
--- a/scripts/bloat-o-meter
+++ b/scripts/bloat-o-meter
@@ -17,7 +17,9 @@ def getsizes(file):
     sym = {}
     for l in os.popen("nm --size-sort " + file).readlines():
         size, type, name = l[:-1].split()
-        if type in "tTdDbB":
+        if type in "tTdDbBrR":
+            # strip generated symbols
+            if name[:6] == "__mod_": continue
             # function names begin with '.' on 64-bit powerpc
             if "." in name[1:]: name = "static." + name.split(".")[0]
             sym[name] = sym.get(name, 0) + int(size, 16)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 58848e3e392c..8f9e394298cd 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2804,9 +2804,9 @@ sub process {
                         WARN("consider using a completion\n" . $herecurr);
 
                 }
-# recommend strict_strto* over simple_strto*
+# recommend kstrto* over simple_strto*
                 if ($line =~ /\bsimple_(strto.*?)\s*\(/) {
-                        WARN("consider using strict_$1 in preference to simple_$1\n" . $herecurr);
+                        WARN("consider using kstrto* in preference to simple_$1\n" . $herecurr);
                 }
 # check for __initcall(), use device_initcall() explicitly please
                 if ($line =~ /^.\s*__initcall\s*\(/) {
@@ -2902,6 +2902,11 @@ sub process {
                     $line =~ /DEVICE_ATTR.*S_IWUGO/ ) {
                         WARN("Exporting world writable files is usually an error. Consider more restrictive permissions.\n" . $herecurr);
                 }
+
+                # Check for memset with swapped arguments
+                if ($line =~ /memset.*\,(\ |)(0x|)0(\ |0|)\);/) {
+                        ERROR("memset size is 3rd argument, not the second.\n" . $herecurr);
+                }
         }
 
         # If we have no input at all, then there is nothing to report on
@@ -2944,6 +2949,7 @@ sub process {
                 if ($rpt_cleaners) {
                         print "NOTE: whitespace errors detected, you may wish to use scripts/cleanpatch or\n";
                         print "      scripts/cleanfile\n\n";
+                        $rpt_cleaners = 0;
                 }
         }
 
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index 139e0fff8e31..d29a8d75cb22 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -420,6 +420,14 @@ foreach my $file (@ARGV) {
 
         open(my $patch, "< $file")
             or die "$P: Can't open $file: $!\n";
+
+        # We can check arbitrary information before the patch
+        # like the commit message, mail headers, etc...
+        # This allows us to match arbitrary keywords against any part
+        # of a git format-patch generated file (subject tags, etc...)
+
+        my $patch_prefix = "";                  #Parsing the intro
+
         while (<$patch>) {
             my $patch_line = $_;
             if (m/^\+\+\+\s+(\S+)/) {
@@ -428,13 +436,14 @@ foreach my $file (@ARGV) {
                 $filename =~ s@\n@@;
                 $lastfile = $filename;
                 push(@files, $filename);
+                $patch_prefix = "^[+-].*";      #Now parsing the actual patch
             } elsif (m/^\@\@ -(\d+),(\d+)/) {
                 if ($email_git_blame) {
                     push(@range, "$lastfile:$1:$2");
                 }
             } elsif ($keywords) {
                 foreach my $line (keys %keyword_hash) {
-                    if ($patch_line =~ m/^[+-].*$keyword_hash{$line}/x) {
+                    if ($patch_line =~ m/${patch_prefix}$keyword_hash{$line}/x) {
                         push(@keyword_tvi, $line);
                     }
                 }