48 files changed, 1277 insertions, 459 deletions

diff --git a/scripts/.gitignore b/scripts/.gitignore
index b939fbd01195..52cab46ae35a 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -7,3 +7,4 @@ pnmtologo
 bin2c
 unifdef
 binoffset
+ihex2fw
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index c29be8f90248..c67e73ecd5be 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -83,11 +83,12 @@ TMPOUT := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/)
 # is automatically cleaned up.
 try-run = $(shell set -e;               \
         TMP="$(TMPOUT).$$$$.tmp";       \
+        TMPO="$(TMPOUT).$$$$.o";        \
         if ($(1)) >/dev/null 2>&1;      \
         then echo "$(2)";               \
         else echo "$(3)";               \
         fi;                             \
-        rm -f "$$TMP")
+        rm -f "$$TMP" "$$TMPO")
 
 # as-option
 # Usage: cflags-y += $(call as-option,-Wa$(comma)-isa=foo,)
@@ -99,18 +100,18 @@ as-option = $(call try-run,\
 # Usage: cflags-y += $(call as-instr,instr,option1,option2)
 
 as-instr = $(call try-run,\
-        echo -e "$(1)" | $(CC) $(KBUILD_AFLAGS) -c -xassembler -o "$$TMP" -,$(2),$(3))
+        /bin/echo -e "$(1)" | $(CC) $(KBUILD_AFLAGS) -c -xassembler -o "$$TMP" -,$(2),$(3))
 
 # cc-option
 # Usage: cflags-y += $(call cc-option,-march=winchip-c6,-march=i586)
 
 cc-option = $(call try-run,\
-        $(CC) $(KBUILD_CFLAGS) $(1) -c -xc /dev/null -o "$$TMP",$(1),$(2))
+        $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(1) -c -xc /dev/null -o "$$TMP",$(1),$(2))
 
 # cc-option-yn
 # Usage: flag := $(call cc-option-yn,-march=winchip-c6)
 cc-option-yn = $(call try-run,\
-        $(CC) $(KBUILD_CFLAGS) $(1) -c -xc /dev/null -o "$$TMP",y,n)
+        $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(1) -c -xc /dev/null -o "$$TMP",y,n)
 
 # cc-option-align
 # Prefix align with either -falign or -malign
@@ -130,10 +131,15 @@ cc-fullversion = $(shell $(CONFIG_SHELL) \
 # Usage:  EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)
 cc-ifversion = $(shell [ $(call cc-version, $(CC)) $(1) $(2) ] && echo $(3))
 
+# cc-ldoption
+# Usage: ldflags += $(call cc-ldoption, -Wl$(comma)--hash-style=both)
+cc-ldoption = $(call try-run,\
+        $(CC) $(1) -nostdlib -xc /dev/null -o "$$TMP",$(1),$(2))
+
 # ld-option
-# Usage: ldflags += $(call ld-option, -Wl$(comma)--hash-style=both)
+# Usage: LDFLAGS += $(call ld-option, -X)
 ld-option = $(call try-run,\
-        $(CC) $(1) -nostdlib -xc /dev/null -o "$$TMP",$(1),$(2))
+        $(CC) /dev/null -c -o "$$TMPO" ; $(LD) $(1) "$$TMPO" -o "$$TMP",$(1),$(2))
 
 ######
 
diff --git a/scripts/Makefile b/scripts/Makefile
index 9dd5b25a1d53..842dbc2d5aed 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -10,7 +10,6 @@
 hostprogs-$(CONFIG_KALLSYMS)     += kallsyms
 hostprogs-$(CONFIG_LOGO)         += pnmtologo
 hostprogs-$(CONFIG_VT)           += conmakehash
-hostprogs-$(CONFIG_PROM_CONSOLE) += conmakehash
 hostprogs-$(CONFIG_IKCONFIG)     += bin2c
 
 always          := $(hostprogs-y) $(hostprogs-m)
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 5c4b7a400c18..341b58902ffc 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -206,7 +206,7 @@ cmd_modversions =							\
 endif
 
 ifdef CONFIG_FTRACE_MCOUNT_RECORD
-cmd_record_mcount = perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \
+cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \
         "$(if $(CONFIG_64BIT),64,32)" \
         "$(OBJDUMP)" "$(OBJCOPY)" "$(CC)" "$(LD)" "$(NM)" "$(RM)" "$(MV)" \
         "$(if $(part-of-module),1,0)" "$(@)";
@@ -216,6 +216,7 @@ define rule_cc_o_c
         $(call echo-cmd,checksrc) $(cmd_checksrc)                         \
         $(call echo-cmd,cc_o_c) $(cmd_cc_o_c);                            \
         $(cmd_modversions)                                                \
+        $(call echo-cmd,record_mcount)                                    \
         $(cmd_record_mcount)                                              \
         scripts/basic/fixdep $(depfile) $@ '$(call make-cmd,cc_o_c)' >    \
                                                       $(dot-target).tmp;  \
@@ -269,7 +270,8 @@ targets += $(extra-y) $(MAKECMDGOALS) $(always)
 # Linker scripts preprocessor (.lds.S -> .lds)
 # ---------------------------------------------------------------------------
 quiet_cmd_cpp_lds_S = LDS     $@
-      cmd_cpp_lds_S = $(CPP) $(cpp_flags) -D__ASSEMBLY__ -o $@ $<
+      cmd_cpp_lds_S = $(CPP) $(cpp_flags) -P -C -U$(ARCH) \
+                             -D__ASSEMBLY__ -DLINKER_SCRIPT -o $@ $<
 
 $(obj)/%.lds: $(src)/%.lds.S FORCE
         $(call if_changed_dep,cpp_lds_S)
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 7a7778746ea6..ffdafb26f539 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -208,7 +208,7 @@ cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -f -9 > $@) || \
 
 # Bzip2 and LZMA do not include size in file... so we have to fake that;
 # append the size as a 32-bit littleendian number as gzip does.
