9 files changed, 157 insertions, 17 deletions

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index f9bdf264473d..cbcd654215e6 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -245,3 +245,7 @@ quiet_cmd_lzo = LZO    $@
 cmd_lzo = (cat $(filter-out FORCE,$^) | \
         lzop -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
         (rm -f $@ ; false)
+
+# misc stuff
+# ---------------------------------------------------------------------------
+quote:="
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index a4d74344d805..bd88f11b0953 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1382,6 +1382,21 @@ sub process {
                         ERROR("trailing whitespace\n" . $herevet);
                 }
 
+# check for Kconfig help text having a real description
+                if ($realfile =~ /Kconfig/ &&
+                    $line =~ /\+?\s*(---)?help(---)?$/) {
+                        my $length = 0;
+                        for (my $l = $linenr; defined($lines[$l]); $l++) {
+                                my $f = $lines[$l];
+                                $f =~ s/#.*//;
+                                $f =~ s/^\s+//;
+                                next if ($f =~ /^$/);
+                                last if ($f =~ /^\s*config\s/);
+                                $length++;
+                        }
+                        WARN("please write a paragraph that describes the config symbol fully\n" . $herecurr) if ($length < 4);
+                }
+
 # check we are in a valid source file if not then ignore this hunk
                 next if ($realfile !~ /\.(h|c|s|S|pl|sh)$/);
 
@@ -2586,6 +2601,11 @@ sub process {
                         CHK("architecture specific defines should be avoided\n" .  $herecurr);
                 }
 
+# Check that the storage class is at the beginning of a declaration
+                if ($line =~ /\b$Storage\b/ && $line !~ /^.\s*$Storage\b/) {
+                        WARN("storage class should be at the beginning of the declaration\n" . $herecurr)
+                }
+
 # check the location of the inline attribute, that it is between
 # storage class and type.
                 if ($line =~ /\b$Type\s+$Inline\b/ ||
@@ -2656,6 +2676,7 @@ sub process {
 # check for semaphores used as mutexes
                 if ($line =~ /^.\s*init_MUTEX_LOCKED\s*\(/) {
                         WARN("consider using a completion\n" . $herecurr);
+
                 }
 # recommend strict_strto* over simple_strto*
                 if ($line =~ /\bsimple_(strto.*?)\s*\(/) {
@@ -2740,6 +2761,16 @@ sub process {
                                 WARN("use of in_atomic() is incorrect outside core kernel code\n" . $herecurr);
                         }
                 }
+
+# check for lockdep_set_novalidate_class
+                if ($line =~ /^.\s*lockdep_set_novalidate_class\s*\(/ ||
+                    $line =~ /__lockdep_no_validate__\s*\)/ ) {
+                        if ($realfile !~ m@^kernel/lockdep@ &&
+                            $realfile !~ m@^include/linux/lockdep@ &&
+                            $realfile !~ m@^drivers/base/core@) {
+                                ERROR("lockdep_no_validate class is reserved for device->mutex.\n" . $herecurr);
+                        }
+                }
         }
 
         # If we have no input at all, then there is nothing to report on
diff --git a/scripts/gen_initramfs_list.sh b/scripts/gen_initramfs_list.sh
index 76af5f9623e3..a932ae52f921 100644
--- a/scripts/gen_initramfs_list.sh
+++ b/scripts/gen_initramfs_list.sh
@@ -242,6 +242,7 @@ case "$arg" in
                 echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f"
                 echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f"
                 echo "$output_file" | grep -q "\.lzma$" && compr="lzma -9 -f"
+                echo "$output_file" | grep -q "\.lzo$" && compr="lzop -9 -f"
                 echo "$output_file" | grep -q "\.cpio$" && compr="cat"
                 shift
                 ;;
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index 6f97a13bcee4..b2281982f52f 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -13,7 +13,7 @@
 use strict;
 
 my $P = $0;
-my $V = '0.23';
+my $V = '0.24';
 
 use Getopt::Long qw(:config no_auto_abbrev);
 
@@ -25,6 +25,7 @@ my $email_list = 1;
 my $email_subscriber_list = 0;
 my $email_git_penguin_chiefs = 0;
 my $email_git = 1;
+my $email_git_all_signature_types = 0;
 my $email_git_blame = 0;
 my $email_git_min_signatures = 1;
 my $email_git_max_maintainers = 5;
@@ -51,9 +52,9 @@ my $help = 0;
 my $exit = 0;
 
 my @penguin_chief = ();
-push(@penguin_chief,"Linus Torvalds:torvalds\@linux-foundation.org");
+push(@penguin_chief, "Linus Torvalds:torvalds\@linux-foundation.org");
 #Andrew wants in on most everything - 2009/01/14
-#push(@penguin_chief,"Andrew Morton:akpm\@linux-foundation.org");
+#push(@penguin_chief, "Andrew Morton:akpm\@linux-foundation.org");
 
 my @penguin_chief_names = ();
 foreach my $chief (@penguin_chief) {
@@ -63,7 +64,16 @@ foreach my $chief (@penguin_chief) {
         push(@penguin_chief_names, $chief_name);
     }
 }
-my $penguin_chiefs = "\(" . join("|",@penguin_chief_names) . "\)";
+my $penguin_chiefs = "\(" . join("|", @penguin_chief_names) . "\)";
+
+# Signature types of people who are either
+#       a) responsible for the code in question, or
+#       b) familiar enough with it to give relevant feedback
+my @signature_tags = ();
+push(@signature_tags, "Signed-off-by:");
+push(@signature_tags, "Reviewed-by:");
+push(@signature_tags, "Acked-by:");
+my $signaturePattern = "\(" . join("|", @signature_tags) . "\)";
 
 # rfc822 email address - preloaded methods go here.
 my $rfc822_lwsp = "(?:(?:\\r\\n)?[ \\t])";
@@ -97,9 +107,34 @@ my %VCS_cmds_hg = (
     "blame_commit_pattern" => "^([0-9a-f]+):"
 );
 
+if (-f "${lk_path}.get_maintainer.conf") {
+    my @conf_args;
+    open(my $conffile, '<', "${lk_path}.get_maintainer.conf")
+        or warn "$P: Can't open .get_maintainer.conf: $!\n";
+    while (<$conffile>) {
+        my $line = $_;
+
+        $line =~ s/\s*\n?$//g;
+        $line =~ s/^\s*//g;
+        $line =~ s/\s+/ /g;
+
+        next if ($line =~ m/^\s*#/);
+        next if ($line =~ m/^\s*$/);
+
+        my @words = split(" ", $line);
+        foreach my $word (@words) {
+            last if ($word =~ m/^#/);
+            push (@conf_args, $word);
+        }
+    }
+    close($conffile);
+    unshift(@ARGV, @conf_args) if @conf_args;
+}
+
 if (!GetOptions(
                 'email!' => \$email,
                 'git!' => \$email_git,
+                'git-all-signature-types!' => \$email_git_all_signature_types,
                 'git-blame!' => \$email_git_blame,
                 'git-chief-penguins!' => \$email_git_penguin_chiefs,
                 'git-min-signatures=i' => \$email_git_min_signatures,
@@ -180,6 +215,10 @@ if (!top_of_kernel_tree($lk_path)) {
         . "a linux kernel source tree.\n";
 }
 
+if ($email_git_all_signature_types) {
+    $signaturePattern = "(.+?)[Bb][Yy]:";
+}
+
 ## Read MAINTAINERS for type/value pairs
 
 my @typevalue = ();
@@ -497,13 +536,15 @@ version: $V
 MAINTAINER field selection options:
   --email => print email address(es) if any
     --git => include recent git \*-by: signers
+    --git-all-signature-types => include signers regardless of signature type
+        or use only ${signaturePattern} signers (default: $email_git_all_signature_types)
     --git-chief-penguins => include ${penguin_chiefs}
-    --git-min-signatures => number of signatures required (default: 1)
-    --git-max-maintainers => maximum maintainers to add (default: 5)
-    --git-min-percent => minimum percentage of commits required (default: 5)
+    --git-min-signatures => number of signatures required (default: $email_git_min_signatures)
+    --git-max-maintainers => maximum maintainers to add (default: $email_git_max_maintainers)
+    --git-min-percent => minimum percentage of commits required (default: $email_git_min_percent)
     --git-blame => use git blame to find modified commits for patch or file
-    --git-since => git history to use (default: 1-year-ago)
-    --hg-since => hg history to use (default: -365)
+    --git-since => git history to use (default: $email_git_since)
+    --hg-since => hg history to use (default: $email_hg_since)
     --m => include maintainer(s) if any
     --n => include name 'Full Name <addr\@domain.tld>'
     --l => include list(s) if any
@@ -556,6 +597,11 @@ Notes:
           --git-min-signatures, --git-max-maintainers, --git-min-percent, and
           --git-blame
       Use --hg-since not --git-since to control date selection
+  File ".get_maintainer.conf", if it exists in the linux kernel source root
+      directory, can change whatever get_maintainer defaults are desired.
+      Entries in this file can be any command line argument.
+      This file is prepended to any additional command line arguments.
+      Multiple lines and # comments are allowed.
 EOT
 }
 
@@ -964,7 +1010,7 @@ sub vcs_find_signers {
 
     $commits = grep(/$pattern/, @lines);        # of commits
 
-    @lines = grep(/^[-_         a-z]+by:.*\@.*$/i, @lines);
+    @lines = grep(/^[ \t]*${signaturePattern}.*\@.*$/, @lines);
     if (!$email_git_penguin_chiefs) {
         @lines = grep(!/${penguin_chiefs}/i, @lines);
     }
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index afbd54ac1d83..c70a27d924f0 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -115,7 +115,9 @@ my $ksource = $ARGV[0];
 my $kconfig = $ARGV[1];
 my $lsmod_file = $ARGV[2];
 
-my @makefiles = `find $ksource -name Makefile`;
+my @makefiles = `find $ksource -name Makefile 2>/dev/null`;
+chomp @makefiles;
+
 my %depends;
 my %selects;
 my %prompts;
@@ -215,7 +217,6 @@ if ($kconfig) {
 
 # Read all Makefiles to map the configs to the objects
 foreach my $makefile (@makefiles) {
-    chomp $makefile;
 
     open(MIN,$makefile) || die "Can't open $makefile";
     while (<MIN>) {
@@ -242,7 +243,7 @@ foreach my $makefile (@makefiles) {
             foreach my $obj (split /\s+/,$objs) {
                 $obj =~ s/-/_/g;
                 if ($obj =~ /(.*)\.o$/) {
-                    # Objects may bes enabled by more than one config.
+                    # Objects may be enabled by more than one config.
                     # Store configs in an array.
                     my @arr;
 
@@ -307,7 +308,7 @@ close (LIN);
 my %configs;
 foreach my $module (keys(%modules)) {
     if (defined($objects{$module})) {
-        @arr = @{$objects{$module}};
+        my @arr = @{$objects{$module}};
         foreach my $conf (@arr) {
             $configs{$conf} = $module;
         }
diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c
index b6b2a46af14c..25d1ec4ca28a 100644
--- a/scripts/kconfig/util.c
+++ b/scripts/kconfig/util.c
@@ -72,7 +72,7 @@ int file_write_dep(const char *name)
 }
 
 
-/* Allocate initial growable sting */
+/* Allocate initial growable string */
 struct gstr str_new(void)
 {
         struct gstr gs;
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 220213e603db..5758aab0d8bb 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -796,6 +796,51 @@ static int do_platform_entry(const char *filename,
         return 1;
 }
 
+static int do_mdio_entry(const char *filename,
+                         struct mdio_device_id *id, char *alias)
+{
+        int i;
+
+        alias += sprintf(alias, MDIO_MODULE_PREFIX);
+
+        for (i = 0; i < 32; i++) {
+                if (!((id->phy_id_mask >> (31-i)) & 1))
+                        *(alias++) = '?';
+                else if ((id->phy_id >> (31-i)) & 1)
+                        *(alias++) = '1';
+                else
+                        *(alias++) = '0';
+        }
+
+        /* Terminate the string */
+        *alias = 0;
+
+        return 1;
+}
+
+/* Looks like: zorro:iN. */
+static int do_zorro_entry(const char *filename, struct zorro_device_id *id,
+                          char *alias)
+{
+        id->id = TO_NATIVE(id->id);
+        strcpy(alias, "zorro:");
+        ADD(alias, "i", id->id != ZORRO_WILDCARD, id->id);
+        return 1;
+}
+
+/* looks like: "pnp:dD" */
+static int do_isapnp_entry(const char *filename,
+                           struct isapnp_device_id *id, char *alias)
+{
+        sprintf(alias, "pnp:d%c%c%c%x%x%x%x*",
+                'A' + ((id->vendor >> 2) & 0x3f) - 1,
+                'A' + (((id->vendor & 3) << 3) | ((id->vendor >> 13) & 7)) - 1,
+                'A' + ((id->vendor >> 8) & 0x1f) - 1,
+                (id->function >> 4) & 0x0f, id->function & 0x0f,
+                (id->function >> 12) & 0x0f, (id->function >> 8) & 0x0f);
+        return 1;
+}
+
 /* Ignore any prefix, eg. some architectures prepend _ */
 static inline int sym_is(const char *symbol, const char *name)
 {
@@ -943,6 +988,18 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
                 do_table(symval, sym->st_size,
                          sizeof(struct platform_device_id), "platform",
                          do_platform_entry, mod);
+        else if (sym_is(symname, "__mod_mdio_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct mdio_device_id), "mdio",
+                         do_mdio_entry, mod);
+        else if (sym_is(symname, "__mod_zorro_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct zorro_device_id), "zorro",
+                         do_zorro_entry, mod);
+        else if (sym_is(symname, "__mod_isapnp_device_table"))
+                do_table(symval, sym->st_size,
+                        sizeof(struct isapnp_device_id), "isa",
+                        do_isapnp_entry, mod);
         free(zeros);
 }
 
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index 47bdd2f99b78..fa27f3dac769 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#       Output a simple RPM spec file that uses no fancy features requring
+#       Output a simple RPM spec file that uses no fancy features requiring
 #       RPM v4. This is intended to work with any RPM distro.
 #
 #       The only gothic bit here is redefining install_post to avoid
diff --git a/scripts/selinux/genheaders/genheaders.c b/scripts/selinux/genheaders/genheaders.c
index 24626968055d..58a12c278706 100644
--- a/scripts/selinux/genheaders/genheaders.c
+++ b/scripts/selinux/genheaders/genheaders.c
@@ -81,7 +81,7 @@ int main(int argc, char *argv[])
         fprintf(fout, "\n");
 
         for (i = 1; i < isids_len; i++) {
-                char *s = initial_sid_to_string[i];
+                const char *s = initial_sid_to_string[i];
                 fprintf(fout, "#define SECINITSID_%s", s);
                 for (j = 0; j < max(1, 40 - strlen(s)); j++)
                         fprintf(fout, " ");