12 files changed, 441 insertions, 247 deletions

diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index f4053dc7b5d6..8f14c81abbc7 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -13,7 +13,6 @@
 # 2) modpost is then used to
 # 3)  create one <module>.mod.c file pr. module
 # 4)  create one Module.symvers file with CRC for all exported symbols
-# 4a) [CONFIG_MARKERS] create one Module.markers file listing defined markers
 # 5) compile all <module>.mod.c files
 # 6) final link of the module to a <module.ko> file
 
@@ -59,10 +58,6 @@ include scripts/Makefile.lib
 
 kernelsymfile := $(objtree)/Module.symvers
 modulesymfile := $(firstword $(KBUILD_EXTMOD))/Module.symvers
-kernelmarkersfile := $(objtree)/Module.markers
-modulemarkersfile := $(firstword $(KBUILD_EXTMOD))/Module.markers
-
-markersfile = $(if $(KBUILD_EXTMOD),$(modulemarkersfile),$(kernelmarkersfile))
 
 # Step 1), find all modules listed in $(MODVERDIR)/
 __modules := $(sort $(shell grep -h '\.ko' /dev/null $(wildcard $(MODVERDIR)/*.mod)))
@@ -85,8 +80,6 @@ modpost = scripts/mod/modpost                    \
  $(if $(KBUILD_EXTRA_SYMBOLS), $(patsubst %, -e %,$(KBUILD_EXTRA_SYMBOLS))) \
  $(if $(KBUILD_EXTMOD),-o $(modulesymfile))      \
  $(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S)      \
- $(if $(CONFIG_MARKERS),-K $(kernelmarkersfile)) \
- $(if $(CONFIG_MARKERS),-M $(markersfile))       \
  $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w) \
  $(if $(cross_build),-c)
 
@@ -101,17 +94,12 @@ quiet_cmd_kernel-mod = MODPOST $@
       cmd_kernel-mod = $(modpost) $@
 
 vmlinux.o: FORCE
-        @rm -fr $(kernelmarkersfile)
         $(call cmd,kernel-mod)
 
 # Declare generated files as targets for modpost
 $(symverfile):         __modpost ;
 $(modules:.ko=.mod.c): __modpost ;
 
-ifdef CONFIG_MARKERS
-$(markersfile):        __modpost ;
-endif
-
 
 # Step 5), compile all *.mod.c files
 
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index d7c1b04791f7..6bf21f83837d 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -16,8 +16,7 @@
  * tells make when to remake a file.
  *
  * To use this list as-is however has the drawback that virtually
- * every file in the kernel includes <linux/config.h> which then again
- * includes <linux/autoconf.h>
+ * every file in the kernel includes <linux/autoconf.h>.
  *
  * If the user re-runs make *config, linux/autoconf.h will be
  * regenerated.  make notices that and will rebuild every file which
@@ -126,7 +125,6 @@ char *depfile;
 char *cmdline;
 
 static void usage(void)
-
 {
         fprintf(stderr, "Usage: fixdep <depfile> <target> <cmdline>\n");
         exit(1);
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 2d5ece798c4c..87bbb8bce9bf 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -10,7 +10,7 @@ use strict;
 my $P = $0;
 $P =~ s@.*/@@g;
 
-my $V = '0.28';
+my $V = '0.29';
 
 use Getopt::Long qw(:config no_auto_abbrev);
 
@@ -28,6 +28,41 @@ my $mailback = 0;
 my $summary_file = 0;
 my $root;
 my %debug;
+my $help = 0;
+
+sub help {
+        my ($exitcode) = @_;
+
+        print << "EOM";
+Usage: $P [OPTION]... [FILE]...
+Version: $V
+
+Options:
+  -q, --quiet                quiet
+  --no-tree                  run without a kernel tree
+  --no-signoff               do not check for 'Signed-off-by' line
+  --patch                    treat FILE as patchfile (default)
+  --emacs                    emacs compile window format
+  --terse                    one line per report
+  -f, --file                 treat FILE as regular source file
+  --subjective, --strict     enable more subjective tests
+  --root=PATH                PATH to the kernel tree root
+  --no-summary               suppress the per-file summary
+  --mailback                 only produce a report in case of warnings/errors
+  --summary-file             include the filename in summary
+  --debug KEY=[0|1]          turn on/off debugging of KEY, where KEY is one of
+                             'values', 'possible', 'type', and 'attr' (default
+                             is all off)
+  --test-only=WORD           report only warnings/errors containing WORD
+                             literally
+  -h, --help, --version      display this help and exit
+
+When FILE is - read standard input.
+EOM
+
+        exit($exitcode);
+}
+
 GetOptions(
         'q|quiet+'      => \$quiet,
         'tree!'         => \$tree,
@@ -35,7 +70,7 @@ GetOptions(
         'patch!'        => \$chk_patch,
         'emacs!'        => \$emacs,
         'terse!'        => \$terse,
-        'file!'         => \$file,
+        'f|file!'       => \$file,
         'subjective!'   => \$check,
         'strict!'       => \$check,
         'root=s'        => \$root,
@@ -45,22 +80,16 @@ GetOptions(
 
         'debug=s'       => \%debug,
         'test-only=s'   => \$tst_only,
-) or exit;
+        'h|help'        => \$help,
+        'version'       => \$help
+) or help(1);
+
+help(0) if ($help);
 
 my $exit = 0;
 
 if ($#ARGV < 0) {
-        print "usage: $P [options] patchfile\n";
-        print "version: $V\n";
-        print "options: -q               => quiet\n";
-        print "         --no-tree        => run without a kernel tree\n";
-        print "         --terse          => one line per report\n";
-        print "         --emacs          => emacs compile window format\n";
-        print "         --file           => check a source file\n";
-        print "         --strict         => enable more subjective tests\n";
-        print "         --root           => path to the kernel tree root\n";
-        print "         --no-summary     => suppress the per-file summary\n";
-        print "         --summary-file   => include the filename in summary\n";
+        print "$P: no input files\n";
         exit(1);
 }
 
@@ -153,7 +182,7 @@ our $UTF8	= qr {
 }x;
 
 our $typeTypedefs = qr{(?x:
-        (?:__)?(?:u|s|be|le)(?:\d|\d\d)|
+        (?:__)?(?:u|s|be|le)(?:8|16|32|64)|
         atomic_t
 )};
 
@@ -356,6 +385,13 @@ sub sanitise_line {
                         $off++;
                         next;
                 }
+                if ($sanitise_quote eq '' && substr($line, $off, 2) eq '//') {
+                        $sanitise_quote = '//';
+
+                        substr($res, $off, 2, $sanitise_quote);
+                        $off++;
+                        next;
+                }
 
                 # A \ in a string means ignore the next character.
                 if (($sanitise_quote eq "'" || $sanitise_quote eq '"') &&
@@ -379,6 +415,8 @@ sub sanitise_line {
                 #print "c<$c> SQ<$sanitise_quote>\n";
                 if ($off != 0 && $sanitise_quote eq '*/' && $c ne "\t") {
                         substr($res, $off, 1, $;);
+                } elsif ($off != 0 && $sanitise_quote eq '//' && $c ne "\t") {
+                        substr($res, $off, 1, $;);
                 } elsif ($off != 0 && $sanitise_quote && $c ne "\t") {
                         substr($res, $off, 1, 'X');
                 } else {
@@ -386,6 +424,10 @@ sub sanitise_line {
                 }
         }
 
+        if ($sanitise_quote eq '//') {
+                $sanitise_quote = '';
+        }
+
         # The pathname on a #include may be surrounded by '<' and '>'.
         if ($res =~ /^.\s*\#\s*include\s+\<(.*)\>/) {
                 my $clean = 'X' x length($1);
@@ -1336,6 +1378,18 @@ sub process {
                         WARN("adding a line without newline at end of file\n" . $herecurr);
                 }
 
+# Blackfin: use hi/lo macros
+                if ($realfile =~ m@arch/blackfin/.*\.S$@) {
+                        if ($line =~ /\.[lL][[:space:]]*=.*&[[:space:]]*0x[fF][fF][fF][fF]/) {
+                                my $herevet = "$here\n" . cat_vet($line) . "\n";
+                                ERROR("use the LO() macro, not (... & 0xFFFF)\n" . $herevet);
+                        }
+                        if ($line =~ /\.[hH][[:space:]]*=.*>>[[:space:]]*16/) {
+                                my $herevet = "$here\n" . cat_vet($line) . "\n";
+                                ERROR("use the HI() macro, not (... >> 16)\n" . $herevet);
+                        }
+                }
+
 # check we are in a valid source file C or perl if not then ignore this hunk
                 next if ($realfile !~ /\.(h|c|pl)$/);
 
@@ -1355,6 +1409,16 @@ sub process {
                         WARN("CVS style keyword markers, these will _not_ be updated\n". $herecurr);
                 }
 
+# Blackfin: don't use __builtin_bfin_[cs]sync
+                if ($line =~ /__builtin_bfin_csync/) {
+                        my $herevet = "$here\n" . cat_vet($line) . "\n";
+                        ERROR("use the CSYNC() macro in asm/blackfin.h\n" . $herevet);
+                }
+                if ($line =~ /__builtin_bfin_ssync/) {
+                        my $herevet = "$here\n" . cat_vet($line) . "\n";
+                        ERROR("use the SSYNC() macro in asm/blackfin.h\n" . $herevet);
+                }
+
 # Check for potential 'bare' types
                 my ($stat, $cond, $line_nr_next, $remain_next, $off_next);
                 if ($realcnt && $line =~ /.\s*\S/) {
@@ -1372,6 +1436,8 @@ sub process {
                         # Ignore functions being called
                         } elsif ($s =~ /^.\s*$Ident\s*\(/s) {
 
+                        } elsif ($s =~ /^.\s*else\b/s) {
+
                         # declarations always start with types
                         } elsif ($prev_values eq 'E' && $s =~ /^.\s*(?:$Storage\s+)?(?:$Inline\s+)?(?:const\s+)?((?:\s*$Ident)+?)\b(?:\s+$Sparse)?\s*\**\s*(?:$Ident|\(\*[^\)]*\))(?:\s*$Modifier)?\s*(?:;|=|,|\()/s) {
                                 my $type = $1;
@@ -1532,8 +1598,9 @@ sub process {
                                     $s =~ /^\s*#\s*?/ ||
                                     $s =~ /^\s*$Ident\s*:/) {
                                         $continuation = ($s =~ /^.*?\\\n/) ? 1 : 0;
-                                        $s =~ s/^.*?\n//;
-                                        $cond_lines++;
+                                        if ($s =~ s/^.*?\n//) {
+                                                $cond_lines++;
+                                        }
                                 }
                         }
 
@@ -1891,7 +1958,7 @@ sub process {
                                                 # A unary '*' may be const
 
                                         } elsif ($ctx =~ /.xW/) {
-                                                ERROR("Aspace prohibited after that '$op' $at\n" . $hereptr);
+                                                ERROR("space prohibited after that '$op' $at\n" . $hereptr);
                                         }
 
                                 # unary ++ and unary -- are allowed no space on one side.
@@ -2243,7 +2310,8 @@ sub process {
                                 DECLARE_PER_CPU|
                                 DEFINE_PER_CPU|
                                 __typeof__\(|
-                                \.$Ident\s*=\s*
+                                \.$Ident\s*=\s*|
+                                ^\"|\"$
                         }x;
                         #print "REST<$rest> dstat<$dstat>\n";
                         if ($rest ne '') {
diff --git a/scripts/conmakehash.c b/scripts/conmakehash.c
index e0c6891a9ad4..263a44d57fa9 100644
--- a/scripts/conmakehash.c
+++ b/scripts/conmakehash.c
@@ -24,14 +24,14 @@
 
 typedef unsigned short unicode;
 
-void usage(char *argv0)
+static void usage(char *argv0)
 {
   fprintf(stderr, "Usage: \n"
          "        %s chartable [hashsize] [hashstep] [maxhashlevel]\n", argv0);
   exit(EX_USAGE);
 }
 
-int getunicode(char **p0)
+static int getunicode(char **p0)
 {
   char *p = *p0;
 
@@ -49,7 +49,7 @@ unicode unitable[MAX_FONTLEN][255];
                                 /* Massive overkill, but who cares? */
 int unicount[MAX_FONTLEN];
 
-void addpair(int fp, int un)
+static void addpair(int fp, int un)
 {
   int i;
 
diff --git a/scripts/genksyms/genksyms.c b/scripts/genksyms/genksyms.c
index 3a8297b5184c..af6b8363a2d5 100644
--- a/scripts/genksyms/genksyms.c
+++ b/scripts/genksyms/genksyms.c
@@ -176,7 +176,7 @@ static int is_unknown_symbol(struct symbol *sym)
                         strcmp(defn->string, "{") == 0);
 }
 
-struct symbol *__add_symbol(const char *name, enum symbol_type type,
+static struct symbol *__add_symbol(const char *name, enum symbol_type type,
                             struct string_list *defn, int is_extern,
                             int is_reference)
 {
@@ -265,7 +265,7 @@ struct symbol *add_symbol(const char *name, enum symbol_type type,
         return __add_symbol(name, type, defn, is_extern, 0);
 }
 
-struct symbol *add_reference_symbol(const char *name, enum symbol_type type,
+static struct symbol *add_reference_symbol(const char *name, enum symbol_type type,
                                     struct string_list *defn, int is_extern)
 {
         return __add_symbol(name, type, defn, is_extern, 1);
@@ -313,7 +313,7 @@ static int equal_list(struct string_list *a, struct string_list *b)
 
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
 
-struct string_list *read_node(FILE *f)
+static struct string_list *read_node(FILE *f)
 {
         char buffer[256];
         struct string_list node = {
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index 278a45bd45a5..cdb44b63342e 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -13,7 +13,7 @@
 use strict;
 
 my $P = $0;
-my $V = '0.17';
+my $V = '0.20';
 
 use Getopt::Long qw(:config no_auto_abbrev);
 
@@ -29,6 +29,8 @@ my $email_git_min_signatures = 1;
 my $email_git_max_maintainers = 5;
 my $email_git_min_percent = 5;
 my $email_git_since = "1-year-ago";
+my $email_git_blame = 0;
+my $email_remove_duplicates = 1;
 my $output_multiline = 1;
 my $output_separator = ", ";
 my $scm = 0;
@@ -36,6 +38,7 @@ my $web = 0;
 my $subsystem = 0;
 my $status = 0;
 my $from_filename = 0;
+my $pattern_depth = 0;
 my $version = 0;
 my $help = 0;
 
@@ -68,6 +71,8 @@ if (!GetOptions(
                 'git-max-maintainers=i' => \$email_git_max_maintainers,
                 'git-min-percent=i' => \$email_git_min_percent,
                 'git-since=s' => \$email_git_since,
+                'git-blame!' => \$email_git_blame,
+                'remove-duplicates!' => \$email_remove_duplicates,
                 'm!' => \$email_maintainer,
                 'n!' => \$email_usename,
                 'l!' => \$email_list,
@@ -78,6 +83,7 @@ if (!GetOptions(
                 'status!' => \$status,
                 'scm!' => \$scm,
                 'web!' => \$web,
+                'pattern-depth=i' => \$pattern_depth,
                 'f|file' => \$from_filename,
                 'v|version' => \$version,
                 'h|help' => \$help,
@@ -101,14 +107,19 @@ if ($#ARGV < 0) {
     die "$P: argument missing: patchfile or -f file please\n";
 }
 
+if ($output_separator ne ", ") {
+    $output_multiline = 0;
+}
+
 my $selections = $email + $scm + $status + $subsystem + $web;
 if ($selections == 0) {
     usage();
     die "$P:  Missing required option: email, scm, status, subsystem or web\n";
 }
 
-if ($email && ($email_maintainer + $email_list + $email_subscriber_list
-               + $email_git + $email_git_penguin_chiefs) == 0) {
+if ($email &&
+    ($email_maintainer + $email_list + $email_subscriber_list +
+     $email_git + $email_git_penguin_chiefs + $email_git_blame) == 0) {
     usage();
     die "$P: Please select at least 1 email option\n";
 }
@@ -147,9 +158,36 @@ while (<MAINT>) {
 }
 close(MAINT);
 
+my %mailmap;
+
+if ($email_remove_duplicates) {
+    open(MAILMAP, "<${lk_path}.mailmap") || warn "$P: Can't open .mailmap\n";
+    while (<MAILMAP>) {
+        my $line = $_;
+
+        next if ($line =~ m/^\s*#/);
+        next if ($line =~ m/^\s*$/);
+
+        my ($name, $address) = parse_email($line);
+        $line = format_email($name, $address);
+
+        next if ($line =~ m/^\s*$/);
+
+        if (exists($mailmap{$name})) {
+            my $obj = $mailmap{$name};
+            push(@$obj, $address);
+        } else {
+            my @arr = ($address);
+            $mailmap{$name} = \@arr;
+        }
+    }
+    close(MAILMAP);
+}
+
 ## use the filenames on the command line or find the filenames in the patchfiles
 
 my @files = ();
+my @range = ();
 
 foreach my $file (@ARGV) {
     ##if $file is a directory and it lacks a trailing slash, add one
@@ -162,13 +200,19 @@ foreach my $file (@ARGV) {
         push(@files, $file);
     } else {
         my $file_cnt = @files;
+        my $lastfile;
         open(PATCH, "<$file") or die "$P: Can't open ${file}\n";
         while (<PATCH>) {
             if (m/^\+\+\+\s+(\S+)/) {
                 my $filename = $1;
                 $filename =~ s@^[^/]*/@@;
                 $filename =~ s@\n@@;
+                $lastfile = $filename;
                 push(@files, $filename);
+            } elsif (m/^\@\@ -(\d+),(\d+)/) {
+                if ($email_git_blame) {
+                    push(@range, "$lastfile:$1:$2");
+                }
             }
         }
         close(PATCH);
@@ -201,6 +245,7 @@ foreach my $file (@files) {
             if ($type eq 'X') {
                 if (file_match_pattern($file, $value)) {
                     $exclude = 1;
+                    last;
                 }
             }
         }
@@ -208,35 +253,45 @@ foreach my $file (@files) {
 
     if (!$exclude) {
         my $tvi = 0;
+        my %hash;
         foreach my $line (@typevalue) {
             if ($line =~ m/^(\C):\s*(.*)/) {
                 my $type = $1;
                 my $value = $2;
                 if ($type eq 'F') {
                     if (file_match_pattern($file, $value)) {
-                        add_categories($tvi);
+                        my $value_pd = ($value =~ tr@/@@);
+                        my $file_pd = ($file  =~ tr@/@@);
+                        $value_pd++ if (substr($value,-1,1) ne "/");
+                        if ($pattern_depth == 0 ||
+                            (($file_pd - $value_pd) < $pattern_depth)) {
+                            $hash{$tvi} = $value_pd;
+                        }
                     }
                 }
             }
             $tvi++;
         }
+        foreach my $line (sort {$hash{$b} <=> $hash{$a}} keys %hash) {
+            add_categories($line);
+        }
     }
 
     if ($email && $email_git) {
         recent_git_signoffs($file);
     }
 
+    if ($email && $email_git_blame) {
+        git_assign_blame($file);
+    }
 }
 
 if ($email) {
     foreach my $chief (@penguin_chief) {
         if ($chief =~ m/^(.*):(.*)/) {
             my $email_address;
-            if ($email_usename) {
-                $email_address = format_email($1, $2);
-            } else {
-                $email_address = $2;
-            }
+
+            $email_address = format_email($1, $2);
             if ($email_git_penguin_chiefs) {
                 push(@email_to, $email_address);
             } else {
@@ -258,22 +313,22 @@ if ($email || $email_list) {
 }
 
 if ($scm) {
-    @scm = sort_and_uniq(@scm);
+    @scm = uniq(@scm);
     output(@scm);
 }
 
 if ($status) {
-    @status = sort_and_uniq(@status);
+    @status = uniq(@status);
     output(@status);
 }
 
 if ($subsystem) {
-    @subsystem = sort_and_uniq(@subsystem);
+    @subsystem = uniq(@subsystem);
     output(@subsystem);
 }
 
 if ($web) {
-    @web = sort_and_uniq(@web);
+    @web = uniq(@web);
     output(@web);
 }
 
@@ -311,10 +366,12 @@ MAINTAINER field selection options:
     --git-max-maintainers => maximum maintainers to add (default: 5)
     --git-min-percent => minimum percentage of commits required (default: 5)
     --git-since => git history to use (default: 1-year-ago)
+    --git-blame => use git blame to find modified commits for patch or file
     --m => include maintainer(s) if any
     --n => include name 'Full Name <addr\@domain.tld>'
     --l => include list(s) if any
     --s => include subscriber only list(s) if any
+    --remove-duplicates => minimize duplicate email names/addresses
   --scm => print SCM tree(s) if any
   --status => print status if any
   --subsystem => print subsystem name if any
@@ -322,24 +379,28 @@ MAINTAINER field selection options:
 
 Output type options:
   --separator [, ] => separator for multiple entries on 1 line
+    using --separator also sets --nomultiline if --separator is not [, ]
   --multiline => print 1 entry per line
 
-Default options:
-  [--email --git --m --n --l --multiline]
-
 Other options:
+  --pattern-depth => Number of pattern directory traversals (default: 0 (all))
   --version => show version
   --help => show this help information
 
+Default options:
+  [--email --git --m --n --l --multiline --pattern-depth=0 --remove-duplicates]
+
 Notes:
   Using "-f directory" may give unexpected results:
-
-  Used with "--git", git signators for _all_ files in and below
-     directory are examined as git recurses directories.
-     Any specified X: (exclude) pattern matches are _not_ ignored.
-  Used with "--nogit", directory is used as a pattern match,
-     no individual file within the directory or subdirectory
-     is matched.
+      Used with "--git", git signators for _all_ files in and below
+          directory are examined as git recurses directories.
+          Any specified X: (exclude) pattern matches are _not_ ignored.
+      Used with "--nogit", directory is used as a pattern match,
+         no individual file within the directory or subdirectory
+         is matched.
+      Used with "--git-blame", does not iterate all files in directory
+  Using "--git-blame" is slow and may add old committers and authors
+      that are no longer active maintainers to the output.
 EOT
 }
 
@@ -370,30 +431,100 @@ sub top_of_kernel_tree {
         return 0;
 }
 
-sub format_email {
-    my ($name, $email) = @_;
+sub parse_email {
+    my ($formatted_email) = @_;
+
+    my $name = "";
+    my $address = "";
+
+    if ($formatted_email =~ /^([^<]+)<(.+\@.*)>.*$/) {
+        $name = $1;
+        $address = $2;
+    } elsif ($formatted_email =~ /^\s*<(.+\@\S*)>.*$/) {
+        $address = $1;
+    } elsif ($formatted_email =~ /^(.+\@\S*).*$/) {
+        $address = $1;
+    }
 
     $name =~ s/^\s+|\s+$//g;
     $name =~ s/^\"|\"$//g;
-    $email =~ s/^\s+|\s+$//g;
+    $address =~ s/^\s+|\s+$//g;
+
+    if ($name =~ /[^a-z0-9 \.\-]/i) {    ##has "must quote" chars
+        $name =~ s/(?<!\\)"/\\"/g;       ##escape quotes
+        $name = "\"$name\"";
+    }
+
+    return ($name, $address);
+}
+
+sub format_email {
+    my ($name, $address) = @_;
 
-    my $formatted_email = "";
+    my $formatted_email;
+
+    $name =~ s/^\s+|\s+$//g;
+    $name =~ s/^\"|\"$//g;
+    $address =~ s/^\s+|\s+$//g;
 
     if ($name =~ /[^a-z0-9 \.\-]/i) {    ##has "must quote" chars
         $name =~ s/(?<!\\)"/\\"/g;       ##escape quotes
-        $formatted_email = "\"${name}\"\ \<${email}\>";
+        $name = "\"$name\"";
+    }
+
+    if ($email_usename) {
+        if ("$name" eq "") {
+            $formatted_email = "$address";
+        } else {
+            $formatted_email = "$name <${address}>";
+        }
     } else {
-        $formatted_email = "${name} \<${email}\>";
+        $formatted_email = $address;
     }
+
     return $formatted_email;
 }
 
-sub add_categories {
+sub find_starting_index {
+
     my ($index) = @_;
 
-    $index = $index - 1;
-    while ($index >= 0) {
+    while ($index > 0) {
         my $tv = $typevalue[$index];
+        if (!($tv =~ m/^(\C):\s*(.*)/)) {
+            last;
+        }
+        $index--;
+    }
+
+    return $index;
+}
+
+sub find_ending_index {
+    my ($index) = @_;
+
+    while ($index < @typevalue) {
+        my $tv = $typevalue[$index];
+        if (!($tv =~ m/^(\C):\s*(.*)/)) {
+            last;
+        }
+        $index++;
+    }
+
+    return $index;
+}
+
+sub add_categories {
+    my ($index) = @_;
+
+    my $i;
+    my $start = find_starting_index($index);
+    my $end = find_ending_index($index);
+
+    push(@subsystem, $typevalue[$start]);
+
+    for ($i = $start + 1; $i < $end; $i++) {
+        my $tv = $typevalue[$i];
         if ($tv =~ m/^(\C):\s*(.*)/) {
             my $ptype = $1;
             my $pvalue = $2;
@@ -414,19 +545,19 @@ sub add_categories {
                     }
                 }
             } elsif ($ptype eq "M") {
-                my $p_used = 0;
-                if ($index >= 0) {
-                    my $tv = $typevalue[$index - 1];
-                    if ($tv =~ m/^(\C):\s*(.*)/) {
-                        if ($1 eq "P") {
-                            if ($email_usename) {
-                                push_email_address(format_email($2, $pvalue));
-                                $p_used = 1;
+                my ($name, $address) = parse_email($pvalue);
+                if ($name eq "") {
+                    if ($i > 0) {
+                        my $tv = $typevalue[$i - 1];
+                        if ($tv =~ m/^(\C):\s*(.*)/) {
+                            if ($1 eq "P") {
+                                $name = $2;
+                                $pvalue = format_email($name, $address);
                             }
                         }
                     }
                 }
-                if (!$p_used) {
+                if ($email_maintainer) {
                     push_email_addresses($pvalue);
                 }
             } elsif ($ptype eq "T") {
@@ -436,31 +567,41 @@ sub add_categories {
             } elsif ($ptype eq "S") {
                 push(@status, $pvalue);
             }
-
-            $index--;
-        } else {
-            push(@subsystem,$tv);
-            $index = -1;
         }
     }
 }
 
+my %email_hash_name;
+my %email_hash_address;
+
+sub email_inuse {
+    my ($name, $address) = @_;
+
+    return 1 if (($name eq "") && ($address eq ""));
+    return 1 if (($name ne "") && exists($email_hash_name{$name}));
+    return 1 if (($address ne "") && exists($email_hash_address{$address}));
+
+    return 0;
+}
+
 sub push_email_address {
-    my ($email_address) = @_;
+    my ($line) = @_;
+
+    my ($name, $address) = parse_email($line);
 
-    my $email_name = "";
-    if ($email_address =~ m/([^<]+)<(.*\@.*)>$/) {
-        $email_name = $1;
-        $email_address = $2;
+    if ($address eq "") {
+        return 0;
     }
 
-    if ($email_maintainer) {
-        if ($email_usename && $email_name) {
-            push(@email_to, format_email($email_name, $email_address));
-        } else {
-            push(@email_to, $email_address);
-        }
+    if (!$email_remove_duplicates) {
+        push(@email_to, format_email($name, $address));
+    } elsif (!email_inuse($name, $address)) {
+        push(@email_to, format_email($name, $address));
+        $email_hash_name{$name}++;
+        $email_hash_address{$address}++;
     }
+
+    return 1;
 }
 
 sub push_email_addresses {
@@ -476,7 +617,9 @@ sub push_email_addresses {
             push_email_address($entry);
         }
     } else {
-        warn("Invalid MAINTAINERS address: '" . $address . "'\n");
+        if (!push_email_address($address)) {
+            warn("Invalid MAINTAINERS address: '" . $address . "'\n");
+        }
     }
 }
 
@@ -492,6 +635,32 @@ sub which {
     return "";
 }
 
+sub mailmap {
+    my @lines = @_;
+    my %hash;
+
+    foreach my $line (@lines) {
+        my ($name, $address) = parse_email($line);
+        if (!exists($hash{$name})) {
+            $hash{$name} = $address;
+        } elsif ($address ne $hash{$name}) {
+            $address = $hash{$name};
+            $line = format_email($name, $address);
+        }
+        if (exists($mailmap{$name})) {
+            my $obj = $mailmap{$name};
+            foreach my $map_address (@$obj) {
+                if (($map_address eq $address) &&
+                    ($map_address ne $hash{$name})) {
+                    $line = format_email($name, $hash{$name});
+                }
+            }
+        }
+    }
+
+    return @lines;
+}
+
 sub recent_git_signoffs {
     my ($file) = @_;
 
@@ -500,6 +669,7 @@ sub recent_git_signoffs {
     my $output = "";
     my $count = 0;
     my @lines = ();
+    my %hash;
     my $total_sign_offs;
 
     if (which("git") eq "") {
@@ -513,52 +683,119 @@ sub recent_git_signoffs {
     }
 
     $cmd = "git log --since=${email_git_since} -- ${file}";
-    $cmd .= " | grep -Ei \"^[-_         a-z]+by:.*\\\@.*\$\"";
-    if (!$email_git_penguin_chiefs) {
-        $cmd .= " | grep -Ev \"${penguin_chiefs}\"";
-    }
-    $cmd .= " | cut -f2- -d\":\"";
-    $cmd .= " | sort | uniq -c | sort -rn";
 
     $output = `${cmd}`;
     $output =~ s/^\s*//gm;
 
     @lines = split("\n", $output);
 
-    $total_sign_offs = 0;
+    @lines = grep(/^[-_         a-z]+by:.*\@.*$/i, @lines);
+    if (!$email_git_penguin_chiefs) {
+        @lines = grep(!/${penguin_chiefs}/i, @lines);
+    }
+    # cut -f2- -d":"
+    s/.*:\s*(.+)\s*/$1/ for (@lines);
+
+    $total_sign_offs = @lines;
+
+    if ($email_remove_duplicates) {
+        @lines = mailmap(@lines);
+    }
+
+    @lines = sort(@lines);
+
+    # uniq -c
+    $hash{$_}++ for @lines;
+
+    # sort -rn
+    foreach my $line (sort {$hash{$b} <=> $hash{$a}} keys %hash) {
+        my $sign_offs = $hash{$line};
+        $count++;
+        last if ($sign_offs < $email_git_min_signatures ||
+                 $count > $email_git_max_maintainers ||
+                 $sign_offs * 100 / $total_sign_offs < $email_git_min_percent);
+        push_email_address($line);
+    }
+}
+
+sub save_commits {
+    my ($cmd, @commits) = @_;
+    my $output;
+    my @lines = ();
+
+    $output = `${cmd}`;
+
+    @lines = split("\n", $output);
     foreach my $line (@lines) {
-        if ($line =~ m/([0-9]+)\s+(.*)/) {
-            $total_sign_offs += $1;
-        } else {
-            die("$P: Unexpected git output: ${line}\n");
+        if ($line =~ m/^(\w+) /) {
+            push (@commits, $1);
         }
     }
+    return @commits;
+}
 
-    foreach my $line (@lines) {
-        if ($line =~ m/([0-9]+)\s+(.*)/) {
-            my $sign_offs = $1;
-            $line = $2;
-            $count++;
-            if ($sign_offs < $email_git_min_signatures ||
-                $count > $email_git_max_maintainers ||
-                $sign_offs * 100 / $total_sign_offs < $email_git_min_percent) {
-                last;
-            }
+sub git_assign_blame {
+    my ($file) = @_;
+
+    my @lines = ();
+    my @commits = ();
+    my $cmd;
+    my $output;
+    my %hash;
+    my $total_sign_offs;
+    my $count;
+
+    if (@range) {
+        foreach my $file_range_diff (@range) {
+            next if (!($file_range_diff =~ m/(.+):(.+):(.+)/));
+            my $diff_file = $1;
+            my $diff_start = $2;
+            my $diff_length = $3;
+            next if (!("$file" eq "$diff_file"));
+            $cmd = "git blame -l -L $diff_start,+$diff_length $file";
+            @commits = save_commits($cmd, @commits);
         }
-        if ($line =~ m/(.+)<(.+)>/) {
-            my $git_name = $1;
-            my $git_addr = $2;
-            if ($email_usename) {
-                push(@email_to, format_email($git_name, $git_addr));
-            } else {
-                push(@email_to, $git_addr);
-            }
-        } elsif ($line =~ m/<(.+)>/) {
-            my $git_addr = $1;
-            push(@email_to, $git_addr);
-        } else {
-            push(@email_to, $line);
+    } else {
+        if (-f $file) {
+            $cmd = "git blame -l $file";
+            @commits = save_commits($cmd, @commits);
+        }
+    }
+
+    $total_sign_offs = 0;
+    @commits = uniq(@commits);
+    foreach my $commit (@commits) {
+        $cmd = "git log -1 ${commit}";
+
+        $output = `${cmd}`;
+        $output =~ s/^\s*//gm;
+        @lines = split("\n", $output);
+
+        @lines = grep(/^[-_     a-z]+by:.*\@.*$/i, @lines);
+        if (!$email_git_penguin_chiefs) {
+            @lines = grep(!/${penguin_chiefs}/i, @lines);
+        }
+
+        # cut -f2- -d":"
+        s/.*:\s*(.+)\s*/$1/ for (@lines);
+
+        $total_sign_offs += @lines;
+
+        if ($email_remove_duplicates) {
+            @lines = mailmap(@lines);
         }
+
+        $hash{$_}++ for @lines;
+    }
+
+    $count = 0;
+    foreach my $line (sort {$hash{$b} <=> $hash{$a}} keys %hash) {
+        my $sign_offs = $hash{$line};
+        $count++;
+        last if ($sign_offs < $email_git_min_signatures ||
+                 $count > $email_git_max_maintainers ||
+                 $sign_offs * 100 / $total_sign_offs < $email_git_min_percent);
+        push_email_address($line);
     }
 }
 
diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
index 64343cc084b4..86c3896a1e01 100644
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -585,7 +585,7 @@ static int prefix_underscores_count(const char *str)
 {
         const char *tail = str;
 
-        while (*tail != '_')
+        while (*tail == '_')
                 tail++;
 
         return tail - str;
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 40e0045876ee..62a9025cdcc7 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -657,6 +657,15 @@ static int do_i2c_entry(const char *filename, struct i2c_device_id *id,
         return 1;
 }
 
+/* Looks like: spi:S */
+static int do_spi_entry(const char *filename, struct spi_device_id *id,
+                        char *alias)
+{
+        sprintf(alias, SPI_MODULE_PREFIX "%s", id->name);
+
+        return 1;
+}
+
 static const struct dmifield {
         const char *prefix;
         int field;
@@ -853,6 +862,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
                 do_table(symval, sym->st_size,
                          sizeof(struct i2c_device_id), "i2c",
                          do_i2c_entry, mod);
+        else if (sym_is(symname, "__mod_spi_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct spi_device_id), "spi",
+                         do_spi_entry, mod);
         else if (sym_is(symname, "__mod_dmi_device_table"))
                 do_table(symval, sym->st_size,
                          sizeof(struct dmi_system_id), "dmi",
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 4522948a012e..801a16a17545 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -691,7 +691,7 @@ static int number_prefix(const char *sym)
  *   The $ syntax is for sections where ld append a dot number
  *   to make section name unique.
  */
-int match(const char *sym, const char * const pat[])
+static int match(const char *sym, const char * const pat[])
 {
         const char *p;
         while (*pat) {
@@ -1746,7 +1746,7 @@ static void add_header(struct buffer *b, struct module *mod)
         buf_printf(b, "};\n");
 }
 
-void add_staging_flag(struct buffer *b, const char *name)
+static void add_staging_flag(struct buffer *b, const char *name)
 {
         static const char *staging_dir = "drivers/staging";
 
diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c
index aadc5223dcdb..ecf9c7dc1825 100644
--- a/scripts/mod/sumversion.c
+++ b/scripts/mod/sumversion.c
@@ -334,8 +334,6 @@ static int parse_source_files(const char *objfile, struct md4_ctx *md)
                 deps_drivers/net/dummy.o := \
                   drivers/net/dummy.c \
                     $(wildcard include/config/net/fastroute.h) \
-                  include/linux/config.h \
-                    $(wildcard include/config/h.h) \
                   include/linux/module.h \
 
            Sum all files in the same dir or subdirs.
diff --git a/scripts/selinux/mdp/mdp.c b/scripts/selinux/mdp/mdp.c
index ca757d486187..b4ced8562587 100644
--- a/scripts/selinux/mdp/mdp.c
+++ b/scripts/selinux/mdp/mdp.c
@@ -31,13 +31,13 @@
 
 #include "flask.h"
 
-void usage(char *name)
+static void usage(char *name)
 {
         printf("usage: %s [-m] policy_file context_file\n", name);
         exit(1);
 }
 
-void find_common_name(char *cname, char *dest, int len)
+static void find_common_name(char *cname, char *dest, int len)
 {
         char *start, *end;
 
diff --git a/scripts/tracing/power.pl b/scripts/tracing/power.pl
deleted file mode 100644
index 4f729b3501e0..000000000000
--- a/scripts/tracing/power.pl
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright 2008, Intel Corporation
-#
-# This file is part of the Linux kernel
-#
-# This program file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program in a file named COPYING; if not, write to the
-# Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301 USA
-#
-# Authors:
-#       Arjan van de Ven <arjan@linux.intel.com>
-
-
-#
-# This script turns a cstate ftrace output into a SVG graphic that shows
-# historic C-state information
-#
-#
-#       cat /sys/kernel/debug/tracing/trace | perl power.pl > out.svg
-#
-
-my @styles;
-my $base = 0;
-
-my @pstate_last;
-my @pstate_level;
-
-$styles[0] = "fill:rgb(0,0,255);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
-$styles[1] = "fill:rgb(0,255,0);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
-$styles[2] = "fill:rgb(255,0,20);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
-$styles[3] = "fill:rgb(255,255,20);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
-$styles[4] = "fill:rgb(255,0,255);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
-$styles[5] = "fill:rgb(0,255,255);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
-$styles[6] = "fill:rgb(0,128,255);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
-$styles[7] = "fill:rgb(0,255,128);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
-$styles[8] = "fill:rgb(0,25,20);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
-
-
-print "<?xml version=\"1.0\" standalone=\"no\"?> \n";
-print "<svg width=\"10000\" height=\"100%\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\">\n";
-
-my $scale = 30000.0;
-while (<>) {
-        my $line = $_;
-        if ($line =~ /([0-9\.]+)\] CSTATE: Going to C([0-9]) on cpu ([0-9]+) for ([0-9\.]+)/) {
-                if ($base == 0) {
-                        $base = $1;
-                }
-                my $time = $1 - $base;
-                $time = $time * $scale;
-                my $C = $2;
-                my $cpu = $3;
-                my $y = 400 * $cpu;
-                my $duration = $4 * $scale;
-                my $msec = int($4 * 100000)/100.0;
-                my $height = $C * 20;
-                $style = $styles[$C];
-
-                $y = $y + 140 - $height;
-
-                $x2 = $time + 4;
-                $y2 = $y + 4;
-
-
-                print "<rect x=\"$time\" width=\"$duration\" y=\"$y\" height=\"$height\" style=\"$style\"/>\n";
-                print "<text transform=\"translate($x2,$y2) rotate(90)\">C$C $msec</text>\n";
-        }
-        if ($line =~ /([0-9\.]+)\] PSTATE: Going to P([0-9]) on cpu ([0-9]+)/) {
-                my $time = $1 - $base;
-                my $state = $2;
-                my $cpu = $3;
-
-                if (defined($pstate_last[$cpu])) {
-                        my $from = $pstate_last[$cpu];
-                        my $oldstate = $pstate_state[$cpu];
-                        my $duration = ($time-$from) * $scale;
-
-                        $from = $from * $scale;
-                        my $to = $from + $duration;
-                        my $height = 140 - ($oldstate * (140/8));
-
-                        my $y = 400 * $cpu + 200 + $height;
-                        my $y2 = $y+4;
-                        my $style = $styles[8];
-
-                        print "<rect x=\"$from\" y=\"$y\" width=\"$duration\" height=\"5\" style=\"$style\"/>\n";
-                        print "<text transform=\"translate($from,$y2)\">P$oldstate (cpu $cpu)</text>\n";
-                };
-
-                $pstate_last[$cpu] = $time;
-                $pstate_state[$cpu] = $state;
-        }
-}
-
-
-print "</svg>\n";