-size_append = echo -ne $(shell                                          \
+size_append = /bin/echo -ne $(shell                                     \
 dec_size=0;                                                             \
 for F in $1; do                                                         \
         fsize=$$(stat -c "%s" $$F);                                     \
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/docproc.c b/scripts/basic/docproc.c
index 99ca7a698687..79ab973fb43a 100644
--- a/scripts/basic/docproc.c
+++ b/scripts/basic/docproc.c
@@ -71,7 +71,7 @@ FILELINE * docsection;
 
 static char *srctree, *kernsrctree;
 
-void usage (void)
+static void usage (void)
 {
         fprintf(stderr, "Usage: docproc {doc|depend} file\n");
         fprintf(stderr, "Input is read from file.tmpl. Output is sent to stdout\n");
@@ -84,7 +84,7 @@ void usage (void)
 /*
  * Execute kernel-doc with parameters given in svec
  */
-void exec_kernel_doc(char **svec)
+static void exec_kernel_doc(char **svec)
 {
         pid_t pid;
         int ret;
@@ -129,7 +129,7 @@ struct symfile
 struct symfile symfilelist[MAXFILES];
 int symfilecnt = 0;
 
-void add_new_symbol(struct symfile *sym, char * symname)
+static void add_new_symbol(struct symfile *sym, char * symname)
 {
         sym->symbollist =
           realloc(sym->symbollist, (sym->symbolcnt + 1) * sizeof(char *));
@@ -137,14 +137,14 @@ void add_new_symbol(struct symfile *sym, char * symname)
 }
 
 /* Add a filename to the list */
-struct symfile * add_new_file(char * filename)
+static struct symfile * add_new_file(char * filename)
 {
         symfilelist[symfilecnt++].filename = strdup(filename);
         return &symfilelist[symfilecnt - 1];
 }
 
 /* Check if file already are present in the list */
-struct symfile * filename_exist(char * filename)
+static struct symfile * filename_exist(char * filename)
 {
         int i;
         for (i=0; i < symfilecnt; i++)
@@ -157,20 +157,20 @@ struct symfile * filename_exist(char * filename)
  * List all files referenced within the template file.
  * Files are separated by tabs.
  */
-void adddep(char * file)                   { printf("\t%s", file); }
-void adddep2(char * file, char * line)     { line = line; adddep(file); }
-void noaction(char * line)                 { line = line; }
-void noaction2(char * file, char * line)   { file = file; line = line; }
+static void adddep(char * file)            { printf("\t%s", file); }
+static void adddep2(char * file, char * line)     { line = line; adddep(file); }
+static void noaction(char * line)                  { line = line; }
+static void noaction2(char * file, char * line)   { file = file; line = line; }
 
 /* Echo the line without further action */
-void printline(char * line)               { printf("%s", line); }
+static void printline(char * line)               { printf("%s", line); }
 
 /*
  * Find all symbols in filename that are exported with EXPORT_SYMBOL &
  * EXPORT_SYMBOL_GPL (& EXPORT_SYMBOL_GPL_FUTURE implicitly).
  * All symbols located are stored in symfilelist.
  */
-void find_export_symbols(char * filename)
+static void find_export_symbols(char * filename)
 {
         FILE * fp;
         struct symfile *sym;
@@ -227,7 +227,7 @@ void find_export_symbols(char * filename)
  * intfunc uses -nofunction
  * extfunc uses -function
  */
-void docfunctions(char * filename, char * type)
+static void docfunctions(char * filename, char * type)
 {
         int i,j;
         int symcnt = 0;
@@ -258,15 +258,15 @@ void docfunctions(char * filename, char * type)
         fflush(stdout);
         free(vec);
 }
-void intfunc(char * filename) { docfunctions(filename, NOFUNCTION); }
-void extfunc(char * filename) { docfunctions(filename, FUNCTION);   }
+static void intfunc(char * filename) {  docfunctions(filename, NOFUNCTION); }
+static void extfunc(char * filename) { docfunctions(filename, FUNCTION);   }
 
 /*
  * Document specific function(s) in a file.
  * Call kernel-doc with the following parameters:
  * kernel-doc -docbook -function function1 [-function function2]
  */
-void singfunc(char * filename, char * line)
+static void singfunc(char * filename, char * line)
 {
         char *vec[200]; /* Enough for specific functions */
         int i, idx = 0;
@@ -297,7 +297,7 @@ void singfunc(char * filename, char * line)
  * Call kernel-doc with the following parameters:
  * kernel-doc -docbook -function "doc section" filename
  */
-void docsect(char *filename, char *line)
+static void docsect(char *filename, char *line)
 {
         char *vec[6]; /* kerneldoc -docbook -function "section" file NULL */
         char *s;
@@ -324,7 +324,7 @@ void docsect(char *filename, char *line)
  * 5) Lines containing !P
  * 6) Default lines - lines not matching the above
  */
-void parse_file(FILE *infile)
+static void parse_file(FILE *infile)
 {
         char line[MAXLINESZ];
         char * s;
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index 72c15205bb2b..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
@@ -125,8 +124,7 @@ char *target;
 char *depfile;
 char *cmdline;
 
-void usage(void)
-
+static void usage(void)
 {
         fprintf(stderr, "Usage: fixdep <depfile> <target> <cmdline>\n");
         exit(1);
@@ -135,7 +133,7 @@ void usage(void)
 /*
  * Print out the commandline prefixed with cmd_<target filename> :=
  */
-void print_cmdline(void)
+static void print_cmdline(void)
 {
         printf("cmd_%s := %s\n\n", target, cmdline);
 }
@@ -148,7 +146,7 @@ int    len_config  = 0;
  * Grow the configuration string to a desired length.
  * Usually the first growth is plenty.
  */
-void grow_config(int len)
+static void grow_config(int len)
 {
         while (len_config + len > size_config) {
                 if (size_config == 0)
@@ -164,7 +162,7 @@ void grow_config(int len)
 /*
  * Lookup a value in the configuration string.
  */
-int is_defined_config(const char * name, int len)
+static int is_defined_config(const char * name, int len)
 {
         const char * pconfig;
         const char * plast = str_config + len_config - len;
@@ -180,7 +178,7 @@ int is_defined_config(const char * name, int len)
 /*
  * Add a new value to the configuration string.
  */
-void define_config(const char * name, int len)
+static void define_config(const char * name, int len)
 {
         grow_config(len + 1);
 
@@ -192,7 +190,7 @@ void define_config(const char * name, int len)
 /*
  * Clear the set of configuration strings.
  */
-void clear_config(void)
+static void clear_config(void)
 {
         len_config = 0;
         define_config("", 0);
@@ -201,7 +199,7 @@ void clear_config(void)
 /*
  * Record the use of a CONFIG_* word.
  */
-void use_config(char *m, int slen)
+static void use_config(char *m, int slen)
 {
         char s[PATH_MAX];
         char *p;
@@ -222,7 +220,7 @@ void use_config(char *m, int slen)
         printf("    $(wildcard include/config/%s.h) \\\n", s);
 }
 
-void parse_config_file(char *map, size_t len)
+static void parse_config_file(char *map, size_t len)
 {
         int *end = (int *) (map + len);
         /* start at +1, so that p can never be < map */
@@ -256,7 +254,7 @@ void parse_config_file(char *map, size_t len)
 }
 
 /* test is s ends in sub */
-int strrcmp(char *s, char *sub)
+static int strrcmp(char *s, char *sub)
 {
         int slen = strlen(s);
         int sublen = strlen(sub);
@@ -267,7 +265,7 @@ int strrcmp(char *s, char *sub)
         return memcmp(s + slen - sublen, sub, sublen);
 }
 
-void do_config_file(char *filename)
+static void do_config_file(char *filename)
 {
         struct stat st;
         int fd;
@@ -298,7 +296,7 @@ void do_config_file(char *filename)
         close(fd);
 }
 
-void parse_dep_file(void *map, size_t len)
+static void parse_dep_file(void *map, size_t len)
 {
         char *m = map;
         char *end = m + len;
@@ -338,7 +336,7 @@ void parse_dep_file(void *map, size_t len)
         printf("$(deps_%s):\n", target);
 }
 
-void print_deps(void)
+static void print_deps(void)
 {
         struct stat st;
         int fd;
@@ -370,7 +368,7 @@ void print_deps(void)
         close(fd);
 }
 
-void traps(void)
+static void traps(void)
 {
         static char test[] __attribute__((aligned(sizeof(int)))) = "CONF";
         int *p = (int *)test;
diff --git a/scripts/basic/hash.c b/scripts/basic/hash.c
index 3299ad7fc8c0..2ef5d3f666b8 100644
--- a/scripts/basic/hash.c
+++ b/scripts/basic/hash.c
@@ -21,7 +21,7 @@ static void usage(void)
  * http://www.cse.yorku.ca/~oz/hash.html
  */
 
-unsigned int djb2_hash(char *str)
+static unsigned int djb2_hash(char *str)
 {
         unsigned long hash = 5381;
         int c;
@@ -34,7 +34,7 @@ unsigned int djb2_hash(char *str)
         return (unsigned int)(hash & ((1 << DYNAMIC_DEBUG_HASH_BITS) - 1));
 }
 
-unsigned int r5_hash(char *str)
+static unsigned int r5_hash(char *str)
 {
         unsigned long hash = 0;
         int c;
diff --git a/scripts/checkincludes.pl b/scripts/checkincludes.pl
index 8e6b716c191c..676ddc07d6fa 100755
--- a/scripts/checkincludes.pl
+++ b/scripts/checkincludes.pl
@@ -1,24 +1,85 @@
 #!/usr/bin/perl
 #
-# checkincludes: Find files included more than once in (other) files.
+# checkincludes: find/remove files included more than once
+#
 # Copyright abandoned, 2000, Niels Kristian Bech Jensen <nkbj@image.dk>.
+# Copyright 2009 Luis R. Rodriguez <mcgrof@gmail.com>
+#
+# This script checks for duplicate includes. It also has support
+# to remove them in place. Note that this will not take into
+# consideration macros so you should run this only if you know
+# you do have real dups and do not have them under #ifdef's. You
+# could also just review the results.
+
+sub usage {
+        print "Usage: checkincludes.pl [-r]\n";
+        print "By default we just warn of duplicates\n";
+        print "To remove duplicated includes in place use -r\n";
+        exit 1;
+}
+
+my $remove = 0;
+
+if ($#ARGV < 0) {
+        usage();
+}
+
+if ($#ARGV >= 1) {
+        if ($ARGV[0] =~ /^-/) {
+                if ($ARGV[0] eq "-r") {
+                        $remove = 1;
+                        shift;
+                } else {
+                        usage();
+                }
+        }
+}
 
 foreach $file (@ARGV) {
         open(FILE, $file) or die "Cannot open $file: $!.\n";
 
         my %includedfiles = ();
+        my @file_lines = ();
 
         while (<FILE>) {
                 if (m/^\s*#\s*include\s*[<"](\S*)[>"]/o) {
                         ++$includedfiles{$1};
                 }
+                push(@file_lines, $_);
         }
-        
-        foreach $filename (keys %includedfiles) {
-                if ($includedfiles{$filename} > 1) {
-                        print "$file: $filename is included more than once.\n";
+
+        close(FILE);
+
+        if (!$remove) {
+                foreach $filename (keys %includedfiles) {
+                        if ($includedfiles{$filename} > 1) {
+                                print "$file: $filename is included more than once.\n";
+                        }
                 }
+                next;
         }
 
+        open(FILE,">$file") || die("Cannot write to $file: $!");
+
+        my $dups = 0;
+        foreach (@file_lines) {
+                if (m/^\s*#\s*include\s*[<"](\S*)[>"]/o) {
+                        foreach $filename (keys %includedfiles) {
+                                if ($1 eq $filename) {
+                                        if ($includedfiles{$filename} > 1) {
+                                                $includedfiles{$filename}--;
+                                                $dups++;
+                                        } else {
+                                                print FILE $_;
+                                        }
+                                }
+                        }
+                } else {
+                        print FILE $_;
+                }
+        }
+        if ($dups > 0) {
+                print "$file: removed $dups duplicate includes\n";
+        }
         close(FILE);
 }
diff --git a/scripts/checkkconfigsymbols.sh b/scripts/checkkconfigsymbols.sh
index 39677c82747a..46be3c5a62b7 100755
--- a/scripts/checkkconfigsymbols.sh
+++ b/scripts/checkkconfigsymbols.sh
@@ -9,7 +9,7 @@ paths="$@"
 # Doing this once at the beginning saves a lot of time, on a cache-hot tree.
 Kconfigs="`find . -name 'Kconfig' -o -name 'Kconfig*[^~]'`"
 
-echo -e "File list \tundefined symbol used"
+/bin/echo -e "File list \tundefined symbol used"
 find $paths -name '*.[chS]' -o -name 'Makefile' -o -name 'Makefile*[^~]'| while read i
 do
         # Output the bare Kconfig variable and the filename; the _MODULE part at
@@ -54,6 +54,6 @@ while read symb files; do
         # beyond the purpose of this script.
         symb_bare=`echo $symb | sed -e 's/_MODULE//'`
         if ! grep -q "\<$symb_bare\>" $Kconfigs; then
-                echo -e "$files: \t$symb"
+                /bin/echo -e "$files: \t$symb"
         fi
 done|sort
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 2d5ece798c4c..bc4114f1ab30 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2,7 +2,7 @@
 # (c) 2001, Dave Jones. <davej@redhat.com> (the file handling bit)
 # (c) 2005, Joel Schopp <jschopp@austin.ibm.com> (the ugly bit)
 # (c) 2007,2008, Andy Whitcroft <apw@uk.ibm.com> (new conditions, test suite)
-# (c) 2008, Andy Whitcroft <apw@canonical.com>
+# (c) 2008,2009, Andy Whitcroft <apw@canonical.com>
 # Licensed under the terms of the GNU GPL License version 2
 
 use strict;
@@ -10,7 +10,7 @@ use strict;
 my $P = $0;
 $P =~ s@.*/@@g;
 
-my $V = '0.28';
+my $V = '0.30';
 
 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);
 }
 
@@ -101,7 +130,10 @@ if ($tree) {
 
 my $emitted_corrupt = 0;
 
-our $Ident       = qr{[A-Za-z_][A-Za-z\d_]*};
+our $Ident      = qr{
+                        [A-Za-z_][A-Za-z\d_]*
+                        (?:\s*\#\#\s*[A-Za-z_][A-Za-z\d_]*)*
+                }x;
 our $Storage    = qr{extern|static|asmlinkage};
 our $Sparse     = qr{
                         __user|
@@ -153,7 +185,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 +388,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 +418,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 +427,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);
@@ -955,23 +1000,25 @@ sub annotate_values {
 
 sub possible {
         my ($possible, $line) = @_;
-
-        print "CHECK<$possible> ($line)\n" if ($dbg_possible > 2);
-        if ($possible !~ /(?:
+        my $notPermitted = qr{(?:
                 ^(?:
                         $Modifier|
                         $Storage|
                         $Type|
-                        DEFINE_\S+|
+                        DEFINE_\S+
+                )$|
+                ^(?:
                         goto|
                         return|
                         case|
                         else|
                         asm|__asm__|
                         do
-                )$|
+                )(?:\s|$)|
                 ^(?:typedef|struct|enum)\b
-            )/x) {
+            )}x;
+        warn "CHECK<$possible> ($line)\n" if ($dbg_possible > 2);
+        if ($possible !~ $notPermitted) {
                 # Check for modifiers.
                 $possible =~ s/\s*$Storage\s*//g;
                 $possible =~ s/\s*$Sparse\s*//g;
@@ -980,8 +1027,10 @@ sub possible {
                 } elsif ($possible =~ /\s/) {
                         $possible =~ s/\s*$Type\s*//g;
                         for my $modifier (split(' ', $possible)) {
-                                warn "MODIFIER: $modifier ($possible) ($line)\n" if ($dbg_possible);
-                                push(@modifierList, $modifier);
+                                if ($modifier !~ $notPermitted) {
+                                        warn "MODIFIER: $modifier ($possible) ($line)\n" if ($dbg_possible);
+                                        push(@modifierList, $modifier);
+                                }
                         }
 
                 } else {
@@ -1096,6 +1145,7 @@ sub process {
         # suppression flags
         my %suppress_ifbraces;
         my %suppress_whiletrailers;
+        my %suppress_export;
 
         # Pre-scan the patch sanitizing the lines.
         # Pre-scan the patch looking for any __setup documentation.
@@ -1188,7 +1238,6 @@ sub process {
                 $linenr++;
 
                 my $rawline = $rawlines[$linenr - 1];
-                my $hunk_line = ($realcnt != 0);
 
 #extract the line range in the file after the patch is applied
                 if ($line=~/^\@\@ -\d+(?:,\d+)? \+(\d+)(,(\d+))? \@\@/) {
@@ -1205,6 +1254,7 @@ sub process {
 
                         %suppress_ifbraces = ();
                         %suppress_whiletrailers = ();
+                        %suppress_export = ();
                         next;
 
 # track the line number as we move through the hunk, note that
@@ -1228,6 +1278,8 @@ sub process {
                         $realcnt--;
                 }
 
+                my $hunk_line = ($realcnt != 0);
+
 #make up the handle for any error we report on this line
                 $prefix = "$filename:$realline: " if ($emacs && $file);
                 $prefix = "$filename:$linenr: " if ($emacs && !$file);
@@ -1336,6 +1388,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,14 +1419,33 @@ 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);
+                my ($stat, $cond, $line_nr_next, $remain_next, $off_next,
+                    $realline_next);
                 if ($realcnt && $line =~ /.\s*\S/) {
                         ($stat, $cond, $line_nr_next, $remain_next, $off_next) =
                                 ctx_statement_block($linenr, $realcnt, 0);
                         $stat =~ s/\n./\n /g;
                         $cond =~ s/\n./\n /g;
 
+                        # Find the real next line.
+                        $realline_next = $line_nr_next;
+                        if (defined $realline_next &&
+                            (!defined $lines[$realline_next - 1] ||
+                             substr($lines[$realline_next - 1], $off_next) =~ /^\s*$/)) {
+                                $realline_next++;
+                        }
+
                         my $s = $stat;
                         $s =~ s/{.*$//s;
 
@@ -1372,6 +1455,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 +1617,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++;
+                                        }
                                 }
                         }
 
@@ -1594,8 +1680,8 @@ sub process {
                 }
 
 # check for initialisation to aggregates open brace on the next line
-                if ($prevline =~ /$Declare\s*$Ident\s*=\s*$/ &&
-                    $line =~ /^.\s*{/) {
+                if ($line =~ /^.\s*{/ &&
+                    $prevline =~ /(?:^|[^=])=\s*$/) {
                         ERROR("that open brace { should be on the previous line\n" . $hereprev);
                 }
 
@@ -1620,21 +1706,40 @@ sub process {
                 $line =~ s@//.*@@;
                 $opline =~ s@//.*@@;
 
-#EXPORT_SYMBOL should immediately follow its function closing }.
-                if (($line =~ /EXPORT_SYMBOL.*\((.*)\)/) ||
-                    ($line =~ /EXPORT_UNUSED_SYMBOL.*\((.*)\)/)) {
+# EXPORT_SYMBOL should immediately follow the thing it is exporting, consider
+# the whole statement.
+#print "APW <$lines[$realline_next - 1]>\n";
+                if (defined $realline_next &&
+                    exists $lines[$realline_next - 1] &&
+                    !defined $suppress_export{$realline_next} &&
+                    ($lines[$realline_next - 1] =~ /EXPORT_SYMBOL.*\((.*)\)/ ||
+                     $lines[$realline_next - 1] =~ /EXPORT_UNUSED_SYMBOL.*\((.*)\)/)) {
                         my $name = $1;
-                        if ($prevline !~ /(?:
-                                ^.}|
+                        if ($stat !~ /(?:
+                                \n.}\s*$|
                                 ^.DEFINE_$Ident\(\Q$name\E\)|
                                 ^.DECLARE_$Ident\(\Q$name\E\)|
                                 ^.LIST_HEAD\(\Q$name\E\)|
-                                ^.$Type\s*\(\s*\*\s*\Q$name\E\s*\)\s*\(|
-                                \b\Q$name\E(?:\s+$Attribute)?\s*(?:;|=|\[)
+                                ^.(?:$Storage\s+)?$Type\s*\(\s*\*\s*\Q$name\E\s*\)\s*\(|
+                                \b\Q$name\E(?:\s+$Attribute)*\s*(?:;|=|\[|\()
                             )/x) {
-                                WARN("EXPORT_SYMBOL(foo); should immediately follow its function/variable\n" . $herecurr);
+#print "FOO A<$lines[$realline_next - 1]> stat<$stat> name<$name>\n";
+                                $suppress_export{$realline_next} = 2;
+                        } else {
+                                $suppress_export{$realline_next} = 1;
                         }
                 }
+                if (!defined $suppress_export{$linenr} &&
+                    $prevline =~ /^.\s*$/ &&
+                    ($line =~ /EXPORT_SYMBOL.*\((.*)\)/ ||
+                     $line =~ /EXPORT_UNUSED_SYMBOL.*\((.*)\)/)) {
+#print "FOO B <$lines[$linenr - 1]>\n";
+                        $suppress_export{$linenr} = 2;
+                }
+                if (defined $suppress_export{$linenr} &&
+                    $suppress_export{$linenr} == 2) {
+                        WARN("EXPORT_SYMBOL(foo); should immediately follow its function/variable\n" . $herecurr);
+                }
 
 # check for external initialisers.
                 if ($line =~ /^.$Type\s*$Ident\s*(?:\s+$Modifier)*\s*=\s*(0|NULL|false)\s*;/) {
@@ -1891,7 +1996,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 +2348,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/dtc/.gitignore b/scripts/dtc/.gitignore
new file mode 100644
index 000000000000..095acb49a374
--- /dev/null
+++ b/scripts/dtc/.gitignore
@@ -0,0 +1,5 @@
+dtc
+dtc-lexer.lex.c
+dtc-parser.tab.c
+dtc-parser.tab.h
+
diff --git a/scripts/extract-ikconfig b/scripts/extract-ikconfig
index 72997c353cb3..de233ff43c1c 100755
--- a/scripts/extract-ikconfig
+++ b/scripts/extract-ikconfig
@@ -17,6 +17,10 @@ dump_config() {
         return
     fi
     end=`$binoffset $file $IKCFG_ED 2>/dev/null`
+    [ "$?" != "0" ] && end="-1"
+    if [ "$end" -eq "-1" ]; then
+        return
+    fi
 
     start=`expr $start + 8`
     size=`expr $end - $start`
@@ -55,6 +59,8 @@ dump_config "$image"
 GZHDR1="0x1f 0x8b 0x08 0x00"
 GZHDR2="0x1f 0x8b 0x08 0x08"
 
+ELFHDR="0x7f 0x45 0x4c 0x46"
+
 # vmlinux.gz: Check for a compressed images
 off=`$binoffset "$image" $GZHDR1 2>/dev/null`
 [ "$?" != "0" ] && off="-1"
@@ -69,6 +75,14 @@ elif [ "$off" -ne "-1" ]; then
         (dd ibs="$off" skip=1 count=0 && dd bs=512k) <"$image" 2>/dev/null | \
                 zcat >"$TMPFILE"
         dump_config "$TMPFILE"
+
+# check if this is simply an ELF file
+else
+        off=`$binoffset "$image" $ELFHDR 2>/dev/null`
+        [ "$?" != "0" ] && off="-1"
+        if [ "$off" -eq "0" ]; then
+                dump_config "$image"
+        fi
 fi
 
 echo "ERROR: Unable to extract kernel configuration information."
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 3e733146cd51..102b76608f35 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -13,7 +13,7 @@
 use strict;
 
 my $P = $0;
-my $V = '0.16';
+my $V = '0.21';
 
 use Getopt::Long qw(:config no_auto_abbrev);
 
@@ -27,14 +27,19 @@ my $email_git = 1;
 my $email_git_penguin_chiefs = 0;
 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;
 my $web = 0;
 my $subsystem = 0;
 my $status = 0;
+my $keywords = 1;
 my $from_filename = 0;
+my $pattern_depth = 0;
 my $version = 0;
 my $help = 0;
 
@@ -65,7 +70,10 @@ if (!GetOptions(
                 'git-chief-penguins!' => \$email_git_penguin_chiefs,
                 'git-min-signatures=i' => \$email_git_min_signatures,
                 '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,
@@ -76,6 +84,8 @@ if (!GetOptions(
                 'status!' => \$status,
                 'scm!' => \$scm,
                 'web!' => \$web,
+                'pattern-depth=i' => \$pattern_depth,
+                'k|keywords!' => \$keywords,
                 'f|file' => \$from_filename,
                 'v|version' => \$version,
                 'h|help' => \$help,
@@ -99,14 +109,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";
 }
@@ -119,6 +134,8 @@ if (!top_of_kernel_tree($lk_path)) {
 ## Read MAINTAINERS for type/value pairs
 
 my @typevalue = ();
+my %keyword_hash;
+
 open(MAINT, "<${lk_path}MAINTAINERS") || die "$P: Can't open MAINTAINERS\n";
 while (<MAINT>) {
     my $line = $_;
@@ -132,6 +149,12 @@ while (<MAINT>) {
             $value =~ s@\.@\\\.@g;       ##Convert . to \.
             $value =~ s/\*/\.\*/g;       ##Convert * to .*
             $value =~ s/\?/\./g;         ##Convert ? to .
+            ##if pattern is a directory and it lacks a trailing slash, add one
+            if ((-d $value)) {
+                $value =~ s@([^/])$@$1/@;
+            }
+        } elsif ($type eq "K") {
+            $keyword_hash{@typevalue} = $value;
         }
         push(@typevalue, "$type:$value");
     } elsif (!/^(\s)*$/) {
@@ -141,26 +164,81 @@ 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 = ();
+my @keyword_tvi = ();
 
 foreach my $file (@ARGV) {
-    next if ((-d $file));
-    if (!(-f $file)) {
+    ##if $file is a directory and it lacks a trailing slash, add one
+    if ((-d $file)) {
+        $file =~ s@([^/])$@$1/@;
+    } elsif (!(-f $file)) {
         die "$P: file '${file}' not found\n";
     }
     if ($from_filename) {
         push(@files, $file);
+        if (-f $file && $keywords) {
+            open(FILE, "<$file") or die "$P: Can't open ${file}\n";
+            while (<FILE>) {
+                my $patch_line = $_;
+                foreach my $line (keys %keyword_hash) {
+                    if ($patch_line =~ m/^.*$keyword_hash{$line}/x) {
+                        push(@keyword_tvi, $line);
+                    }
+                }
+            }
+            close(FILE);
+        }
     } else {
         my $file_cnt = @files;
+        my $lastfile;
         open(PATCH, "<$file") or die "$P: Can't open ${file}\n";
         while (<PATCH>) {
+            my $patch_line = $_;
             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");
+                }
+            } elsif ($keywords) {
+                foreach my $line (keys %keyword_hash) {
+                    if ($patch_line =~ m/^[+-].*$keyword_hash{$line}/x) {
+                        push(@keyword_tvi, $line);
+                    }
+                }
             }
         }
         close(PATCH);
@@ -193,6 +271,7 @@ foreach my $file (@files) {
             if ($type eq 'X') {
                 if (file_match_pattern($file, $value)) {
                     $exclude = 1;
+                    last;
                 }
             }
         }
@@ -200,35 +279,52 @@ 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 ($keywords) {
+    @keyword_tvi = sort_and_uniq(@keyword_tvi);
+    foreach my $line (@keyword_tvi) {
+        add_categories($line);
+    }
 }
 
 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 {
@@ -250,22 +346,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);
 }
 
@@ -292,7 +388,7 @@ sub file_match_pattern {
 sub usage {
     print <<EOT;
 usage: $P [options] patchfile
-       $P [options] -f file
+       $P [options] -f file|directory
 version: $V
 
 MAINTAINER field selection options:
@@ -301,11 +397,14 @@ MAINTAINER field selection options:
     --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-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
@@ -313,15 +412,29 @@ 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))
+  --keywords => scan patch for keywords (default: 1 (on))
   --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-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
 }
 
@@ -352,30 +465,99 @@ 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;
 
-    my $formatted_email = "";
+    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;
+
+    $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;
@@ -396,19 +578,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") {
@@ -418,31 +600,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 {
@@ -458,7 +650,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");
+        }
     }
 }
 
@@ -474,6 +668,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) = @_;
 
@@ -482,6 +702,8 @@ sub recent_git_signoffs {
     my $output = "";
     my $count = 0;
     my @lines = ();
+    my %hash;
+    my $total_sign_offs;
 
     if (which("git") eq "") {
         warn("$P: git not found.  Add --nogit to options?\n");
@@ -494,44 +716,120 @@ sub recent_git_signoffs {
     }
 
     $cmd = "git log --since=${email_git_since} -- ${file}";
-    $cmd .= " | grep -Ei \"^[-_         a-z]+by:.*\\\@.*\$\"";
+
+    $output = `${cmd}`;
+    $output =~ s/^\s*//gm;
+
+    @lines = split("\n", $output);
+
+    @lines = grep(/^[-_         a-z]+by:.*\@.*$/i, @lines);
     if (!$email_git_penguin_chiefs) {
-        $cmd .= " | grep -Ev \"${penguin_chiefs}\"";
+        @lines = grep(!/${penguin_chiefs}/i, @lines);
     }
-    $cmd .= " | cut -f2- -d\":\"";
-    $cmd .= " | sort | uniq -c | sort -rn";
+    # 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}`;
-    $output =~ s/^\s*//gm;
 
     @lines = split("\n", $output);
     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) {
-                last;
-            }
-        } else {
-            die("$P: Unexpected git output: ${line}\n");
+        if ($line =~ m/^(\w+) /) {
+            push (@commits, $1);
         }
-        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);
+    }
+    return @commits;
+}
+
+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);
+        }
+    } 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);
+    }
 }
 
 sub uniq {
diff --git a/scripts/headers_install.pl b/scripts/headers_install.pl
index c6ae4052ab43..b89ca2c58fdb 100644
--- a/scripts/headers_install.pl
+++ b/scripts/headers_install.pl
@@ -20,7 +20,7 @@ use strict;
 
 my ($readdir, $installdir, $arch, @files) = @ARGV;
 
-my $unifdef = "scripts/unifdef -U__KERNEL__";
+my $unifdef = "scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__";
 
 foreach my $file (@files) {
         local *INFILE;
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/kconfig/Makefile b/scripts/kconfig/Makefile
index 5ddf8becd7a2..6d69c7ccdcc7 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -2,7 +2,8 @@
 # Kernel configuration targets
 # These targets are used from top-level makefile
 
-PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config
+PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config \
+        localmodconfig localyesconfig
 
 ifdef KBUILD_KCONFIG
 Kconfig := $(KBUILD_KCONFIG)
@@ -28,6 +29,35 @@ oldconfig: $(obj)/conf
 silentoldconfig: $(obj)/conf
         $< -s $(Kconfig)
 
+localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
+        $(Q)perl $< $(Kconfig) > .tmp.config
+        $(Q)if [ -f .config ]; then                             \
+                        cmp -s .tmp.config .config ||           \
+                        (mv -f .config .config.old.1;           \
+                         mv -f .tmp.config .config;             \
+                         $(obj)/conf -s $(Kconfig);             \
+                         mv -f .config.old.1 .config.old)       \
+        else                                                    \
+                        mv -f .tmp.config .config;              \
+                        $(obj)/conf -s $(Kconfig);              \
+        fi
+        $(Q)rm -f .tmp.config
+
+localyesconfig: $(obj)/streamline_config.pl $(obj)/conf
+        $(Q)perl $< $(Kconfig) > .tmp.config
+        $(Q)sed -i s/=m/=y/ .tmp.config
+        $(Q)if [ -f .config ]; then                             \
+                        cmp -s .tmp.config .config ||           \
+                        (mv -f .config .config.old.1;           \
+                         mv -f .tmp.config .config;             \
+                         $(obj)/conf -s $(Kconfig);             \
+                         mv -f .config.old.1 .config.old)       \
+        else                                                    \
+                        mv -f .tmp.config .config;              \
+                        $(obj)/conf -s $(Kconfig);              \
+        fi
+        $(Q)rm -f .tmp.config
+
 # Create new linux.pot file
 # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files
 # The symlink is used to repair a deficiency in arch/um
@@ -83,6 +113,8 @@ help:
         @echo  '  xconfig         - Update current config utilising a QT based front-end'
         @echo  '  gconfig         - Update current config utilising a GTK based front-end'
         @echo  '  oldconfig       - Update current config utilising a provided .config as base'
+        @echo  '  localmodconfig  - Update current config disabling modules not loaded'
+        @echo  '  localyesconfig  - Update current config converting local mods to core'
         @echo  '  silentoldconfig - Same as oldconfig, but quietly, additionally update deps'
         @echo  '  randconfig      - New config with random answer to all options'
         @echo  '  defconfig       - New config with default answer to all options'
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 3baaaecd6b13..9960d1c303f8 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -38,14 +38,14 @@ static int conf_cnt;
 static char line[128];
 static struct menu *rootEntry;
 
-static char nohelp_text[] = N_("Sorry, no help available for this option yet.\n");
-
-static const char *get_help(struct menu *menu)
+static void print_help(struct menu *menu)
 {
-        if (menu_has_help(menu))
-                return _(menu_get_help(menu));
-        else
-                return nohelp_text;
+        struct gstr help = str_new();
+
+        menu_get_ext_help(menu, &help);
+
+        printf("\n%s\n", str_get(&help));
+        str_free(&help);
 }
 
 static void strip(char *str)
@@ -121,7 +121,7 @@ static int conf_askvalue(struct symbol *sym, const char *def)
         return 1;
 }
 
-int conf_string(struct menu *menu)
+static int conf_string(struct menu *menu)
 {
         struct symbol *sym = menu->sym;
         const char *def;
@@ -140,7 +140,7 @@ int conf_string(struct menu *menu)
                 case '?':
                         /* print help */
                         if (line[1] == '\n') {
-                                printf("\n%s\n", get_help(menu));
+                                print_help(menu);
                                 def = NULL;
                                 break;
                         }
@@ -220,7 +220,7 @@ static int conf_sym(struct menu *menu)
                 if (sym_set_tristate_value(sym, newval))
                         return 0;
 help:
-                printf("\n%s\n", get_help(menu));
+                print_help(menu);
         }
 }
 
@@ -307,7 +307,7 @@ static int conf_choice(struct menu *menu)
                         fgets(line, 128, stdin);
                         strip(line);
                         if (line[0] == '?') {
-                                printf("\n%s\n", get_help(menu));
+                                print_help(menu);
                                 continue;
                         }
                         if (!line[0])
@@ -331,7 +331,7 @@ static int conf_choice(struct menu *menu)
                 if (!child)
                         continue;
                 if (line[strlen(line) - 1] == '?') {
-                        printf("\n%s\n", get_help(child));
+                        print_help(child);
                         continue;
                 }
                 sym_set_choice_value(sym, child->sym);
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index a04da3459f0f..b55e72ff2fc6 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -560,7 +560,7 @@ int conf_write(const char *name)
         return 0;
 }
 
-int conf_split_config(void)
+static int conf_split_config(void)
 {
         const char *name;
         char path[128];
diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c
index 579ece4fa584..edd3f39a080a 100644
--- a/scripts/kconfig/expr.c
+++ b/scripts/kconfig/expr.c
@@ -348,7 +348,7 @@ struct expr *expr_trans_bool(struct expr *e)
 /*
  * e1 || e2 -> ?
  */
-struct expr *expr_join_or(struct expr *e1, struct expr *e2)
+static struct expr *expr_join_or(struct expr *e1, struct expr *e2)
 {
         struct expr *tmp;
         struct symbol *sym1, *sym2;
@@ -412,7 +412,7 @@ struct expr *expr_join_or(struct expr *e1, struct expr *e2)
         return NULL;
 }
 
-struct expr *expr_join_and(struct expr *e1, struct expr *e2)
+static struct expr *expr_join_and(struct expr *e1, struct expr *e2)
 {
         struct expr *tmp;
         struct symbol *sym1, *sym2;
@@ -1098,6 +1098,8 @@ void expr_fprint(struct expr *e, FILE *out)
 static void expr_print_gstr_helper(void *data, struct symbol *sym, const char *str)
 {
         str_append((struct gstr*)data, str);
+        if (sym)
+                str_printf((struct gstr*)data, " [=%s]", sym_get_string_value(sym));
 }
 
 void expr_gstr_print(struct expr *e, struct gstr *gs)
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
index 199b22bb49e2..65464366fe38 100644
--- a/scripts/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -456,19 +456,9 @@ static void text_insert_help(struct menu *menu)
         GtkTextBuffer *buffer;
         GtkTextIter start, end;
         const char *prompt = _(menu_get_prompt(menu));
-        gchar *name;
-        const char *help;
+        struct gstr help = str_new();
 
-        help = menu_get_help(menu);
-
-        /* Gettextize if the help text not empty */
-        if ((help != 0) && (help[0] != 0))
-                help = _(help);
-
-        if (menu->sym && menu->sym->name)
-                name = g_strdup_printf(menu->sym->name);
-        else
-                name = g_strdup("");
+        menu_get_ext_help(menu, &help);
 
         buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_w));
         gtk_text_buffer_get_bounds(buffer, &start, &end);
@@ -478,14 +468,11 @@ static void text_insert_help(struct menu *menu)
         gtk_text_buffer_get_end_iter(buffer, &end);
         gtk_text_buffer_insert_with_tags(buffer, &end, prompt, -1, tag1,
                                          NULL);
-        gtk_text_buffer_insert_at_cursor(buffer, " ", 1);
-        gtk_text_buffer_get_end_iter(buffer, &end);
-        gtk_text_buffer_insert_with_tags(buffer, &end, name, -1, tag1,
-                                         NULL);
         gtk_text_buffer_insert_at_cursor(buffer, "\n\n", 2);
         gtk_text_buffer_get_end_iter(buffer, &end);
-        gtk_text_buffer_insert_with_tags(buffer, &end, help, -1, tag2,
+        gtk_text_buffer_insert_with_tags(buffer, &end, str_get(&help), -1, tag2,
                                          NULL);
+        str_free(&help);
 }
 
 
diff --git a/scripts/kconfig/gconf.glade b/scripts/kconfig/gconf.glade
index 803233fdd6dd..b1c86c19292c 100644
--- a/scripts/kconfig/gconf.glade
+++ b/scripts/kconfig/gconf.glade
@@ -547,7 +547,7 @@
                   <property name="headers_visible">True</property>
                   <property name="rules_hint">False</property>
                   <property name="reorderable">False</property>
-                  <property name="enable_search">True</property>
+                  <property name="enable_search">False</property>
                   <signal name="cursor_changed" handler="on_treeview2_cursor_changed" last_modification_time="Sun, 12 Jan 2003 15:58:22 GMT"/>
                   <signal name="button_press_event" handler="on_treeview1_button_press_event" last_modification_time="Sun, 12 Jan 2003 16:03:52 GMT"/>
                   <signal name="key_press_event" handler="on_treeview2_key_press_event" last_modification_time="Sun, 12 Jan 2003 16:11:44 GMT"/>
@@ -582,7 +582,7 @@
                       <property name="headers_visible">True</property>
                       <property name="rules_hint">False</property>
                       <property name="reorderable">False</property>
-                      <property name="enable_search">True</property>
+                      <property name="enable_search">False</property>
                       <signal name="cursor_changed" handler="on_treeview2_cursor_changed" last_modification_time="Sun, 12 Jan 2003 15:57:55 GMT"/>
                       <signal name="button_press_event" handler="on_treeview2_button_press_event" last_modification_time="Sun, 12 Jan 2003 15:57:58 GMT"/>
                       <signal name="key_press_event" handler="on_treeview2_key_press_event" last_modification_time="Sun, 12 Jan 2003 15:58:01 GMT"/>
diff --git a/scripts/kconfig/kxgettext.c b/scripts/kconfig/kxgettext.c
index 8d9ce22b0fc5..dcc3fcc0cc9a 100644
--- a/scripts/kconfig/kxgettext.c
+++ b/scripts/kconfig/kxgettext.c
@@ -166,7 +166,7 @@ static int message__add(const char *msg, char *option, char *file, int lineno)
         return rc;
 }
 
-void menu_build_message_list(struct menu *menu)
+static void menu_build_message_list(struct menu *menu)
 {
         struct menu *child;
 
@@ -211,7 +211,7 @@ static void message__print_gettext_msgid_msgstr(struct message *self)
                "msgstr \"\"\n", self->msg);
 }
 
-void menu__xgettext(void)
+static void menu__xgettext(void)
 {
         struct message *m = message__list;
 
diff --git a/scripts/kconfig/lkc_proto.h b/scripts/kconfig/lkc_proto.h
index 8e69461313d1..ffeb532b2cff 100644
--- a/scripts/kconfig/lkc_proto.h
+++ b/scripts/kconfig/lkc_proto.h
@@ -17,6 +17,8 @@ P(menu_get_root_menu,struct menu *,(struct menu *menu));
 P(menu_get_parent_menu,struct menu *,(struct menu *menu));
 P(menu_has_help,bool,(struct menu *menu));
 P(menu_get_help,const char *,(struct menu *menu));
+P(get_symbol_str,void,(struct gstr *r, struct symbol *sym));
+P(menu_get_ext_help,void,(struct menu *menu, struct gstr *help));
 
 /* symbol.c */
 P(symbol_hash,struct symbol *,[SYMBOL_HASHSIZE]);
diff --git a/scripts/kconfig/lxdialog/util.c b/scripts/kconfig/lxdialog/util.c
index 86d95cca46a7..f2375ad7ebc9 100644
--- a/scripts/kconfig/lxdialog/util.c
+++ b/scripts/kconfig/lxdialog/util.c
@@ -19,6 +19,8 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <stdarg.h>
+
 #include "dialog.h"
 
 struct dialog_info dlg;
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 3bcacb4bfd3a..d82953573588 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -199,8 +199,6 @@ inputbox_instructions_string[] = N_(
 setmod_text[] = N_(
         "This feature depends on another which has been configured as a module.\n"
         "As a result, this feature will be built as a module."),
-nohelp_text[] = N_(
-        "There is no help available for this kernel option.\n"),
 load_config_text[] = N_(
         "Enter the name of the configuration file you wish to load.  "
         "Accept the name shown to restore the configuration you "
@@ -284,66 +282,6 @@ static void show_textbox(const char *title, const char *text, int r, int c);
 static void show_helptext(const char *title, const char *text);
 static void show_help(struct menu *menu);
 
-static void get_prompt_str(struct gstr *r, struct property *prop)
-{
-        int i, j;
-        struct menu *submenu[8], *menu;
-
-        str_printf(r, _("Prompt: %s\n"), _(prop->text));
-        str_printf(r, _("  Defined at %s:%d\n"), prop->menu->file->name,
-                prop->menu->lineno);
-        if (!expr_is_yes(prop->visible.expr)) {
-                str_append(r, _("  Depends on: "));
-                expr_gstr_print(prop->visible.expr, r);
-                str_append(r, "\n");
-        }
-        menu = prop->menu->parent;
-        for (i = 0; menu != &rootmenu && i < 8; menu = menu->parent)
-                submenu[i++] = menu;
-        if (i > 0) {
-                str_printf(r, _("  Location:\n"));
-                for (j = 4; --i >= 0; j += 2) {
-                        menu = submenu[i];
-                        str_printf(r, "%*c-> %s", j, ' ', _(menu_get_prompt(menu)));
-                        if (menu->sym) {
-                                str_printf(r, " (%s [=%s])", menu->sym->name ?
-                                        menu->sym->name : _("<choice>"),
-                                        sym_get_string_value(menu->sym));
-                        }
-                        str_append(r, "\n");
-                }
-        }
-}
-
-static void get_symbol_str(struct gstr *r, struct symbol *sym)
-{
-        bool hit;
-        struct property *prop;
-
-        if (sym && sym->name)
-                str_printf(r, "Symbol: %s [=%s]\n", sym->name,
-                                                    sym_get_string_value(sym));
-        for_all_prompts(sym, prop)
-                get_prompt_str(r, prop);
-        hit = false;
-        for_all_properties(sym, prop, P_SELECT) {
-                if (!hit) {
-                        str_append(r, "  Selects: ");
-                        hit = true;
-                } else
-                        str_printf(r, " && ");
-                expr_gstr_print(prop->expr, r);
-        }
-        if (hit)
-                str_append(r, "\n");
-        if (sym->rev_dep.expr) {
-                str_append(r, _("  Selected by: "));
-                expr_gstr_print(sym->rev_dep.expr, r);
-                str_append(r, "\n");
-        }
-        str_append(r, "\n\n");
-}
-
 static struct gstr get_relations_str(struct symbol **sym_arr)
 {
         struct symbol *sym;
@@ -699,19 +637,9 @@ static void show_helptext(const char *title, const char *text)
 static void show_help(struct menu *menu)
 {
         struct gstr help = str_new();
-        struct symbol *sym = menu->sym;
-
-        if (menu_has_help(menu))
-        {
-                if (sym->name) {
-                        str_printf(&help, "CONFIG_%s:\n\n", sym->name);
-                        str_append(&help, _(menu_get_help(menu)));
-                        str_append(&help, "\n");
-                }
-        } else {
-                str_append(&help, nohelp_text);
-        }
-        get_symbol_str(&help, sym);
+
+        menu_get_ext_help(menu, &help);
+
         show_helptext(_(menu_get_prompt(menu)), str_get(&help));
         str_free(&help);
 }
@@ -888,6 +816,8 @@ int main(int ac, char **av)
                         single_menu_mode = 1;
         }
 
+        initscr();
+
         getyx(stdscr, saved_y, saved_x);
         if (init_dialog(NULL)) {
                 fprintf(stderr, N_("Your display is too small to run Menuconfig!\n"));
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 07ff8d105c9d..059a2465c574 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -9,6 +9,9 @@
 #define LKC_DIRECT_LINK
 #include "lkc.h"
 
+static const char nohelp_text[] = N_(
+        "There is no help available for this kernel option.\n");
+
 struct menu rootmenu;
 static struct menu **last_entry_ptr;
 
@@ -74,7 +77,7 @@ void menu_end_menu(void)
         current_menu = current_menu->parent;
 }
 
-struct expr *menu_check_dep(struct expr *e)
+static struct expr *menu_check_dep(struct expr *e)
 {
         if (!e)
                 return e;
@@ -184,7 +187,7 @@ static int menu_range_valid_sym(struct symbol *sym, struct symbol *sym2)
                (sym2->type == S_UNKNOWN && sym_string_valid(sym, sym2->name));
 }
 
-void sym_check_prop(struct symbol *sym)
+static void sym_check_prop(struct symbol *sym)
 {
         struct property *prop;
         struct symbol *sym2;
@@ -451,3 +454,80 @@ const char *menu_get_help(struct menu *menu)
         else
                 return "";
 }
+
+static void get_prompt_str(struct gstr *r, struct property *prop)
+{
+        int i, j;
+        struct menu *submenu[8], *menu;
+
+        str_printf(r, _("Prompt: %s\n"), _(prop->text));
+        str_printf(r, _("  Defined at %s:%d\n"), prop->menu->file->name,
+                prop->menu->lineno);
+        if (!expr_is_yes(prop->visible.expr)) {
+                str_append(r, _("  Depends on: "));
+                expr_gstr_print(prop->visible.expr, r);
+                str_append(r, "\n");
+        }
+        menu = prop->menu->parent;
+        for (i = 0; menu != &rootmenu && i < 8; menu = menu->parent)
+                submenu[i++] = menu;
+        if (i > 0) {
+                str_printf(r, _("  Location:\n"));
+                for (j = 4; --i >= 0; j += 2) {
+                        menu = submenu[i];
+                        str_printf(r, "%*c-> %s", j, ' ', _(menu_get_prompt(menu)));
+                        if (menu->sym) {
+                                str_printf(r, " (%s [=%s])", menu->sym->name ?
+                                        menu->sym->name : _("<choice>"),
+                                        sym_get_string_value(menu->sym));
+                        }
+                        str_append(r, "\n");
+                }
+        }
+}
+
+void get_symbol_str(struct gstr *r, struct symbol *sym)
+{
+        bool hit;
+        struct property *prop;
+
+        if (sym && sym->name)
+                str_printf(r, "Symbol: %s [=%s]\n", sym->name,
+                           sym_get_string_value(sym));
+        for_all_prompts(sym, prop)
+                get_prompt_str(r, prop);
+        hit = false;
+        for_all_properties(sym, prop, P_SELECT) {
+                if (!hit) {
+                        str_append(r, "  Selects: ");
+                        hit = true;
+                } else
+                        str_printf(r, " && ");
+                expr_gstr_print(prop->expr, r);
+        }
+        if (hit)
+                str_append(r, "\n");
+        if (sym->rev_dep.expr) {
+                str_append(r, _("  Selected by: "));
+                expr_gstr_print(sym->rev_dep.expr, r);
+                str_append(r, "\n");
+        }
+        str_append(r, "\n\n");
+}
+
+void menu_get_ext_help(struct menu *menu, struct gstr *help)
+{
+        struct symbol *sym = menu->sym;
+
+        if (menu_has_help(menu)) {
+                if (sym->name) {
+                        str_printf(help, "CONFIG_%s:\n\n", sym->name);
+                        str_append(help, _(menu_get_help(menu)));
+                        str_append(help, "\n");
+                }
+        } else {
+                str_append(help, nohelp_text);
+        }
+        if (sym)
+                get_symbol_str(help, sym);
+}
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index ce7d508c7520..00c51507cfcc 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -1042,12 +1042,10 @@ void ConfigInfoView::menuInfo(void)
                 if (showDebug())
                         debug = debug_info(sym);
 
-                help = menu_get_help(menu);
-                /* Gettextize if the help text not empty */
-                if (help.isEmpty())
-                        help = print_filter(menu_get_help(menu));
-                else
-                        help = print_filter(_(menu_get_help(menu)));
+                struct gstr help_gstr = str_new();
+                menu_get_ext_help(menu, &help_gstr);
+                help = print_filter(str_get(&help_gstr));
+                str_free(&help_gstr);
         } else if (menu->prompt) {
                 head += "<big><b>";
                 head += print_filter(_(menu->prompt->text));
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
new file mode 100644
index 000000000000..95984db8e1e0
--- /dev/null
+++ b/scripts/kconfig/streamline_config.pl
@@ -0,0 +1,366 @@
+#!/usr/bin/perl -w
+#
+# Copywrite 2005-2009 - Steven Rostedt
+# Licensed under the terms of the GNU GPL License version 2
+#
+#  It's simple enough to figure out how this works.
+#  If not, then you can ask me at stripconfig@goodmis.org
+#
+# What it does?
+#
+#   If you have installed a Linux kernel from a distribution
+#   that turns on way too many modules than you need, and
+#   you only want the modules you use, then this program
+#   is perfect for you.
+#
+#   It gives you the ability to turn off all the modules that are
+#   not loaded on your system.
+#
+# Howto:
+#
+#  1. Boot up the kernel that you want to stream line the config on.
+#  2. Change directory to the directory holding the source of the
+#       kernel that you just booted.
+#  3. Copy the configuraton file to this directory as .config
+#  4. Have all your devices that you need modules for connected and
+#      operational (make sure that their corresponding modules are loaded)
+#  5. Run this script redirecting the output to some other file
+#       like config_strip.
+#  6. Back up your old config (if you want too).
+#  7. copy the config_strip file to .config
+#  8. Run "make oldconfig"
+#
+#  Now your kernel is ready to be built with only the modules that
+#  are loaded.
+#
+# Here's what I did with my Debian distribution.
+#
+#    cd /usr/src/linux-2.6.10
+#    cp /boot/config-2.6.10-1-686-smp .config
+#    ~/bin/streamline_config > config_strip
+#    mv .config config_sav
+#    mv config_strip .config
+#    make oldconfig
+#
+my $config = ".config";
+my $linuxpath = ".";
+
+my $uname = `uname -r`;
+chomp $uname;
+
+my @searchconfigs = (
+        {
+            "file" => ".config",
+            "exec" => "cat",
+        },
+        {
+            "file" => "/proc/config.gz",
+            "exec" => "zcat",
+        },
+        {
+            "file" => "/boot/config-$uname",
+            "exec" => "cat",
+        },
+        {
+            "file" => "/boot/vmlinuz-$uname",
+            "exec" => "scripts/extract-ikconfig",
+            "test" => "scripts/extract-ikconfig",
+        },
+        {
+            "file" => "vmlinux",
+            "exec" => "scripts/extract-ikconfig",
+            "test" => "scripts/extract-ikconfig",
+        },
+        {
+            "file" => "/lib/modules/$uname/kernel/kernel/configs.ko",
+            "exec" => "scripts/extract-ikconfig",
+            "test" => "scripts/extract-ikconfig",
+        },
+        {
+            "file" => "kernel/configs.ko",
+            "exec" => "scripts/extract-ikconfig",
+            "test" => "scripts/extract-ikconfig",
+        },
+        {
+            "file" => "kernel/configs.o",
+            "exec" => "scripts/extract-ikconfig",
+            "test" => "scripts/extract-ikconfig",
+        },
+);
+
+sub find_config {
+    foreach my $conf (@searchconfigs) {
+        my $file = $conf->{"file"};
+
+        next if ( ! -f "$file");
+
+        if (defined($conf->{"test"})) {
+            `$conf->{"test"} $conf->{"file"} 2>/dev/null`;
+            next if ($?);
+        }
+
+        my $exec = $conf->{"exec"};
+
+        print STDERR "using config: '$file'\n";
+
+        open(CIN, "$exec $file |") || die "Failed to run $exec $file";
+        return;
+    }
+    die "No config file found";
+}
+
+find_config;
+
+my @makefiles = `find $linuxpath -name Makefile`;
+my %depends;
+my %selects;
+my %prompts;
+my %objects;
+my $var;
+my $cont = 0;
+
+# Get the top level Kconfig file (passed in)
+my $kconfig = $ARGV[0];
+
+# prevent recursion
+my %read_kconfigs;
+
+sub read_kconfig {
+    my ($kconfig) = @_;
+
+    my $state = "NONE";
+    my $config;
+    my @kconfigs;
+
+    open(KIN, $kconfig) || die "Can't open $kconfig";
+    while (<KIN>) {
+        chomp;
+
+        # collect any Kconfig sources
+        if (/^source\s*"(.*)"/) {
+            $kconfigs[$#kconfigs+1] = $1;
+        }
+
+        # configs found
+        if (/^\s*config\s+(\S+)\s*$/) {
+            $state = "NEW";
+            $config = $1;
+
+        # collect the depends for the config
+        } elsif ($state eq "NEW" && /^\s*depends\s+on\s+(.*)$/) {
+            $state = "DEP";
+            $depends{$config} = $1;
+        } elsif ($state eq "DEP" && /^\s*depends\s+on\s+(.*)$/) {
+            $depends{$config} .= " " . $1;
+
+        # Get the configs that select this config
+        } elsif ($state ne "NONE" && /^\s*select\s+(\S+)/) {
+            if (defined($selects{$1})) {
+                $selects{$1} .= " " . $config;
+            } else {
+                $selects{$1} = $config;
+            }
+
+        # configs without prompts must be selected
+        } elsif ($state ne "NONE" && /^\s*tristate\s\S/) {
+            # note if the config has a prompt
+            $prompt{$config} = 1;
+
+        # stop on "help"
+        } elsif (/^\s*help\s*$/) {
+            $state = "NONE";
+        }
+    }
+    close(KIN);
+
+    # read in any configs that were found.
+    foreach $kconfig (@kconfigs) {
+        if (!defined($read_kconfigs{$kconfig})) {
+            $read_kconfigs{$kconfig} = 1;
+            read_kconfig($kconfig);
+        }
+    }
+}
+
+if ($kconfig) {
+    read_kconfig($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>) {
+        my $objs;
+
+        # is this a line after a line with a backslash?
+        if ($cont && /(\S.*)$/) {
+            $objs = $1;
+        }
+        $cont = 0;
+
+        # collect objects after obj-$(CONFIG_FOO_BAR)
+        if (/obj-\$\((CONFIG_[^\)]*)\)\s*[+:]?=\s*(.*)/) {
+            $var = $1;
+            $objs = $2;
+        }
+        if (defined($objs)) {
+            # test if the line ends with a backslash
+            if ($objs =~ m,(.*)\\$,) {
+                $objs = $1;
+                $cont = 1;
+            }
+
+            foreach my $obj (split /\s+/,$objs) {
+                $obj =~ s/-/_/g;
+                if ($obj =~ /(.*)\.o$/) {
+                    # Objects may bes enabled by more than one config.
+                    # Store configs in an array.
+                    my @arr;
+
+                    if (defined($objects{$1})) {
+                        @arr = @{$objects{$1}};
+                    }
+
+                    $arr[$#arr+1] = $var;
+
+                    # The objects have a hash mapping to a reference
+                    # of an array of configs.
+                    $objects{$1} = \@arr;
+                }
+            }
+        }
+    }
+    close(MIN);
+}
+
+my %modules;
+
+# see what modules are loaded on this system
+open(LIN,"/sbin/lsmod|") || die "Cant lsmod";
+while (<LIN>) {
+        next if (/^Module/);  # Skip the first line.
+        if (/^(\S+)/) {
+                $modules{$1} = 1;
+        }
+}
+close (LIN);
+
+# add to the configs hash all configs that are needed to enable
+# a loaded module.
+my %configs;
+foreach my $module (keys(%modules)) {
+    if (defined($objects{$module})) {
+        @arr = @{$objects{$module}};
+        foreach my $conf (@arr) {
+            $configs{$conf} = $module;
+        }
+    } else {
+        # Most likely, someone has a custom (binary?) module loaded.
+        print STDERR "$module config not found!!\n";
+    }
+}
+
+my $valid = "A-Za-z_0-9";
+my $repeat = 1;
+
+#
+# Note, we do not care about operands (like: &&, ||, !) we want to add any
+# config that is in the depend list of another config. This script does
+# not enable configs that are not already enabled. If we come across a
+# config A that depends on !B, we can still add B to the list of depends
+# to keep on. If A was on in the original config, B would not have been
+# and B would not be turned on by this script.
+#
+sub parse_config_dep_select
+{
+    my ($p) = @_;
+
+    while ($p =~ /[$valid]/) {
+
+        if ($p =~ /^[^$valid]*([$valid]+)/) {
+            my $conf = "CONFIG_" . $1;
+
+            $p =~ s/^[^$valid]*[$valid]+//;
+
+            if (!defined($configs{$conf})) {
+                # We must make sure that this config has its
+                # dependencies met.
+                $repeat = 1; # do again
+                $configs{$conf} = 1;
+            }
+        } else {
+            die "this should never happen";
+        }
+    }
+}
+
+while ($repeat) {
+    $repeat = 0;
+
+    foreach my $config (keys %configs) {
+        $config =~ s/^CONFIG_//;
+
+        if (defined($depends{$config})) {
+            # This config has dependencies. Make sure they are also included
+            parse_config_dep_select $depends{$config};
+        }
+
+        if (defined($prompt{$config}) || !defined($selects{$config})) {
+            next;
+        }
+
+        # config has no prompt and must be selected.
+        parse_config_dep_select $selects{$config};
+    }
+}
+
+my %setconfigs;
+
+# Finally, read the .config file and turn off any module enabled that
+# we could not find a reason to keep enabled.
+while(<CIN>) {
+
+    if (/CONFIG_IKCONFIG/) {
+        if (/# CONFIG_IKCONFIG is not set/) {
+            # enable IKCONFIG at least as a module
+            print "CONFIG_IKCONFIG=m\n";
+            # don't ask about PROC
+            print "# CONFIG_IKCONFIG_PROC is not set\n";
+        } else {
+            print;
+        }
+        next;
+    }
+
+    if (/^(CONFIG.*)=(m|y)/) {
+        if (defined($configs{$1})) {
+            $setconfigs{$1} = $2;
+        } elsif ($2 eq "m") {
+            print "# $1 is not set\n";
+            next;
+        }
+    }
+    print;
+}
+close(CIN);
+
+# Integrity check, make sure all modules that we want enabled do
+# indeed have their configs set.
+loop:
+foreach my $module (keys(%modules)) {
+    if (defined($objects{$module})) {
+        my @arr = @{$objects{$module}};
+        foreach my $conf (@arr) {
+            if (defined($setconfigs{$conf})) {
+                next loop;
+            }
+        }
+        print STDERR "module $module did not have configs";
+        foreach my $conf (@arr) {
+            print STDERR " " , $conf;
+        }
+        print STDERR "\n";
+    }
+}
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 18f3e5c33634..6c8fbbb66ebc 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -36,7 +36,7 @@ tristate modules_val;
 
 struct expr *sym_env_list;
 
-void sym_add_default(struct symbol *sym, const char *def)
+static void sym_add_default(struct symbol *sym, const char *def)
 {
         struct property *prop = prop_alloc(P_DEFAULT, sym);
 
@@ -125,7 +125,7 @@ struct property *sym_get_default_prop(struct symbol *sym)
         return NULL;
 }
 
-struct property *sym_get_range_prop(struct symbol *sym)
+static struct property *sym_get_range_prop(struct symbol *sym)
 {
         struct property *prop;
 
@@ -943,7 +943,7 @@ const char *prop_get_type_name(enum prop_type type)
         return "unknown";
 }
 
-void prop_add_env(const char *env)
+static void prop_add_env(const char *env)
 {
         struct symbol *sym, *sym2;
         struct property *prop;
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index ed591e9b7d1d..ea9f8a58678f 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1426,6 +1426,8 @@ sub dump_struct($$) {
         # strip comments:
         $members =~ s/\/\*.*?\*\///gos;
         $nested =~ s/\/\*.*?\*\///gos;
+        # strip kmemcheck_bitfield_{begin,end}.*;
+        $members =~ s/kmemcheck_bitfield_.*?;//gos;
 
         create_parameterlist($members, ';', $file);
         check_sections($file, $declaration_name, "struct", $sectcheck, $struct_actual, $nested);
@@ -1468,8 +1470,6 @@ sub dump_enum($$) {
             }
 
         }
-        # strip kmemcheck_bitfield_{begin,end}.*;
-        $members =~ s/kmemcheck_bitfield_.*?;//gos;
 
         output_declaration($declaration_name,
                            'enum',
@@ -1995,6 +1995,7 @@ sub process_file($) {
     my $identifier;
     my $func;
     my $descr;
+    my $in_purpose = 0;
     my $initial_section_counter = $section_counter;
 
     if (defined($ENV{'SRCTREE'})) {
@@ -2044,6 +2045,7 @@ sub process_file($) {
                     $descr =~ s/\s*$//;
                     $descr =~ s/\s+/ /;
                     $declaration_purpose = xml_escape($descr);
+                    $in_purpose = 1;
                 } else {
                     $declaration_purpose = "";
                 }
@@ -2090,6 +2092,7 @@ sub process_file($) {
                 }
 
                 $in_doc_sect = 1;
+                $in_purpose = 0;
                 $contents = $newcontents;
                 if ($contents ne "") {
                     while ((substr($contents, 0, 1) eq " ") ||
@@ -2119,11 +2122,19 @@ sub process_file($) {
             } elsif (/$doc_content/) {
                 # miguel-style comment kludge, look for blank lines after
                 # @parameter line to signify start of description
-                if ($1 eq "" &&
-                        ($section =~ m/^@/ || $section eq $section_context)) {
-                    dump_section($file, $section, xml_escape($contents));
-                    $section = $section_default;
-                    $contents = "";
+                if ($1 eq "") {
+                    if ($section =~ m/^@/ || $section eq $section_context) {
+                        dump_section($file, $section, xml_escape($contents));
+                        $section = $section_default;
+                        $contents = "";
+                    } else {
+                        $contents .= "\n";
+                    }
+                    $in_purpose = 0;
+                } elsif ($in_purpose == 1) {
+                    # Continued declaration purpose
+                    chomp($declaration_purpose);
+                    $declaration_purpose .= " " . xml_escape($1);
                 } else {
                     $contents .= $1 . "\n";
                 }
diff --git a/scripts/markup_oops.pl b/scripts/markup_oops.pl
index 528492bcba5b..5f0fcb712e29 100644
--- a/scripts/markup_oops.pl
+++ b/scripts/markup_oops.pl
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 
 use File::Basename;
+use Math::BigInt;
 
 # Copyright 2008, Intel Corporation
 #
@@ -172,8 +173,8 @@ while (<STDIN>) {
         parse_x86_regs($line);
 }
 
-my $decodestart = hex($target) - hex($func_offset);
-my $decodestop = hex($target) + 8192;
+my $decodestart = Math::BigInt->from_hex("0x$target") - Math::BigInt->from_hex("0x$func_offset");
+my $decodestop = Math::BigInt->from_hex("0x$target") + 8192;
 if ($target eq "0") {
         print "No oops found!\n";
         print "Usage: \n";
@@ -183,10 +184,7 @@ if ($target eq "0") {
 
 # if it's a module, we need to find the .ko file and calculate a load offset
 if ($module ne "") {
-        my $dir = dirname($filename);
-        $dir = $dir . "/";
-        my $mod = $module . ".ko";
-        my $modulefile = `find $dir -name $mod | head -1`;
+        my $modulefile = `modinfo $module | grep '^filename:' | awk '{ print \$2 }'`;
         chomp($modulefile);
         $filename = $modulefile;
         if ($filename eq "") {
diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
index 6a12dd9f1181..bce3d0fe6fbd 100755
--- a/scripts/mkcompile_h
+++ b/scripts/mkcompile_h
@@ -1,3 +1,5 @@
+#!/bin/sh
+
 TARGET=$1
 ARCH=$2
 SMP=$3
@@ -50,7 +52,7 @@ UTS_VERSION="$UTS_VERSION $CONFIG_FLAGS $TIMESTAMP"
 # Truncate to maximum length
 
 UTS_LEN=64
-UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\}\).*/\1/"
+UTS_TRUNCATE="cut -b -$UTS_LEN"
 
 # Generate a temporary compile.h
 
@@ -66,9 +68,13 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\}\).*/\1/"
   echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\"
 
   if [ -x /bin/dnsdomainname ]; then
-    echo \#define LINUX_COMPILE_DOMAIN \"`dnsdomainname | $UTS_TRUNCATE`\"
+    domain=`dnsdomainname 2> /dev/null`
   elif [ -x /bin/domainname ]; then
-    echo \#define LINUX_COMPILE_DOMAIN \"`domainname | $UTS_TRUNCATE`\"
+    domain=`domainname 2> /dev/null`
+  fi
+
+  if [ -n "$domain" ]; then
+    echo \#define LINUX_COMPILE_DOMAIN \"`echo $domain | $UTS_TRUNCATE`\"
   else
     echo \#define LINUX_COMPILE_DOMAIN
   fi
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/module-common.lds b/scripts/module-common.lds
new file mode 100644
index 000000000000..47a1f9ae0ede
--- /dev/null
+++ b/scripts/module-common.lds
@@ -0,0 +1,8 @@
+/*
+ * Common module linker script, always used when linking a module.
+ * Archs are free to supply their own linker scripts.  ld will
+ * combine them automatically.
+ */
+SECTIONS {
+        /DISCARD/ : { *(.discard) }
+}
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index fa4a0a17b7e0..f67cc885c807 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -18,6 +18,9 @@
 # e) generate the rpm files, based on kernel.spec
 # - Use /. to avoid tar packing just the symlink
 
+# Note that the rpm-pkg target cannot be used with KBUILD_OUTPUT,
+# but the binrpm-pkg target can; for some reason O= gets ignored.
+
 # Do we have rpmbuild, otherwise fall back to the older rpm
 RPM := $(shell if [ -x "/usr/bin/rpmbuild" ]; then echo rpmbuild; \
                    else echo rpm; fi)
@@ -33,6 +36,12 @@ $(objtree)/kernel.spec: $(MKSPEC) $(srctree)/Makefile
         $(CONFIG_SHELL) $(MKSPEC) > $@
 
 rpm-pkg rpm: $(objtree)/kernel.spec FORCE
+        @if test -n "$(KBUILD_OUTPUT)"; then \
+                echo "Building source + binary RPM is not possible outside the"; \
+                echo "kernel source tree. Don't set KBUILD_OUTPUT, or use the"; \
+                echo "binrpm-pkg target instead."; \
+                false; \
+        fi
         $(MAKE) clean
         $(PREV) ln -sf $(srctree) $(KERNELPATH)
         $(CONFIG_SHELL) $(srctree)/scripts/setlocalversion > $(objtree)/.scmversion
@@ -61,7 +70,7 @@ binrpm-pkg: $(objtree)/binkernel.spec FORCE
         set -e; \
         mv -f $(objtree)/.tmp_version $(objtree)/.version
 
-        $(RPM) $(RPMOPTS) --define "_builddir $(srctree)" --target \
+        $(RPM) $(RPMOPTS) --define "_builddir $(objtree)" --target \
                 $(UTS_MACHINE) -bb $<
 
 clean-files += $(objtree)/binkernel.spec
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 01c2d13dd020..8b357b0bd250 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -16,6 +16,8 @@ create_package() {
         local pname="$1" pdir="$2"
 
         cp debian/copyright "$pdir/usr/share/doc/$pname/"
+        cp debian/changelog "$pdir/usr/share/doc/$pname/changelog.Debian"
+        gzip -9 "$pdir/usr/share/doc/$pname/changelog.Debian"
 
         # Fix ownership and permissions
         chown -R root:root "$pdir"
@@ -87,7 +89,7 @@ for script in postinst postrm preinst prerm ; do
 set -e
 
 # Pass maintainer script parameters to hook scripts
-export DEB_MAINT_PARAMS="\$@"
+export DEB_MAINT_PARAMS="\$*"
 
 test -d $debhookdir/$script.d && run-parts --arg="$version" $debhookdir/$script.d
 exit 0
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index 3d93f8c81252..47bdd2f99b78 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -70,7 +70,7 @@ echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM_BUILD_ROOT/lib/modules'
 echo 'mkdir -p $RPM_BUILD_ROOT/lib/firmware'
 echo "%endif"
 
-echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{_smp_mflags} modules_install'
+echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{_smp_mflags} KBUILD_SRC= modules_install'
 echo "%ifarch ia64"
 echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/efi/vmlinuz-$KERNELRELEASE"
 echo 'ln -s '"efi/vmlinuz-$KERNELRELEASE" '$RPM_BUILD_ROOT'"/boot/"
diff --git a/scripts/pnmtologo.c b/scripts/pnmtologo.c
index 64f5ddb09ea6..5c113123ed9f 100644
--- a/scripts/pnmtologo.c
+++ b/scripts/pnmtologo.c
@@ -237,7 +237,7 @@ static void write_header(void)
     fprintf(out, " *  Linux logo %s\n", logoname);
     fputs(" */\n\n", out);
     fputs("#include <linux/linux_logo.h>\n\n", out);
-    fprintf(out, "static const unsigned char %s_data[] __initconst = {\n",
+    fprintf(out, "static unsigned char %s_data[] __initdata = {\n",
             logoname);
 }
 
@@ -374,7 +374,7 @@ static void write_logo_clut224(void)
     fputs("\n};\n\n", out);
 
     /* write logo clut */
-    fprintf(out, "static const unsigned char %s_clut[] __initconst = {\n",
+    fprintf(out, "static unsigned char %s_clut[] __initdata = {\n",
             logoname);
     write_hex_cnt = 0;
     for (i = 0; i < logo_clutsize; i++) {
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index 7109e2b5bc0a..090d300d7394 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -57,7 +57,6 @@
 #        call mcount  (offset: 0x5)
 #        [...]
 #        ret
-#  .globl my_func
 #  other_func:
 #        [...]
 #        call mcount (offset: 0x1b)
@@ -393,7 +392,7 @@ while (<IN>) {
             $read_function = 0;
         }
         # print out any recorded offsets
-        update_funcs() if ($text_found);
+        update_funcs() if (defined($ref_func));
 
         # reset all markers and arrays
         $text_found = 0;
@@ -403,7 +402,6 @@ while (<IN>) {
     # section found, now is this a start of a function?
     } elsif ($read_function && /$function_regex/) {
         $text_found = 1;
-        $offset = hex $1;
         $text = $2;
 
         # if this is either a local function or a weak function
@@ -412,10 +410,15 @@ while (<IN>) {
         if (!defined($locals{$text}) && !defined($weak{$text})) {
             $ref_func = $text;
             $read_function = 0;
+            $offset = hex $1;
         } else {
             # if we already have a function, and this is weak, skip it
-            if (!defined($ref_func) || !defined($weak{$text})) {
+            if (!defined($ref_func) && !defined($weak{$text}) &&
+                 # PPC64 can have symbols that start with .L and
+                 # gcc considers these special. Don't use them!
+                 $text !~ /^\.L/) {
                 $ref_func = $text;
+                $offset = hex $1;
             }
         }
     } elsif ($read_headers && /$mcount_section/) {
@@ -440,7 +443,7 @@ while (<IN>) {
 }
 
 # dump out anymore offsets that may have been found
-update_funcs() if ($text_found);
+update_funcs() if (defined($ref_func));
 
 # If we did not find any mcount callers, we are done (do nothing).
 if (!$opened) {
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/tags.sh b/scripts/tags.sh
index 4a34ec591e8c..d52f7a01557c 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -101,7 +101,8 @@ exuberant()
         -I ____cacheline_aligned_in_smp                         \
         -I ____cacheline_internodealigned_in_smp                \
         -I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL                      \
-        --extra=+f --c-kinds=+px                                \
+        -I DEFINE_TRACE,EXPORT_TRACEPOINT_SYMBOL,EXPORT_TRACEPOINT_SYMBOL_GPL \
+        --extra=+f --c-kinds=-px                                \
         --regex-asm='/^ENTRY\(([^)]*)\).*/\1/'                  \
         --regex-c='/^SYSCALL_DEFINE[[:digit:]]?\(([^,)]*).*/sys_\1/'
 
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";