38 files changed, 1165 insertions, 566 deletions

diff --git a/scripts/.gitignore b/scripts/.gitignore
index 09e2406f3b78..b939fbd01195 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -1,7 +1,6 @@
 #
 # Generated files
 #
-ihex2fw
 conmakehash
 kallsyms
 pnmtologo
diff --git a/scripts/Makefile b/scripts/Makefile
index 035182e16afb..aafdf064feef 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -2,12 +2,11 @@
 # scripts contains sources for various helper programs used throughout
 # the kernel for the build process.
 # ---------------------------------------------------------------------------
-# ihex2fw:       Parser/loader for IHEX formatted data
 # kallsyms:      Find all symbols in vmlinux
 # pnmttologo:    Convert pnm files to logo files
+# conmakehash:   Create chartable
 # conmakehash:   Create arrays for initializing the kernel console tables
 
-hostprogs-y                      := ihex2fw
 hostprogs-$(CONFIG_KALLSYMS)     += kallsyms
 hostprogs-$(CONFIG_LOGO)         += pnmtologo
 hostprogs-$(CONFIG_VT)           += conmakehash
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 5d900307de3e..5c4b7a400c18 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -27,6 +27,9 @@ ccflags-y  :=
 cppflags-y :=
 ldflags-y  :=
 
+subdir-asflags-y :=
+subdir-ccflags-y :=
+
 # Read auto.conf if it exists, otherwise ignore
 -include include/config/auto.conf
 
@@ -112,13 +115,13 @@ endif
 # ---------------------------------------------------------------------------
 
 # Default is built-in, unless we know otherwise
-modkern_cflags := $(CFLAGS_KERNEL)
+modkern_cflags = $(if $(part-of-module), $(CFLAGS_MODULE), $(CFLAGS_KERNEL))
 quiet_modtag := $(empty)   $(empty)
 
-$(real-objs-m)        : modkern_cflags := $(CFLAGS_MODULE)
-$(real-objs-m:.o=.i)  : modkern_cflags := $(CFLAGS_MODULE)
-$(real-objs-m:.o=.s)  : modkern_cflags := $(CFLAGS_MODULE)
-$(real-objs-m:.o=.lst): modkern_cflags := $(CFLAGS_MODULE)
+$(real-objs-m)        : part-of-module := y
+$(real-objs-m:.o=.i)  : part-of-module := y
+$(real-objs-m:.o=.s)  : part-of-module := y
+$(real-objs-m:.o=.lst): part-of-module := y
 
 $(real-objs-m)        : quiet_modtag := [M]
 $(real-objs-m:.o=.i)  : quiet_modtag := [M]
@@ -151,16 +154,16 @@ cmd_cc_i_c       = $(CPP) $(c_flags)   -o $@ $<
 $(obj)/%.i: $(src)/%.c FORCE
         $(call if_changed_dep,cc_i_c)
 
-cmd_genksyms =                                                              \
+cmd_gensymtypes =                                                           \
     $(CPP) -D__GENKSYMS__ $(c_flags) $< |                                   \
-    $(GENKSYMS) -T $@ -A -a $(ARCH)                                         \
+    $(GENKSYMS) -T $@ -a $(ARCH)                                            \
      $(if $(KBUILD_PRESERVE),-p)                                            \
      $(if $(1),-r $(firstword $(wildcard $(@:.symtypes=.symref) /dev/null)))
 
 quiet_cmd_cc_symtypes_c = SYM $(quiet_modtag) $@
 cmd_cc_symtypes_c =                                                         \
     set -e;                                                                 \
-    $(call cmd_genksyms, true) >/dev/null;                                  \
+    $(call cmd_gensymtypes, true) >/dev/null;                               \
     test -s $@ || rm -f $@
 
 $(obj)/%.symtypes : $(src)/%.c FORCE
@@ -177,45 +180,36 @@ cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $<
 
 else
 # When module versioning is enabled the following steps are executed:
-# o compile a .tmp_<file>.s from <file>.c
-# o if .tmp_<file>.s doesn't contain a __ksymtab version, i.e. does
-#   not export symbols, we just assemble .tmp_<file>.s to <file>.o and
+# o compile a .tmp_<file>.o from <file>.c
+# o if .tmp_<file>.o doesn't contain a __ksymtab version, i.e. does
+#   not export symbols, we just rename .tmp_<file>.o to <file>.o and
 #   are done.
 # o otherwise, we calculate symbol versions using the good old
 #   genksyms on the preprocessed source and postprocess them in a way
-#   that they are usable as assembly source
-# o assemble <file>.o from .tmp_<file>.s forcing inclusion of directives
-#   defining the actual values of __crc_*, followed by objcopy-ing them
-#   to force these symbols to be local to permit stripping them later.
-s_file = $(@D)/.tmp_$(@F:.o=.s)
-v_file = $(@D)/.tmp_$(@F:.o=.v)
-tmp_o_file = $(@D)/.tmp_$(@F)
-no_g_c_flags = $(filter-out -g%,$(c_flags))
-
-cmd_cc_o_c = $(CC) $(c_flags) -S -o $(s_file) $<
+#   that they are usable as a linker script
+# o generate <file>.o from .tmp_<file>.o using the linker to
+#   replace the unresolved symbols __crc_exported_symbol with
+#   the actual value of the checksum generated by genksyms
 
+cmd_cc_o_c = $(CC) $(c_flags) -c -o $(@D)/.tmp_$(@F) $<
 cmd_modversions =                                                       \
-        if grep -q __ksymtab $(s_file); then                            \
-                if $(call cmd_genksyms, $(KBUILD_SYMTYPES)) > $(v_file) \
-                   && $(CC) $(no_g_c_flags) -c -Wa,$(v_file)            \
-                            -o $(tmp_o_file) $(s_file)                  \
-                   && $(OBJCOPY) -L '__crc_*' -L '___crc_*' -w          \
-                                 $(tmp_o_file) $@;                      \
-                then                                                    \
-                        : ;                                             \
-                else                                                    \
-                        rm -f $@; exit 1;                               \
-                fi;                                                     \
+        if $(OBJDUMP) -h $(@D)/.tmp_$(@F) | grep -q __ksymtab; then     \
+                $(call cmd_gensymtypes, $(KBUILD_SYMTYPES))             \
+                    > $(@D)/.tmp_$(@F:.o=.ver);                         \
+                                                                        \
+                $(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F)              \
+                        -T $(@D)/.tmp_$(@F:.o=.ver);                    \
+                rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver);        \
         else                                                            \
-                rm -f $(v_file);                                        \
-                $(CC) $(no_g_c_flags) -c -o $@ $(s_file);               \
+                mv -f $(@D)/.tmp_$(@F) $@;                              \
         fi;
 endif
 
 ifdef CONFIG_FTRACE_MCOUNT_RECORD
 cmd_record_mcount = perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \
         "$(if $(CONFIG_64BIT),64,32)" \
-        "$(OBJDUMP)" "$(OBJCOPY)" "$(CC)" "$(LD)" "$(NM)" "$(RM)" "$(MV)" "$(@)";
+        "$(OBJDUMP)" "$(OBJCOPY)" "$(CC)" "$(LD)" "$(NM)" "$(RM)" "$(MV)" \
+        "$(if $(part-of-module),1,0)" "$(@)";
 endif
 
 define rule_cc_o_c
@@ -225,12 +219,7 @@ define rule_cc_o_c
         $(cmd_record_mcount)                                              \
         scripts/basic/fixdep $(depfile) $@ '$(call make-cmd,cc_o_c)' >    \
                                                       $(dot-target).tmp;  \
-        if [ -r $(@D)/.tmp_$(@F:.o=.v) ]; then                            \
-                echo >> $(dot-target).tmp;                                \
-                echo '$@: $(GENKSYMS)' >> $(dot-target).tmp;              \
-                echo '$(GENKSYMS):: ;' >> $(dot-target).tmp;              \
-        fi;                                                               \
-        rm -f $(depfile) $(@D)/.tmp_$(@F:.o=.?);                          \
+        rm -f $(depfile);                                                 \
         mv -f $(dot-target).tmp $(dot-target).cmd
 endef
 
diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
index 612dc13ddd85..095cfc8b9dbf 100644
--- a/scripts/Makefile.headersinst
+++ b/scripts/Makefile.headersinst
@@ -14,6 +14,8 @@ _dst := $(if $(dst),$(dst),$(obj))
 kbuild-file := $(srctree)/$(obj)/Kbuild
 include $(kbuild-file)
 
+_dst := $(if $(destination-y),$(destination-y),$(_dst))
+
 include scripts/Kbuild.include
 
 install       := $(INSTALL_HDR_PATH)/$(_dst)
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index e06365775bdf..cba61ca403ca 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -4,6 +4,11 @@ ccflags-y  += $(EXTRA_CFLAGS)
 cppflags-y += $(EXTRA_CPPFLAGS)
 ldflags-y  += $(EXTRA_LDFLAGS)
 
+#
+# flags that take effect in sub directories
+export KBUILD_SUBDIR_ASFLAGS := $(KBUILD_SUBDIR_ASFLAGS) $(subdir-asflags-y)
+export KBUILD_SUBDIR_CCFLAGS := $(KBUILD_SUBDIR_CCFLAGS) $(subdir-ccflags-y)
+
 # Figure out what we need to build from the various variables
 # ===========================================================================
 
@@ -97,17 +102,17 @@ modname_flags  = $(if $(filter 1,$(words $(modname))),\
                  -D"KBUILD_MODNAME=KBUILD_STR($(call name-fix,$(modname)))")
 
 #hash values
-ifdef CONFIG_DYNAMIC_PRINTK_DEBUG
+ifdef CONFIG_DYNAMIC_DEBUG
 debug_flags = -D"DEBUG_HASH=$(shell ./scripts/basic/hash djb2 $(@D)$(modname))"\
               -D"DEBUG_HASH2=$(shell ./scripts/basic/hash r5 $(@D)$(modname))"
 else
 debug_flags =
 endif
 
-orig_c_flags   = $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS)                     \
+orig_c_flags   = $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(KBUILD_SUBDIR_CCFLAGS) \
                  $(ccflags-y) $(CFLAGS_$(basetarget).o)
 _c_flags       = $(filter-out $(CFLAGS_REMOVE_$(basetarget).o), $(orig_c_flags))
-_a_flags       = $(KBUILD_CPPFLAGS) $(KBUILD_AFLAGS)                     \
+_a_flags       = $(KBUILD_CPPFLAGS) $(KBUILD_AFLAGS) $(KBUILD_SUBDIR_ASFLAGS) \
                  $(asflags-y) $(AFLAGS_$(basetarget).o)
 _cpp_flags     = $(KBUILD_CPPFLAGS) $(cppflags-y) $(CPPFLAGS_$(@F))
 
@@ -186,3 +191,17 @@ quiet_cmd_gzip = GZIP    $@
 cmd_gzip = gzip -f -9 < $< > $@
 
 
+# Bzip2
+# ---------------------------------------------------------------------------
+
+# Bzip2 does not include size in file... so we have to fake that
+size_append=$(CONFIG_SHELL) $(srctree)/scripts/bin_size
+
+quiet_cmd_bzip2 = BZIP2    $@
+cmd_bzip2 = (bzip2 -9 < $< && $(size_append) $<) > $@ || (rm -f $@ ; false)
+
+# Lzma
+# ---------------------------------------------------------------------------
+
+quiet_cmd_lzma = LZMA    $@
+cmd_lzma = (lzma -9 -c $< && $(size_append) $<) >$@ || (rm -f $@ ; false)
diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst
index a5122dce1264..efa5d940e632 100644
--- a/scripts/Makefile.modinst
+++ b/scripts/Makefile.modinst
@@ -17,8 +17,7 @@ __modinst: $(modules)
         @:
 
 quiet_cmd_modules_install = INSTALL $@
-      cmd_modules_install = mkdir -p $(2); \
-                            $(mod_strip_cmd) $@ $(2)/$(notdir $@) || cp $@ $(2)
+      cmd_modules_install = mkdir -p $(2); cp $@ $(2) ; $(mod_strip_cmd) $(2)/$(notdir $@)
 
 # Modules built outside the kernel source tree go into extra by default
 INSTALL_MOD_DIR ?= extra
diff --git a/scripts/bin_size b/scripts/bin_size
new file mode 100644
index 000000000000..43e1b360cee6
--- /dev/null
+++ b/scripts/bin_size
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ $# = 0 ] ; then
+   echo Usage: $0 file
+fi
+
+size_dec=`stat -c "%s" $1`
+size_hex_echo_string=`printf "%08x" $size_dec |
+     sed 's/\(..\)\(..\)\(..\)\(..\)/\\\\x\4\\\\x\3\\\\x\2\\\\x\1/g'`
+/bin/echo -ne $size_hex_echo_string
diff --git a/scripts/bootgraph.pl b/scripts/bootgraph.pl
index b0246307aac4..12caa822a232 100644
--- a/scripts/bootgraph.pl
+++ b/scripts/bootgraph.pl
@@ -51,7 +51,7 @@ my %pidctr;
 
 while (<>) {
         my $line = $_;
-        if ($line =~ /([0-9\.]+)\] calling  ([a-zA-Z0-9\_]+)\+/) {
+        if ($line =~ /([0-9\.]+)\] calling  ([a-zA-Z0-9\_\.]+)\+/) {
                 my $func = $2;
                 if ($done == 0) {
                         $start{$func} = $1;
@@ -87,7 +87,7 @@ while (<>) {
                 $count = $count + 1;
         }
 
-        if ($line =~ /([0-9\.]+)\] initcall ([a-zA-Z0-9\_]+)\+.*returned/) {
+        if ($line =~ /([0-9\.]+)\] initcall ([a-zA-Z0-9\_\.]+)\+.*returned/) {
                 if ($done == 0) {
                         $end{$2} = $1;
                         $maxtime = $1;
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 7bed4ed2c519..2d5ece798c4c 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -10,7 +10,7 @@ use strict;
 my $P = $0;
 $P =~ s@.*/@@g;
 
-my $V = '0.26';
+my $V = '0.28';
 
 use Getopt::Long qw(:config no_auto_abbrev);
 
@@ -110,7 +110,8 @@ our $Sparse	= qr{
                         __iomem|
                         __must_check|
                         __init_refok|
-                        __kprobes
+                        __kprobes|
+                        __ref
                 }x;
 our $Attribute  = qr{
                         const|
@@ -411,13 +412,15 @@ sub ctx_statement_block {
 
         my $type = '';
         my $level = 0;
-        my @stack = ([$type, $level]);
+        my @stack = ();
         my $p;
         my $c;
         my $len = 0;
 
         my $remainder;
         while (1) {
+                @stack = (['', 0]) if ($#stack == -1);
+
                 #warn "CSB: blk<$blk> remain<$remain>\n";
                 # If we are about to drop off the end, pull in more
                 # context.
@@ -1238,7 +1241,8 @@ sub process {
                         $realfile =~ s@^([^/]*)/@@;
 
                         $p1_prefix = $1;
-                        if ($tree && $p1_prefix ne '' && -e "$root/$p1_prefix") {
+                        if (!$file && $tree && $p1_prefix ne '' &&
+                            -e "$root/$p1_prefix") {
                                 WARN("patch prefix '$p1_prefix' exists, appears to be a -p0 patch\n");
                         }
 
@@ -1581,9 +1585,9 @@ sub process {
                 }
 # TEST: allow direct testing of the attribute matcher.
                 if ($dbg_attr) {
-                        if ($line =~ /^.\s*$Attribute\s*$/) {
+                        if ($line =~ /^.\s*$Modifier\s*$/) {
                                 ERROR("TEST: is attr\n" . $herecurr);
-                        } elsif ($dbg_attr > 1 && $line =~ /^.+($Attribute)/) {
+                        } elsif ($dbg_attr > 1 && $line =~ /^.+($Modifier)/) {
                                 ERROR("TEST: is not attr ($1 is)\n". $herecurr);
                         }
                         next;
@@ -1655,7 +1659,7 @@ sub process {
 
 # * goes on variable not on type
                 # (char*[ const])
-                if ($line =~ m{\($NonptrType(\s*\*[\s\*]*(?:$Modifier\s*)*)\)}) {
+                if ($line =~ m{\($NonptrType(\s*(?:$Modifier\b\s*|\*\s*)+)\)}) {
                         my ($from, $to) = ($1, $1);
 
                         # Should start with a space.
@@ -1663,14 +1667,14 @@ sub process {
                         # Should not end with a space.
                         $to =~ s/\s+$//;
                         # '*'s should not have spaces between.
-                        while ($to =~ s/(.)\s\*/$1\*/) {
+                        while ($to =~ s/\*\s+\*/\*\*/) {
                         }
 
                         #print "from<$from> to<$to>\n";
                         if ($from ne $to) {
                                 ERROR("\"(foo$from)\" should be \"(foo$to)\"\n" .  $herecurr);
                         }
-                } elsif ($line =~ m{\b$NonptrType(\s*\*[\s\*]*(?:$Modifier\s*)?)($Ident)}) {
+                } elsif ($line =~ m{\b$NonptrType(\s*(?:$Modifier\b\s*|\*\s*)+)($Ident)}) {
                         my ($from, $to, $ident) = ($1, $1, $2);
 
                         # Should start with a space.
@@ -1678,13 +1682,13 @@ sub process {
                         # Should not end with a space.
                         $to =~ s/\s+$//;
                         # '*'s should not have spaces between.
-                        while ($to =~ s/(.)\s\*/$1\*/) {
+                        while ($to =~ s/\*\s+\*/\*\*/) {
                         }
                         # Modifiers should have spaces.
                         $to =~ s/(\b$Modifier$)/$1 /;
 
-                        #print "from<$from> to<$to>\n";
-                        if ($from ne $to) {
+                        #print "from<$from> to<$to> ident<$ident>\n";
+                        if ($from ne $to && $ident !~ /^$Modifier$/) {
                                 ERROR("\"foo${from}bar\" should be \"foo${to}bar\"\n" .  $herecurr);
                         }
                 }
@@ -1883,11 +1887,11 @@ sub process {
                                         if ($ctx !~ /[WEBC]x./ && $ca !~ /(?:\)|!|~|\*|-|\&|\||\+\+|\-\-|\{)$/) {
                                                 ERROR("space required before that '$op' $at\n" . $hereptr);
                                         }
-                                        if ($op eq '*' && $cc =~/\s*const\b/) {
+                                        if ($op eq '*' && $cc =~/\s*$Modifier\b/) {
                                                 # A unary '*' may be const
 
                                         } elsif ($ctx =~ /.xW/) {
-                                                ERROR("space prohibited after that '$op' $at\n" . $hereptr);
+                                                ERROR("Aspace prohibited after that '$op' $at\n" . $hereptr);
                                         }
 
                                 # unary ++ and unary -- are allowed no space on one side.
@@ -2014,7 +2018,11 @@ sub process {
 
                         # Flatten any parentheses
                         $value =~ s/\)\(/\) \(/g;
-                        while ($value !~ /(?:$Ident|-?$Constant)\s*$Compare\s*(?:$Ident|-?$Constant)/ && $value =~ s/\([^\(\)]*\)/1/) {
+                        while ($value =~ s/\[[^\{\}]*\]/1/ ||
+                               $value !~ /(?:$Ident|-?$Constant)\s*
+                                             $Compare\s*
+                                             (?:$Ident|-?$Constant)/x &&
+                               $value =~ s/\([^\(\)]*\)/1/) {
                         }
 
                         if ($value =~ /^(?:$Ident|-?$Constant)$/) {
@@ -2102,6 +2110,11 @@ sub process {
                                 ERROR("trailing statements should be on next line\n" . $herecurr);
                         }
                 }
+# if should not continue a brace
+                if ($line =~ /}\s*if\b/) {
+                        ERROR("trailing statements should be on next line\n" .
+                                $herecurr);
+                }
 # case and default should not have general statements after them
                 if ($line =~ /^.\s*(?:case\s*.*|default\s*):/g &&
                     $line !~ /\G(?:
@@ -2516,9 +2529,10 @@ sub process {
                         WARN("please use device_initcall() instead of __initcall()\n" . $herecurr);
                 }
 # check for struct file_operations, ensure they are const.
-                if ($line =~ /\bstruct\s+file_operations\b/ &&
-                    $line !~ /\bconst\b/) {
-                        WARN("struct file_operations should normally be const\n" . $herecurr);
+                if ($line !~ /\bconst\b/ &&
+                    $line =~ /\bstruct\s+(file_operations|seq_operations)\b/) {
+                        WARN("struct $1 should normally be const\n" .
+                                $herecurr);
                 }
 
 # use of NR_CPUS is usually wrong
@@ -2548,7 +2562,7 @@ sub process {
                 if ($line =~ /\bin_atomic\s*\(/) {
                         if ($realfile =~ m@^drivers/@) {
                                 ERROR("do not use in_atomic in drivers\n" . $herecurr);
-                        } else {
+                        } elsif ($realfile !~ m@^kernel/@) {
                                 WARN("use of in_atomic() is incorrect outside core kernel code\n" . $herecurr);
                         }
                 }
diff --git a/scripts/config b/scripts/config
index 68b9761cdc38..db6084b78a10 100755
--- a/scripts/config
+++ b/scripts/config
@@ -60,6 +60,10 @@ else
         FN=.config
 fi
 
+if [ "$1" = "" ] ; then
+        usage
+fi
+
 while [ "$1" != "" ] ; do
         CMD="$1"
         shift
diff --git a/scripts/gcc-x86_32-has-stack-protector.sh b/scripts/gcc-x86_32-has-stack-protector.sh
new file mode 100644
index 000000000000..29493dc4528d
--- /dev/null
+++ b/scripts/gcc-x86_32-has-stack-protector.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo "int foo(void) { char X[200]; return 3; }" | $* -S -xc -c -O0 -fstack-protector - -o - 2> /dev/null | grep -q "%gs"
+if [ "$?" -eq "0" ] ; then
+        echo y
+else
+        echo n
+fi
diff --git a/scripts/gcc-x86_64-has-stack-protector.sh b/scripts/gcc-x86_64-has-stack-protector.sh
index 325c0a1b03b6..afaec618b395 100644
--- a/scripts/gcc-x86_64-has-stack-protector.sh
+++ b/scripts/gcc-x86_64-has-stack-protector.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
-echo "int foo(void) { char X[200]; return 3; }" | $1 -S -xc -c -O0 -mcmodel=kernel -fstack-protector - -o - 2> /dev/null | grep -q "%gs"
+echo "int foo(void) { char X[200]; return 3; }" | $* -S -xc -c -O0 -mcmodel=kernel -fstack-protector - -o - 2> /dev/null | grep -q "%gs"
 if [ "$?" -eq "0" ] ; then
-        echo $2
+        echo y
+else
+        echo n
 fi
diff --git a/scripts/gen_initramfs_list.sh b/scripts/gen_initramfs_list.sh
index 5f3415f28736..76af5f9623e3 100644
--- a/scripts/gen_initramfs_list.sh
+++ b/scripts/gen_initramfs_list.sh
@@ -5,7 +5,7 @@
 # Released under the terms of the GNU GPL
 #
 # Generate a cpio packed initramfs. It uses gen_init_cpio to generate
-# the cpio archive, and gzip to pack it.
+# the cpio archive, and then compresses it.
 # The script may also be used to generate the inputfile used for gen_init_cpio
 # This script assumes that gen_init_cpio is located in usr/ directory
 
@@ -16,8 +16,8 @@ usage() {
 cat << EOF
 Usage:
 $0 [-o <file>] [-u <uid>] [-g <gid>] {-d | <cpio_source>} ...
-        -o <file>      Create gzipped initramfs file named <file> using
-                       gen_init_cpio and gzip
+        -o <file>      Create compressed initramfs file named <file> using
+                       gen_init_cpio and compressor depending on the extension
         -u <uid>       User ID to map to user ID 0 (root).
                        <uid> is only meaningful if <cpio_source> is a
                        directory.  "squash" forces all files to uid 0.
@@ -97,7 +97,7 @@ print_mtime() {
 }
 
 list_parse() {
-        echo "$1 \\"
+        [ ! -L "$1" ] && echo "$1 \\" || :
 }
 
 # for each file print a line in following format
@@ -225,6 +225,7 @@ cpio_list=
 output="/dev/stdout"
 output_file=""
 is_cpio_compressed=
+compr="gzip -9 -f"
 
 arg="$1"
 case "$arg" in
@@ -233,11 +234,15 @@ case "$arg" in
                 echo "deps_initramfs := \\"
                 shift
                 ;;
-        "-o")   # generate gzipped cpio image named $1
+        "-o")   # generate compressed cpio image named $1
                 shift
                 output_file="$1"
                 cpio_list="$(mktemp ${TMPDIR:-/tmp}/cpiolist.XXXXXX)"
                 output=${cpio_list}
+                echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f"
+                echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f"
+                echo "$output_file" | grep -q "\.lzma$" && compr="lzma -9 -f"
+                echo "$output_file" | grep -q "\.cpio$" && compr="cat"
                 shift
                 ;;
 esac
@@ -274,7 +279,7 @@ while [ $# -gt 0 ]; do
         esac
 done
 
-# If output_file is set we will generate cpio archive and gzip it
+# If output_file is set we will generate cpio archive and compress it
 # we are carefull to delete tmp files
 if [ ! -z ${output_file} ]; then
         if [ -z ${cpio_file} ]; then
@@ -287,7 +292,8 @@ if [ ! -z ${output_file} ]; then
         if [ "${is_cpio_compressed}" = "compressed" ]; then
                 cat ${cpio_tfile} > ${output_file}
         else
-                cat ${cpio_tfile} | gzip -f -9 - > ${output_file}
+                (cat ${cpio_tfile} | ${compr}  - > ${output_file}) \
+                || (rm -f ${output_file} ; false)
         fi
         [ -z ${cpio_file} ] && rm ${cpio_tfile}
 fi
diff --git a/scripts/genksyms/genksyms.c b/scripts/genksyms/genksyms.c
index f8bb4cabd62d..3a8297b5184c 100644
--- a/scripts/genksyms/genksyms.c
+++ b/scripts/genksyms/genksyms.c
@@ -43,7 +43,7 @@ int cur_line = 1;
 char *cur_filename;
 
 static int flag_debug, flag_dump_defs, flag_reference, flag_dump_types,
-           flag_preserve, flag_warnings, flag_asm;
+           flag_preserve, flag_warnings;
 static const char *arch = "";
 static const char *mod_prefix = "";
 
@@ -610,11 +610,8 @@ void export_symbol(const char *name)
                 if (flag_dump_defs)
                         fputs(">\n", debugfile);
 
-                /* Used as assembly source or a linker script. */
-                printf(flag_asm
-                       ? ".equiv %s__crc_%s, %#08lx\n"
-                       : "%s__crc_%s = %#08lx ;\n",
-                       mod_prefix, name, crc);
+                /* Used as a linker script. */
+                printf("%s__crc_%s = 0x%08lx ;\n", mod_prefix, name, crc);
         }
 }
 
@@ -651,10 +648,9 @@ void error_with_pos(const char *fmt, ...)
 
 static void genksyms_usage(void)
 {
-        fputs("Usage:\n" "genksyms [-aAdDTwqhV] > /path/to/.tmp_obj.ver\n" "\n"
+        fputs("Usage:\n" "genksyms [-adDTwqhV] > /path/to/.tmp_obj.ver\n" "\n"
 #ifdef __GNU_LIBRARY__
               "  -a, --arch            Select architecture\n"
-              "  -A, --asm             Generate assembly rather than linker script\n"
               "  -d, --debug           Increment the debug level (repeatable)\n"
               "  -D, --dump            Dump expanded symbol defs (for debugging only)\n"
               "  -r, --reference file  Read reference symbols from a file\n"
@@ -666,7 +662,6 @@ static void genksyms_usage(void)
               "  -V, --version         Print the release version\n"
 #else                           /* __GNU_LIBRARY__ */
               "  -a                    Select architecture\n"
-              "  -A                    Generate assembly rather than linker script\n"
               "  -d                    Increment the debug level (repeatable)\n"
               "  -D                    Dump expanded symbol defs (for debugging only)\n"
               "  -r file               Read reference symbols from a file\n"
@@ -688,7 +683,6 @@ int main(int argc, char **argv)
 #ifdef __GNU_LIBRARY__
         struct option long_opts[] = {
                 {"arch", 1, 0, 'a'},
-                {"asm", 0, 0, 'A'},
                 {"debug", 0, 0, 'd'},
                 {"warnings", 0, 0, 'w'},
                 {"quiet", 0, 0, 'q'},
@@ -701,10 +695,10 @@ int main(int argc, char **argv)
                 {0, 0, 0, 0}
         };
 
-        while ((o = getopt_long(argc, argv, "a:dwqVADr:T:ph",
+        while ((o = getopt_long(argc, argv, "a:dwqVDr:T:ph",
                                 &long_opts[0], NULL)) != EOF)
 #else                           /* __GNU_LIBRARY__ */
-        while ((o = getopt(argc, argv, "a:dwqVADr:T:ph")) != EOF)
+        while ((o = getopt(argc, argv, "a:dwqVDr:T:ph")) != EOF)
 #endif                          /* __GNU_LIBRARY__ */
                 switch (o) {
                 case 'a':
@@ -722,9 +716,6 @@ int main(int argc, char **argv)
                 case 'V':
                         fputs("genksyms version 2.5.60\n", stderr);
                         break;
-                case 'A':
-                        flag_asm = 1;
-                        break;
                 case 'D':
                         flag_dump_defs = 1;
                         break;
diff --git a/scripts/genksyms/keywords.c_shipped b/scripts/genksyms/keywords.c_shipped
index 83484fe93ede..971e0113ae7a 100644
--- a/scripts/genksyms/keywords.c_shipped
+++ b/scripts/genksyms/keywords.c_shipped
@@ -1,4 +1,4 @@
-/* ANSI-C code produced by gperf version 3.0.1 */
+/* ANSI-C code produced by gperf version 3.0.2 */
 /* Command-line: gperf -L ANSI-C -a -C -E -g -H is_reserved_hash -k '1,3,$' -N is_reserved_word -p -t scripts/genksyms/keywords.gperf  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@@ -32,7 +32,7 @@
 
 #line 3 "scripts/genksyms/keywords.gperf"
 struct resword { const char *name; int token; };
-/* maximum key range = 64, duplicates = 0 */
+/* maximum key range = 62, duplicates = 0 */
 
 #ifdef __GNUC__
 __inline
@@ -46,32 +46,32 @@ is_reserved_hash (register const char *str, register unsigned int len)
 {
   static const unsigned char asso_values[] =
     {
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67,  0,
-      67, 67, 67, 67, 67, 67, 15, 67, 67, 67,
-       0, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67,  0, 67,  0, 67,  5,
-      25, 20, 15, 30, 67, 15, 67, 67, 10,  0,
-      10, 40, 20, 67, 10,  5,  0, 10, 15, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65,  5,
+      65, 65, 65, 65, 65, 65, 35, 65, 65, 65,
+       0, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65,  0, 65,  0, 65,  5,
+      20, 15, 10, 30, 65, 15, 65, 65, 20,  0,
+      10, 35, 20, 65, 10,  5,  0, 10,  5, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
+      65, 65, 65, 65, 65, 65
     };
   return len + asso_values[(unsigned char)str[2]] + asso_values[(unsigned char)str[0]] + asso_values[(unsigned char)str[len - 1]];
 }
@@ -84,119 +84,116 @@ is_reserved_word (register const char *str, register unsigned int len)
 {
   enum
     {
-      TOTAL_KEYWORDS = 45,
+      TOTAL_KEYWORDS = 43,
       MIN_WORD_LENGTH = 3,
       MAX_WORD_LENGTH = 24,
       MIN_HASH_VALUE = 3,
-      MAX_HASH_VALUE = 66
+      MAX_HASH_VALUE = 64
     };
 
   static const struct resword wordlist[] =
     {
       {""}, {""}, {""},
-#line 28 "scripts/genksyms/keywords.gperf"
+#line 26 "scripts/genksyms/keywords.gperf"
       {"asm", ASM_KEYW},
       {""},
-#line 10 "scripts/genksyms/keywords.gperf"
+#line 8 "scripts/genksyms/keywords.gperf"
       {"__asm", ASM_KEYW},
       {""},
-#line 11 "scripts/genksyms/keywords.gperf"
+#line 9 "scripts/genksyms/keywords.gperf"
       {"__asm__", ASM_KEYW},
       {""}, {""},
-#line 54 "scripts/genksyms/keywords.gperf"
+#line 52 "scripts/genksyms/keywords.gperf"
       {"__typeof__", TYPEOF_KEYW},
       {""},
-#line 14 "scripts/genksyms/keywords.gperf"
+#line 12 "scripts/genksyms/keywords.gperf"
       {"__const", CONST_KEYW},
-#line 13 "scripts/genksyms/keywords.gperf"
+#line 11 "scripts/genksyms/keywords.gperf"
       {"__attribute__", ATTRIBUTE_KEYW},
-#line 15 "scripts/genksyms/keywords.gperf"
+#line 13 "scripts/genksyms/keywords.gperf"
       {"__const__", CONST_KEYW},
-#line 20 "scripts/genksyms/keywords.gperf"
+#line 18 "scripts/genksyms/keywords.gperf"
       {"__signed__", SIGNED_KEYW},
-#line 46 "scripts/genksyms/keywords.gperf"
+#line 44 "scripts/genksyms/keywords.gperf"
       {"static", STATIC_KEYW},
-      {""},
-#line 41 "scripts/genksyms/keywords.gperf"
+#line 20 "scripts/genksyms/keywords.gperf"
+      {"__volatile__", VOLATILE_KEYW},
+#line 39 "scripts/genksyms/keywords.gperf"
       {"int", INT_KEYW},
-#line 34 "scripts/genksyms/keywords.gperf"
+#line 32 "scripts/genksyms/keywords.gperf"
       {"char", CHAR_KEYW},
-#line 35 "scripts/genksyms/keywords.gperf"
+#line 33 "scripts/genksyms/keywords.gperf"
       {"const", CONST_KEYW},
-#line 47 "scripts/genksyms/keywords.gperf"
+#line 45 "scripts/genksyms/keywords.gperf"
       {"struct", STRUCT_KEYW},
-#line 26 "scripts/genksyms/keywords.gperf"
+#line 24 "scripts/genksyms/keywords.gperf"
       {"__restrict__", RESTRICT_KEYW},
-#line 27 "scripts/genksyms/keywords.gperf"
-      {"restrict", RESTRICT_KEYW},
-#line 7 "scripts/genksyms/keywords.gperf"
-      {"EXPORT_SYMBOL_GPL_FUTURE", EXPORT_SYMBOL_KEYW},
-#line 18 "scripts/genksyms/keywords.gperf"
-      {"__inline__", INLINE_KEYW},
-      {""},
-#line 22 "scripts/genksyms/keywords.gperf"
-      {"__volatile__", VOLATILE_KEYW},
-#line 5 "scripts/genksyms/keywords.gperf"
-      {"EXPORT_SYMBOL", EXPORT_SYMBOL_KEYW},
 #line 25 "scripts/genksyms/keywords.gperf"
+      {"restrict", RESTRICT_KEYW},
+#line 23 "scripts/genksyms/keywords.gperf"
       {"_restrict", RESTRICT_KEYW},
-      {""},
-#line 12 "scripts/genksyms/keywords.gperf"
-      {"__attribute", ATTRIBUTE_KEYW},
-#line 6 "scripts/genksyms/keywords.gperf"
-      {"EXPORT_SYMBOL_GPL", EXPORT_SYMBOL_KEYW},
 #line 16 "scripts/genksyms/keywords.gperf"
+      {"__inline__", INLINE_KEYW},
+#line 10 "scripts/genksyms/keywords.gperf"
+      {"__attribute", ATTRIBUTE_KEYW},
+      {""},
+#line 14 "scripts/genksyms/keywords.gperf"
       {"__extension__", EXTENSION_KEYW},
-#line 37 "scripts/genksyms/keywords.gperf"
+#line 35 "scripts/genksyms/keywords.gperf"
       {"enum", ENUM_KEYW},
-#line 8 "scripts/genksyms/keywords.gperf"
-      {"EXPORT_UNUSED_SYMBOL", EXPORT_SYMBOL_KEYW},
-#line 38 "scripts/genksyms/keywords.gperf"
+#line 19 "scripts/genksyms/keywords.gperf"
+      {"__volatile", VOLATILE_KEYW},
+#line 36 "scripts/genksyms/keywords.gperf"
       {"extern", EXTERN_KEYW},
       {""},
-#line 19 "scripts/genksyms/keywords.gperf"
+#line 17 "scripts/genksyms/keywords.gperf"
       {"__signed", SIGNED_KEYW},
-#line 9 "scripts/genksyms/keywords.gperf"
-      {"EXPORT_UNUSED_SYMBOL_GPL", EXPORT_SYMBOL_KEYW},
-#line 49 "scripts/genksyms/keywords.gperf"
-      {"union", UNION_KEYW},
-#line 53 "scripts/genksyms/keywords.gperf"
+#line 7 "scripts/genksyms/keywords.gperf"
+      {"EXPORT_SYMBOL_GPL_FUTURE", EXPORT_SYMBOL_KEYW},
+      {""},
+#line 51 "scripts/genksyms/keywords.gperf"
       {"typeof", TYPEOF_KEYW},
-#line 48 "scripts/genksyms/keywords.gperf"
+#line 46 "scripts/genksyms/keywords.gperf"
       {"typedef", TYPEDEF_KEYW},
-#line 17 "scripts/genksyms/keywords.gperf"
+#line 15 "scripts/genksyms/keywords.gperf"
       {"__inline", INLINE_KEYW},
-#line 33 "scripts/genksyms/keywords.gperf"
+#line 31 "scripts/genksyms/keywords.gperf"
       {"auto", AUTO_KEYW},
-#line 21 "scripts/genksyms/keywords.gperf"
-      {"__volatile", VOLATILE_KEYW},
+#line 47 "scripts/genksyms/keywords.gperf"
+      {"union", UNION_KEYW},
       {""}, {""},
-#line 50 "scripts/genksyms/keywords.gperf"
+#line 48 "scripts/genksyms/keywords.gperf"
       {"unsigned", UNSIGNED_KEYW},
-      {""},
-#line 44 "scripts/genksyms/keywords.gperf"
+#line 49 "scripts/genksyms/keywords.gperf"
+      {"void", VOID_KEYW},
+#line 42 "scripts/genksyms/keywords.gperf"
       {"short", SHORT_KEYW},
-#line 40 "scripts/genksyms/keywords.gperf"
+      {""}, {""},
+#line 50 "scripts/genksyms/keywords.gperf"
+      {"volatile", VOLATILE_KEYW},
+      {""},
+#line 37 "scripts/genksyms/keywords.gperf"
+      {"float", FLOAT_KEYW},
+#line 34 "scripts/genksyms/keywords.gperf"
+      {"double", DOUBLE_KEYW},
+      {""},
+#line 5 "scripts/genksyms/keywords.gperf"
+      {"EXPORT_SYMBOL", EXPORT_SYMBOL_KEYW},
+      {""}, {""},
+#line 38 "scripts/genksyms/keywords.gperf"
       {"inline", INLINE_KEYW},
+#line 6 "scripts/genksyms/keywords.gperf"
+      {"EXPORT_SYMBOL_GPL", EXPORT_SYMBOL_KEYW},
+#line 41 "scripts/genksyms/keywords.gperf"
+      {"register", REGISTER_KEYW},
       {""},
-#line 52 "scripts/genksyms/keywords.gperf"
-      {"volatile", VOLATILE_KEYW},
-#line 42 "scripts/genksyms/keywords.gperf"
-      {"long", LONG_KEYW},
-#line 24 "scripts/genksyms/keywords.gperf"
+#line 22 "scripts/genksyms/keywords.gperf"
       {"_Bool", BOOL_KEYW},
-      {""}, {""},
 #line 43 "scripts/genksyms/keywords.gperf"
-      {"register", REGISTER_KEYW},
-#line 51 "scripts/genksyms/keywords.gperf"
-      {"void", VOID_KEYW},
-#line 39 "scripts/genksyms/keywords.gperf"
-      {"float", FLOAT_KEYW},
-#line 36 "scripts/genksyms/keywords.gperf"
-      {"double", DOUBLE_KEYW},
-      {""}, {""}, {""}, {""},
-#line 45 "scripts/genksyms/keywords.gperf"
-      {"signed", SIGNED_KEYW}
+      {"signed", SIGNED_KEYW},
+      {""}, {""},
+#line 40 "scripts/genksyms/keywords.gperf"
+      {"long", LONG_KEYW}
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
diff --git a/scripts/genksyms/keywords.gperf b/scripts/genksyms/keywords.gperf
index 8abe7ab8d88f..5ef3733225fb 100644
--- a/scripts/genksyms/keywords.gperf
+++ b/scripts/genksyms/keywords.gperf
@@ -5,8 +5,6 @@ struct resword { const char *name; int token; }
 EXPORT_SYMBOL, EXPORT_SYMBOL_KEYW
 EXPORT_SYMBOL_GPL, EXPORT_SYMBOL_KEYW
 EXPORT_SYMBOL_GPL_FUTURE, EXPORT_SYMBOL_KEYW
-EXPORT_UNUSED_SYMBOL, EXPORT_SYMBOL_KEYW
-EXPORT_UNUSED_SYMBOL_GPL, EXPORT_SYMBOL_KEYW
 __asm, ASM_KEYW
 __asm__, ASM_KEYW
 __attribute, ATTRIBUTE_KEYW
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
new file mode 100755
index 000000000000..60dc0c48c929
--- /dev/null
+++ b/scripts/get_maintainer.pl
@@ -0,0 +1,515 @@
+#!/usr/bin/perl -w
+# (c) 2007, Joe Perches <joe@perches.com>
+#           created from checkpatch.pl
+#
+# Print selected MAINTAINERS information for
+# the files modified in a patch or for a file
+#
+# usage: perl scripts/get_maintainers.pl [OPTIONS] <patch>
+#        perl scripts/get_maintainers.pl [OPTIONS] -f <file>
+#
+# Licensed under the terms of the GNU GPL License version 2
+
+use strict;
+
+my $P = $0;
+my $V = '0.15';
+
+use Getopt::Long qw(:config no_auto_abbrev);
+
+my $lk_path = "./";
+my $email = 1;
+my $email_usename = 1;
+my $email_maintainer = 1;
+my $email_list = 1;
+my $email_subscriber_list = 0;
+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_since = "1-year-ago";
+my $output_multiline = 1;
+my $output_separator = ", ";
+my $scm = 0;
+my $web = 0;
+my $subsystem = 0;
+my $status = 0;
+my $from_filename = 0;
+my $version = 0;
+my $help = 0;
+
+my $exit = 0;
+
+my @penguin_chief = ();
+push(@penguin_chief,"Linus Torvalds:torvalds\@linux-foundation.org");
+#Andrew wants in on most everything - 2009/01/14
+#push(@penguin_chief,"Andrew Morton:akpm\@linux-foundation.org");
+
+my @penguin_chief_names = ();
+foreach my $chief (@penguin_chief) {
+    if ($chief =~ m/^(.*):(.*)/) {
+        my $chief_name = $1;
+        my $chief_addr = $2;
+        push(@penguin_chief_names, $chief_name);
+    }
+}
+my $penguin_chiefs = "\(" . join("|",@penguin_chief_names) . "\)";
+
+if (!GetOptions(
+                'email!' => \$email,
+                'git!' => \$email_git,
+                'git-chief-penguins!' => \$email_git_penguin_chiefs,
+                'git-min-signatures=i' => \$email_git_min_signatures,
+                'git-max-maintainers=i' => \$email_git_max_maintainers,
+                'git-since=s' => \$email_git_since,
+                'm!' => \$email_maintainer,
+                'n!' => \$email_usename,
+                'l!' => \$email_list,
+                's!' => \$email_subscriber_list,
+                'multiline!' => \$output_multiline,
+                'separator=s' => \$output_separator,
+                'subsystem!' => \$subsystem,
+                'status!' => \$status,
+                'scm!' => \$scm,
+                'web!' => \$web,
+                'f|file' => \$from_filename,
+                'v|version' => \$version,
+                'h|help' => \$help,
+                )) {
+    usage();
+    die "$P: invalid argument\n";
+}
+
+if ($help != 0) {
+    usage();
+    exit 0;
+}
+
+if ($version != 0) {
+    print("${P} ${V}\n");
+    exit 0;
+}
+
+if ($#ARGV < 0) {
+    usage();
+    die "$P: argument missing: patchfile or -f file please\n";
+}
+
+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) {
+    usage();
+    die "$P: Please select at least 1 email option\n";
+}
+
+if (!top_of_kernel_tree($lk_path)) {
+    die "$P: The current directory does not appear to be "
+        . "a linux kernel source tree.\n";
+}
+
+## Read MAINTAINERS for type/value pairs
+
+my @typevalue = ();
+open(MAINT, "<${lk_path}MAINTAINERS") || die "$P: Can't open MAINTAINERS\n";
+while (<MAINT>) {
+    my $line = $_;
+
+    if ($line =~ m/^(\C):\s*(.*)/) {
+        my $type = $1;
+        my $value = $2;
+
+        ##Filename pattern matching
+        if ($type eq "F" || $type eq "X") {
+            $value =~ s@\.@\\\.@g;       ##Convert . to \.
+            $value =~ s/\*/\.\*/g;       ##Convert * to .*
+            $value =~ s/\?/\./g;         ##Convert ? to .
+        }
+        push(@typevalue, "$type:$value");
+    } elsif (!/^(\s)*$/) {
+        $line =~ s/\n$//g;
+        push(@typevalue, $line);
+    }
+}
+close(MAINT);
+
+## use the filenames on the command line or find the filenames in the patchfiles
+
+my @files = ();
+
+foreach my $file (@ARGV) {
+    next if ((-d $file));
+    if (!(-f $file)) {
+        die "$P: file '${file}' not found\n";
+    }
+    if ($from_filename) {
+        push(@files, $file);
+    } else {
+        my $file_cnt = @files;
+        open(PATCH, "<$file") or die "$P: Can't open ${file}\n";
+        while (<PATCH>) {
+            if (m/^\+\+\+\s+(\S+)/) {
+                my $filename = $1;
+                $filename =~ s@^[^/]*/@@;
+                $filename =~ s@\n@@;
+                push(@files, $filename);
+            }
+        }
+        close(PATCH);
+        if ($file_cnt == @files) {
+            die "$P: file '${file}' doesn't appear to be a patch.  "
+                . "Add -f to options?\n";
+        }
+        @files = sort_and_uniq(@files);
+    }
+}
+
+my @email_to = ();
+my @scm = ();
+my @web = ();
+my @subsystem = ();
+my @status = ();
+
+# Find responsible parties
+
+foreach my $file (@files) {
+
+#Do not match excluded file patterns
+
+    my $exclude = 0;
+    foreach my $line (@typevalue) {
+        if ($line =~ m/^(\C):(.*)/) {
+            my $type = $1;
+            my $value = $2;
+            if ($type eq 'X') {
+                if (file_match_pattern($file, $value)) {
+                    $exclude = 1;
+                }
+            }
+        }
+    }
+
+    if (!$exclude) {
+        my $tvi = 0;
+        foreach my $line (@typevalue) {
+            if ($line =~ m/^(\C):(.*)/) {
+                my $type = $1;
+                my $value = $2;
+                if ($type eq 'F') {
+                    if (file_match_pattern($file, $value)) {
+                        add_categories($tvi);
+                    }
+                }
+            }
+            $tvi++;
+        }
+    }
+
+    if ($email && $email_git) {
+        recent_git_signoffs($file);
+    }
+
+}
+
+if ($email_git_penguin_chiefs) {
+    foreach my $chief (@penguin_chief) {
+        if ($chief =~ m/^(.*):(.*)/) {
+            my $chief_name = $1;
+            my $chief_addr = $2;
+            if ($email_usename) {
+                push(@email_to, format_email($chief_name, $chief_addr));
+            } else {
+                push(@email_to, $chief_addr);
+            }
+        }
+    }
+}
+
+if ($email) {
+    my $address_cnt = @email_to;
+    if ($address_cnt == 0 && $email_list) {
+        push(@email_to, "linux-kernel\@vger.kernel.org");
+    }
+
+#Don't sort email address list, but do remove duplicates
+    @email_to = uniq(@email_to);
+    output(@email_to);
+}
+
+if ($scm) {
+    @scm = sort_and_uniq(@scm);
+    output(@scm);
+}
+
+if ($status) {
+    @status = sort_and_uniq(@status);
+    output(@status);
+}
+
+if ($subsystem) {
+    @subsystem = sort_and_uniq(@subsystem);
+    output(@subsystem);
+}
+
+if ($web) {
+    @web = sort_and_uniq(@web);
+    output(@web);
+}
+
+exit($exit);
+
+sub file_match_pattern {
+    my ($file, $pattern) = @_;
+    if (substr($pattern, -1) eq "/") {
+        if ($file =~ m@^$pattern@) {
+            return 1;
+        }
+    } else {
+        if ($file =~ m@^$pattern@) {
+            my $s1 = ($file =~ tr@/@@);
+            my $s2 = ($pattern =~ tr@/@@);
+            if ($s1 == $s2) {
+                return 1;
+            }
+        }
+    }
+    return 0;
+}
+
+sub usage {
+    print <<EOT;
+usage: $P [options] patchfile
+       $P [options] -f file
+version: $V
+
+MAINTAINER field selection options:
+  --email => print email address(es) if any
+    --git => include recent git \*-by: signers
+    --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-since => git history to use (default: 1-year-ago)
+    --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
+  --scm => print SCM tree(s) if any
+  --status => print status if any
+  --subsystem => print subsystem name if any
+  --web => print website(s) if any
+
+Output type options:
+  --separator [, ] => separator for multiple entries on 1 line
+  --multiline => print 1 entry per line
+
+Default options:
+  [--email --git --m --l --multiline]
+
+Other options:
+  --version -> show version
+  --help => show this help information
+
+EOT
+}
+
+sub top_of_kernel_tree {
+        my ($lk_path) = @_;
+
+        if ($lk_path ne "" && substr($lk_path,length($lk_path)-1,1) ne "/") {
+            $lk_path .= "/";
+        }
+        if (   (-f "${lk_path}COPYING")
+            && (-f "${lk_path}CREDITS")
+            && (-f "${lk_path}Kbuild")
+            && (-f "${lk_path}MAINTAINERS")
+            && (-f "${lk_path}Makefile")
+            && (-f "${lk_path}README")
+            && (-d "${lk_path}Documentation")
+            && (-d "${lk_path}arch")
+            && (-d "${lk_path}include")
+            && (-d "${lk_path}drivers")
+            && (-d "${lk_path}fs")
+            && (-d "${lk_path}init")
+            && (-d "${lk_path}ipc")
+            && (-d "${lk_path}kernel")
+            && (-d "${lk_path}lib")
+            && (-d "${lk_path}scripts")) {
+                return 1;
+        }
+        return 0;
+}
+
+sub format_email {
+    my ($name, $email) = @_;
+
+    $name =~ s/^\s+|\s+$//g;
+    $email =~ s/^\s+|\s+$//g;
+
+    my $formatted_email = "";
+
+    if ($name =~ /[^a-z0-9 \.\-]/i) {    ##has "must quote" chars
+        $name =~ s/(?<!\\)"/\\"/g;       ##escape quotes
+        $formatted_email = "\"${name}\"\ \<${email}\>";
+    } else {
+        $formatted_email = "${name} \<${email}\>";
+    }
+    return $formatted_email;
+}
+
+sub add_categories {
+    my ($index) = @_;
+
+    $index = $index - 1;
+    while ($index >= 0) {
+        my $tv = $typevalue[$index];
+        if ($tv =~ m/^(\C):(.*)/) {
+            my $ptype = $1;
+            my $pvalue = $2;
+            if ($ptype eq "L") {
+                my $subscr = $pvalue;
+                if ($subscr =~ m/\s*\(subscribers-only\)/) {
+                    if ($email_subscriber_list) {
+                        $subscr =~ s/\s*\(subscribers-only\)//g;
+                        push(@email_to, $subscr);
+                    }
+                } else {
+                    if ($email_list) {
+                        push(@email_to, $pvalue);
+                    }
+                }
+            } elsif ($ptype eq "M") {
+                if ($email_maintainer) {
+                    if ($index >= 0) {
+                        my $tv = $typevalue[$index - 1];
+                        if ($tv =~ m/^(\C):(.*)/) {
+                            if ($1 eq "P" && $email_usename) {
+                                push(@email_to, format_email($2, $pvalue));
+                            } else {
+                                push(@email_to, $pvalue);
+                            }
+                        }
+                    } else {
+                        push(@email_to, $pvalue);
+                    }
+                }
+            } elsif ($ptype eq "T") {
+                push(@scm, $pvalue);
+            } elsif ($ptype eq "W") {
+                push(@web, $pvalue);
+            } elsif ($ptype eq "S") {
+                push(@status, $pvalue);
+            }
+
+            $index--;
+        } else {
+            push(@subsystem,$tv);
+            $index = -1;
+        }
+    }
+}
+
+sub which {
+    my ($bin) = @_;
+
+    foreach my $path (split /:/, $ENV{PATH}) {
+        if (-e "$path/$bin") {
+            return "$path/$bin";
+        }
+    }
+
+    return "";
+}
+
+sub recent_git_signoffs {
+    my ($file) = @_;
+
+    my $sign_offs = "";
+    my $cmd = "";
+    my $output = "";
+    my $count = 0;
+    my @lines = ();
+
+    if (which("git") eq "") {
+        die("$P: git not found.  Add --nogit to options?\n");
+    }
+
+    $cmd = "git log --since=${email_git_since} -- ${file}";
+    $cmd .= " | grep -Pi \"^[-_         a-z]+by:.*\\\@\"";
+    if (!$email_git_penguin_chiefs) {
+        $cmd .= " | grep -Pv \"${penguin_chiefs}\"";
+    }
+    $cmd .= " | cut -f2- -d\":\"";
+    $cmd .= " | sed -e \"s/^\\s+//g\"";
+    $cmd .= " | sort | uniq -c | sort -rn";
+
+    $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/(.+)<(.+)>/) {
+            my $git_name = $1;
+            my $git_addr = $2;
+            $git_name =~ tr/^\"//;
+            $git_name =~ tr/^\\s*//;
+            $git_name =~ tr/\"$//;
+            $git_name =~ tr/\\s*$//;
+            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 $output;
+}
+
+sub uniq {
+    my @parms = @_;
+
+    my %saw;
+    @parms = grep(!$saw{$_}++, @parms);
+    return @parms;
+}
+
+sub sort_and_uniq {
+    my @parms = @_;
+
+    my %saw;
+    @parms = sort @parms;
+    @parms = grep(!$saw{$_}++, @parms);
+    return @parms;
+}
+
+sub output {
+    my @parms = @_;
+
+    if ($output_multiline) {
+        foreach my $line (@parms) {
+            print("${line}\n");
+        }
+    } else {
+        print(join($output_separator, @parms));
+        print("\n");
+    }
+}
diff --git a/scripts/headerdep.pl b/scripts/headerdep.pl
index 97399da89ef2..b7f6c560e24d 100755
--- a/scripts/headerdep.pl
+++ b/scripts/headerdep.pl
@@ -19,7 +19,7 @@ my $opt_graph;
         version => \&version,
 
         all     => \$opt_all,
-        I       => \@opt_include,
+        "I=s"   => \@opt_include,
         graph   => \$opt_graph,
 );
 
diff --git a/scripts/headers_check.pl b/scripts/headers_check.pl
index db30fac3083e..56f90a480899 100644
--- a/scripts/headers_check.pl
+++ b/scripts/headers_check.pl
@@ -38,7 +38,7 @@ foreach my $file (@files) {
                 &check_asm_types();
                 &check_sizetypes();
                 &check_prototypes();
-                &check_config();
+                # Dropped for now. Too much noise &check_config();
         }
         close FH;
 }
diff --git a/scripts/ihex2fw.c b/scripts/ihex2fw.c
deleted file mode 100644
index 8f7fdaa9e010..000000000000
--- a/scripts/ihex2fw.c
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * Parser/loader for IHEX formatted data.
- *
- * Copyright © 2008 David Woodhouse <dwmw2@infradead.org>
- * Copyright © 2005 Jan Harkes <jaharkes@cs.cmu.edu>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <stdint.h>
-#include <arpa/inet.h>
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#define _GNU_SOURCE
-#include <getopt.h>
-
-
-struct ihex_binrec {
-        struct ihex_binrec *next; /* not part of the real data structure */
-        uint32_t addr;
-        uint16_t len;
-        uint8_t data[];
-};
-
-/**
- * nybble/hex are little helpers to parse hexadecimal numbers to a byte value
- **/
-static uint8_t nybble(const uint8_t n)
-{
-       if      (n >= '0' && n <= '9') return n - '0';
-       else if (n >= 'A' && n <= 'F') return n - ('A' - 10);
-       else if (n >= 'a' && n <= 'f') return n - ('a' - 10);
-       return 0;
-}
-
-static uint8_t hex(const uint8_t *data, uint8_t *crc)
-{
-       uint8_t val = (nybble(data[0]) << 4) | nybble(data[1]);
-       *crc += val;
-       return val;
-}
-
-static int process_ihex(uint8_t *data, ssize_t size);
-static void file_record(struct ihex_binrec *record);
-static int output_records(int outfd);
-
-static int sort_records = 0;
-static int wide_records = 0;
-
-int usage(void)
-{
-        fprintf(stderr, "ihex2fw: Convert ihex files into binary "
-                "representation for use by Linux kernel\n");
-        fprintf(stderr, "usage: ihex2fw [<options>] <src.HEX> <dst.fw>\n");
-        fprintf(stderr, "       -w: wide records (16-bit length)\n");
-        fprintf(stderr, "       -s: sort records by address\n");
-        return 1;
-}
-
-int main(int argc, char **argv)
-{
-        int infd, outfd;
-        struct stat st;
-        uint8_t *data;
-        int opt;
-
-        while ((opt = getopt(argc, argv, "ws")) != -1) {
-                switch (opt) {
-                case 'w':
-                        wide_records = 1;
-                        break;
-                case 's':
-                        sort_records = 1;
-                        break;
-                default:
-                        return usage();
-                }
-        }
-
-        if (optind + 2 != argc)
-                return usage();
-
-        if (!strcmp(argv[optind], "-"))
-            infd = 0;
-        else
-                infd = open(argv[optind], O_RDONLY);
-        if (infd == -1) {
-                fprintf(stderr, "Failed to open source file: %s",
-                        strerror(errno));
-                return usage();
-        }
-        if (fstat(infd, &st)) {
-                perror("stat");
-                return 1;
-        }
-        data = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, infd, 0);
-        if (data == MAP_FAILED) {
-                perror("mmap");
-                return 1;
-        }
-
-        if (!strcmp(argv[optind+1], "-"))
-            outfd = 1;
-        else
-                outfd = open(argv[optind+1], O_TRUNC|O_CREAT|O_WRONLY, 0644);
-        if (outfd == -1) {
-                fprintf(stderr, "Failed to open destination file: %s",
-                        strerror(errno));
-                return usage();
-        }
-        if (process_ihex(data, st.st_size))
-                return 1;
-
-        output_records(outfd);
-        return 0;
-}
-
-static int process_ihex(uint8_t *data, ssize_t size)
-{
-        struct ihex_binrec *record;
-        uint32_t offset = 0;
-        uint8_t type, crc = 0, crcbyte = 0;
-        int i, j;
-        int line = 1;
-        int len;
-
-        i = 0;
-next_record:
-        /* search for the start of record character */
-        while (i < size) {
-                if (data[i] == '\n') line++;
-                if (data[i++] == ':') break;
-        }
-
-        /* Minimum record length would be about 10 characters */
-        if (i + 10 > size) {
-                fprintf(stderr, "Can't find valid record at line %d\n", line);
-                return -EINVAL;
-        }
-
-        len = hex(data + i, &crc); i += 2;
-        if (wide_records) {
-                len <<= 8;
-                len += hex(data + i, &crc); i += 2;
-        }
-        record = malloc((sizeof (*record) + len + 3) & ~3);
-        if (!record) {
-                fprintf(stderr, "out of memory for records\n");
-                return -ENOMEM;
-        }
-        memset(record, 0, (sizeof(*record) + len + 3) & ~3);
-        record->len = len;
-
-        /* now check if we have enough data to read everything */
-        if (i + 8 + (record->len * 2) > size) {
-                fprintf(stderr, "Not enough data to read complete record at line %d\n",
-                        line);
-                return -EINVAL;
-        }
-
-        record->addr  = hex(data + i, &crc) << 8; i += 2;
-        record->addr |= hex(data + i, &crc); i += 2;
-        type = hex(data + i, &crc); i += 2;
-
-        for (j = 0; j < record->len; j++, i += 2)
-                record->data[j] = hex(data + i, &crc);
-
-        /* check CRC */
-        crcbyte = hex(data + i, &crc); i += 2;
-        if (crc != 0) {
-                fprintf(stderr, "CRC failure at line %d: got 0x%X, expected 0x%X\n",
-                        line, crcbyte, (unsigned char)(crcbyte-crc));
-                return -EINVAL;
-        }
-
-        /* Done reading the record */
-        switch (type) {
-        case 0:
-                /* old style EOF record? */
-                if (!record->len)
-                        break;
-
-                record->addr += offset;
-                file_record(record);
-                goto next_record;
-
-        case 1: /* End-Of-File Record */
-                if (record->addr || record->len) {
-                        fprintf(stderr, "Bad EOF record (type 01) format at line %d",
-                                line);
-                        return -EINVAL;
-                }
-                break;
-
-        case 2: /* Extended Segment Address Record (HEX86) */
-        case 4: /* Extended Linear Address Record (HEX386) */
-                if (record->addr || record->len != 2) {
-                        fprintf(stderr, "Bad HEX86/HEX386 record (type %02X) at line %d\n",
-                                type, line);
-                        return -EINVAL;
-                }
-
-                /* We shouldn't really be using the offset for HEX86 because
-                 * the wraparound case is specified quite differently. */
-                offset = record->data[0] << 8 | record->data[1];
-                offset <<= (type == 2 ? 4 : 16);
-                goto next_record;
-
-        case 3: /* Start Segment Address Record */
-        case 5: /* Start Linear Address Record */
-                if (record->addr || record->len != 4) {
-                        fprintf(stderr, "Bad Start Address record (type %02X) at line %d\n",
-                                type, line);
-                        return -EINVAL;
-                }
-
-                /* These records contain the CS/IP or EIP where execution
-                 * starts. Don't really know what to do with them. */
-                goto next_record;
-
-        default:
-                fprintf(stderr, "Unknown record (type %02X)\n", type);
-                return -EINVAL;
-        }
-
-        return 0;
-}
-
-static struct ihex_binrec *records;
-
-static void file_record(struct ihex_binrec *record)
-{
-        struct ihex_binrec **p = &records;
-
-        while ((*p) && (!sort_records || (*p)->addr < record->addr))
-                p = &((*p)->next);
-
-        record->next = *p;
-        *p = record;
-}
-
-static int output_records(int outfd)
-{
-        unsigned char zeroes[6] = {0, 0, 0, 0, 0, 0};
-        struct ihex_binrec *p = records;
-
-        while (p) {
-                uint16_t writelen = (p->len + 9) & ~3;
-
-                p->addr = htonl(p->addr);
-                p->len = htons(p->len);
-                write(outfd, &p->addr, writelen);
-                p = p->next;
-        }
-        /* EOF record is zero length, since we don't bother to represent
-           the type field in the binary version */
-        write(outfd, zeroes, 6);
-        return 0;
-}
diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
index 92758120a767..6654cbed965b 100644
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -130,9 +130,18 @@ static int read_symbol(FILE *in, struct sym_entry *s)
 static int symbol_valid(struct sym_entry *s)
 {
         /* Symbols which vary between passes.  Passes 1 and 2 must have
-         * identical symbol lists.
+         * identical symbol lists.  The kallsyms_* symbols below are only added
+         * after pass 1, they would be included in pass 2 when --all-symbols is
+         * specified so exclude them to get a stable symbol list.
          */
         static char *special_symbols[] = {
+                "kallsyms_addresses",
+                "kallsyms_num_syms",
+                "kallsyms_names",
+                "kallsyms_markers",
+                "kallsyms_token_table",
+                "kallsyms_token_index",
+
         /* Exclude linker generated symbols which vary between passes */
                 "_SDA_BASE_",           /* ppc */
                 "_SDA2_BASE_",          /* ppc */
@@ -164,9 +173,7 @@ static int symbol_valid(struct sym_entry *s)
         }
 
         /* Exclude symbols which vary between passes. */
-        if (strstr((char *)s->sym + offset, "_compiled.") ||
-            strncmp((char*)s->sym + offset, "__compound_literal.", 19) == 0 ||
-            strncmp((char*)s->sym + offset, "__compound_literal$", 19) == 0)
+        if (strstr((char *)s->sym + offset, "_compiled."))
                 return 0;
 
         for (i = 0; special_symbols[i]; i++)
@@ -493,6 +500,51 @@ static void optimize_token_table(void)
         optimize_result();
 }
 
+/* guess for "linker script provide" symbol */
+static int may_be_linker_script_provide_symbol(const struct sym_entry *se)
+{
+        const char *symbol = (char *)se->sym + 1;
+        int len = se->len - 1;
+
+        if (len < 8)
+                return 0;
+
+        if (symbol[0] != '_' || symbol[1] != '_')
+                return 0;
+
+        /* __start_XXXXX */
+        if (!memcmp(symbol + 2, "start_", 6))
+                return 1;
+
+        /* __stop_XXXXX */
+        if (!memcmp(symbol + 2, "stop_", 5))
+                return 1;
+
+        /* __end_XXXXX */
+        if (!memcmp(symbol + 2, "end_", 4))
+                return 1;
+
+        /* __XXXXX_start */
+        if (!memcmp(symbol + len - 6, "_start", 6))
+                return 1;
+
+        /* __XXXXX_end */
+        if (!memcmp(symbol + len - 4, "_end", 4))
+                return 1;
+
+        return 0;
+}
+
+static int prefix_underscores_count(const char *str)
+{
+        const char *tail = str;
+
+        while (*tail != '_')
+                tail++;
+
+        return tail - str;
+}
+
 static int compare_symbols(const void *a, const void *b)
 {
         const struct sym_entry *sa;
@@ -514,6 +566,18 @@ static int compare_symbols(const void *a, const void *b)
         if (wa != wb)
                 return wa - wb;
 
+        /* sort by "linker script provide" type */
+        wa = may_be_linker_script_provide_symbol(sa);
+        wb = may_be_linker_script_provide_symbol(sb);
+        if (wa != wb)
+                return wa - wb;
+
+        /* sort by the number of prefix underscores */
+        wa = prefix_underscores_count((const char *)sa->sym + 1);
+        wb = prefix_underscores_count((const char *)sb->sym + 1);
+        if (wa != wb)
+                return wa - wb;
+
         /* sort by initial order, so that other symbols are left undisturbed */
         return sa->start_pos - sb->start_pos;
 }
@@ -543,10 +607,8 @@ int main(int argc, char **argv)
                 usage();
 
         read_map(stdin);
-        if (table_cnt) {
-                sort_symbols();
-                optimize_token_table();
-        }
+        sort_symbols();
+        optimize_token_table();
         write_src();
 
         return 0;
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 3e1057f885c6..d190092c3b6e 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -11,6 +11,7 @@
 #include <time.h>
 #include <unistd.h>
 #include <sys/stat.h>
+#include <sys/time.h>
 
 #define LKC_DIRECT_LINK
 #include "lkc.h"
@@ -464,9 +465,22 @@ int main(int ac, char **av)
                         input_mode = set_yes;
                         break;
                 case 'r':
+                {
+                        struct timeval now;
+                        unsigned int seed;
+
+                        /*
+                         * Use microseconds derived seed,
+                         * compensate for systems where it may be zero
+                         */
+                        gettimeofday(&now, NULL);
+
+                        seed = (unsigned int)((now.tv_sec + 1) * (now.tv_usec + 1));
+                        srand(seed);
+
                         input_mode = set_random;
-                        srand(time(NULL));
                         break;
+                }
                 case 'h':
                         printf(_("See README for usage info\n"));
                         exit(0);
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 830d9eae11f9..273d73888f9d 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -843,7 +843,7 @@ void conf_set_all_new_symbols(enum conf_def_mode mode)
                         default:
                                 continue;
                         }
-                        if (!sym_is_choice(sym) || mode != def_random)
+                        if (!(sym_is_choice(sym) && mode == def_random))
                                 sym->flags |= SYMBOL_DEF_USER;
                         break;
                 default:
@@ -856,28 +856,49 @@ void conf_set_all_new_symbols(enum conf_def_mode mode)
 
         if (mode != def_random)
                 return;
-
+        /*
+         * We have different type of choice blocks.
+         * If curr.tri equal to mod then we can select several
+         * choice symbols in one block.
+         * In this case we do nothing.
+         * If curr.tri equal yes then only one symbol can be
+         * selected in a choice block and we set it to yes,
+         * and the rest to no.
+         */
         for_all_symbols(i, csym) {
                 if (sym_has_value(csym) || !sym_is_choice(csym))
                         continue;
 
                 sym_calc_value(csym);
+
+                if (csym->curr.tri != yes)
+                        continue;
+
                 prop = sym_get_choice_prop(csym);
-                def = -1;
-                while (1) {
-                        cnt = 0;
-                        expr_list_for_each_sym(prop->expr, e, sym) {
-                                if (sym->visible == no)
-                                        continue;
-                                if (def == cnt++) {
-                                        csym->def[S_DEF_USER].val = sym;
-                                        break;
-                                }
+
+                /* count entries in choice block */
+                cnt = 0;
+                expr_list_for_each_sym(prop->expr, e, sym)
+                        cnt++;
+
+                /*
+                 * find a random value and set it to yes,
+                 * set the rest to no so we have only one set
+                 */
+                def = (rand() % cnt);
+
+                cnt = 0;
+                expr_list_for_each_sym(prop->expr, e, sym) {
+                        if (def == cnt++) {
+                                sym->def[S_DEF_USER].tri = yes;
+                                csym->def[S_DEF_USER].val = sym;
+                        }
+                        else {
+                                sym->def[S_DEF_USER].tri = no;
                         }
-                        if (def >= 0 || cnt < 2)
-                                break;
-                        def = (rand() % cnt) + 1;
                 }
                 csym->flags |= SYMBOL_DEF_USER;
+                /* clear VALID to get value calculated */
+                csym->flags &= ~(SYMBOL_VALID);
         }
 }
diff --git a/scripts/kconfig/kxgettext.c b/scripts/kconfig/kxgettext.c
index 6eb72a7f2562..8d9ce22b0fc5 100644
--- a/scripts/kconfig/kxgettext.c
+++ b/scripts/kconfig/kxgettext.c
@@ -43,6 +43,10 @@ static char *escape(const char* text, char *bf, int len)
                         ++text;
                         goto next;
                 }
+                else if (*text == '\\') {
+                        *bfp++ = '\\';
+                        len--;
+                }
                 *bfp++ = *text++;
 next:
                 --len;
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 8bb83a100edb..0f11870116dc 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1827,6 +1827,40 @@ sub reset_state {
     $state = 0;
 }
 
+sub syscall_munge() {
+        my $void = 0;
+
+        $prototype =~ s@[\r\n\t]+@ @gos; # strip newlines/CR's/tabs
+##      if ($prototype =~ m/SYSCALL_DEFINE0\s*\(\s*(a-zA-Z0-9_)*\s*\)/) {
+        if ($prototype =~ m/SYSCALL_DEFINE0/) {
+                $void = 1;
+##              $prototype = "long sys_$1(void)";
+        }
+
+        $prototype =~ s/SYSCALL_DEFINE.*\(/long sys_/; # fix return type & func name
+        if ($prototype =~ m/long (sys_.*?),/) {
+                $prototype =~ s/,/\(/;
+        } elsif ($void) {
+                $prototype =~ s/\)/\(void\)/;
+        }
+
+        # now delete all of the odd-number commas in $prototype
+        # so that arg types & arg names don't have a comma between them
+        my $count = 0;
+        my $len = length($prototype);
+        if ($void) {
+                $len = 0;       # skip the for-loop
+        }
+        for (my $ix = 0; $ix < $len; $ix++) {
+                if (substr($prototype, $ix, 1) eq ',') {
+                        $count++;
+                        if ($count % 2 == 1) {
+                                substr($prototype, $ix, 1) = ' ';
+                        }
+                }
+        }
+}
+
 sub process_state3_function($$) {
     my $x = shift;
     my $file = shift;
@@ -1839,11 +1873,15 @@ sub process_state3_function($$) {
     elsif ($x =~ /([^\{]*)/) {
         $prototype .= $1;
     }
+
     if (($x =~ /\{/) || ($x =~ /\#\s*define/) || ($x =~ /;/)) {
         $prototype =~ s@/\*.*?\*/@@gos; # strip comments.
         $prototype =~ s@[\r\n]+@ @gos; # strip newlines/cr's.
         $prototype =~ s@^\s+@@gos; # strip leading spaces
-        dump_function($prototype,$file);
+        if ($prototype =~ /SYSCALL_DEFINE/) {
+                syscall_munge();
+        }
+        dump_function($prototype, $file);
         reset_state();
     }
 }
diff --git a/scripts/markup_oops.pl b/scripts/markup_oops.pl
index d40449cafa84..528492bcba5b 100644
--- a/scripts/markup_oops.pl
+++ b/scripts/markup_oops.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 use File::Basename;
 
@@ -29,27 +29,151 @@ my $filename = $vmlinux_name;
 my $target = "0";
 my $function;
 my $module = "";
-my $func_offset;
+my $func_offset = 0;
 my $vmaoffset = 0;
 
+my %regs;
+
+
+sub parse_x86_regs
+{
+        my ($line) = @_;
+        if ($line =~ /EAX: ([0-9a-f]+) EBX: ([0-9a-f]+) ECX: ([0-9a-f]+) EDX: ([0-9a-f]+)/) {
+                $regs{"%eax"} = $1;
+                $regs{"%ebx"} = $2;
+                $regs{"%ecx"} = $3;
+                $regs{"%edx"} = $4;
+        }
+        if ($line =~ /ESI: ([0-9a-f]+) EDI: ([0-9a-f]+) EBP: ([0-9a-f]+) ESP: ([0-9a-f]+)/) {
+                $regs{"%esi"} = $1;
+                $regs{"%edi"} = $2;
+                $regs{"%esp"} = $4;
+        }
+        if ($line =~ /RAX: ([0-9a-f]+) RBX: ([0-9a-f]+) RCX: ([0-9a-f]+)/) {
+                $regs{"%eax"} = $1;
+                $regs{"%ebx"} = $2;
+                $regs{"%ecx"} = $3;
+        }
+        if ($line =~ /RDX: ([0-9a-f]+) RSI: ([0-9a-f]+) RDI: ([0-9a-f]+)/) {
+                $regs{"%edx"} = $1;
+                $regs{"%esi"} = $2;
+                $regs{"%edi"} = $3;
+        }
+        if ($line =~ /RBP: ([0-9a-f]+) R08: ([0-9a-f]+) R09: ([0-9a-f]+)/) {
+                $regs{"%r08"} = $2;
+                $regs{"%r09"} = $3;
+        }
+        if ($line =~ /R10: ([0-9a-f]+) R11: ([0-9a-f]+) R12: ([0-9a-f]+)/) {
+                $regs{"%r10"} = $1;
+                $regs{"%r11"} = $2;
+                $regs{"%r12"} = $3;
+        }
+        if ($line =~ /R13: ([0-9a-f]+) R14: ([0-9a-f]+) R15: ([0-9a-f]+)/) {
+                $regs{"%r13"} = $1;
+                $regs{"%r14"} = $2;
+                $regs{"%r15"} = $3;
+        }
+}
+
+sub reg_name
+{
+        my ($reg) = @_;
+        $reg =~ s/r(.)x/e\1x/;
+        $reg =~ s/r(.)i/e\1i/;
+        $reg =~ s/r(.)p/e\1p/;
+        return $reg;
+}
+
+sub process_x86_regs
+{
+        my ($line, $cntr) = @_;
+        my $str = "";
+        if (length($line) < 40) {
+                return ""; # not an asm istruction
+        }
+
+        # find the arguments to the instruction
+        if ($line =~ /([0-9a-zA-Z\,\%\(\)\-\+]+)$/) {
+                $lastword = $1;
+        } else {
+                return "";
+        }
+
+        # we need to find the registers that get clobbered,
+        # since their value is no longer relevant for previous
+        # instructions in the stream.
+
+        $clobber = $lastword;
+        # first, remove all memory operands, they're read only
+        $clobber =~ s/\([a-z0-9\%\,]+\)//g;
+        # then, remove everything before the comma, thats the read part
+        $clobber =~ s/.*\,//g;
+
+        # if this is the instruction that faulted, we haven't actually done
+        # the write yet... nothing is clobbered.
+        if ($cntr == 0) {
+                $clobber = "";
+        }
+
+        foreach $reg (keys(%regs)) {
+                my $clobberprime = reg_name($clobber);
+                my $lastwordprime = reg_name($lastword);
+                my $val = $regs{$reg};
+                if ($val =~ /^[0]+$/) {
+                        $val = "0";
+                } else {
+                        $val =~ s/^0*//;
+                }
+
+                # first check if we're clobbering this register; if we do
+                # we print it with a =>, and then delete its value
+                if ($clobber =~ /$reg/ || $clobberprime =~ /$reg/) {
+                        if (length($val) > 0) {
+                                $str = $str . " $reg => $val ";
+                        }
+                        $regs{$reg} = "";
+                        $val = "";
+                }
+                # now check if we're reading this register
+                if ($lastword =~ /$reg/ || $lastwordprime =~ /$reg/) {
+                        if (length($val) > 0) {
+                                $str = $str . " $reg = $val ";
+                        }
+                }
+        }
+        return $str;
+}
+
+# parse the oops
 while (<STDIN>) {
         my $line = $_;
         if ($line =~ /EIP: 0060:\[\<([a-z0-9]+)\>\]/) {
                 $target = $1;
         }
+        if ($line =~ /RIP: 0010:\[\<([a-z0-9]+)\>\]/) {
+                $target = $1;
+        }
         if ($line =~ /EIP is at ([a-zA-Z0-9\_]+)\+(0x[0-9a-f]+)\/0x[a-f0-9]/) {
                 $function = $1;
                 $func_offset = $2;
         }
+        if ($line =~ /RIP: 0010:\[\<[0-9a-f]+\>\]  \[\<[0-9a-f]+\>\] ([a-zA-Z0-9\_]+)\+(0x[0-9a-f]+)\/0x[a-f0-9]/) {
+                $function = $1;
+                $func_offset = $2;
+        }
 
         # check if it's a module
         if ($line =~ /EIP is at ([a-zA-Z0-9\_]+)\+(0x[0-9a-f]+)\/0x[a-f0-9]+\W\[([a-zA-Z0-9\_\-]+)\]/) {
                 $module = $3;
         }
+        if ($line =~ /RIP: 0010:\[\<[0-9a-f]+\>\]  \[\<[0-9a-f]+\>\] ([a-zA-Z0-9\_]+)\+(0x[0-9a-f]+)\/0x[a-f0-9]+\W\[([a-zA-Z0-9\_\-]+)\]/) {
+                $module = $3;
+        }
+        parse_x86_regs($line);
 }
 
 my $decodestart = hex($target) - hex($func_offset);
-my $decodestop = $decodestart + 8192;
+my $decodestop = hex($target) + 8192;
 if ($target eq "0") {
         print "No oops found!\n";
         print "Usage: \n";
@@ -84,6 +208,7 @@ my $counter = 0;
 my $state   = 0;
 my $center  = 0;
 my @lines;
+my @reglines;
 
 sub InRange {
         my ($address, $target) = @_;
@@ -188,16 +313,36 @@ while ($finish < $counter) {
 
 my $i;
 
-my $fulltext = "";
+
+# start annotating the registers in the asm.
+# this goes from the oopsing point back, so that the annotator
+# can track (opportunistically) which registers got written and
+# whos value no longer is relevant.
+
+$i = $center;
+while ($i >= $start) {
+        $reglines[$i] = process_x86_regs($lines[$i], $center - $i);
+        $i = $i - 1;
+}
+
 $i = $start;
 while ($i < $finish) {
+        my $line;
         if ($i == $center) {
-                $fulltext = $fulltext . "*$lines[$i]     <----- faulting instruction\n";
+                $line =  "*$lines[$i] ";
         } else {
-                $fulltext = $fulltext .  " $lines[$i]\n";
+                $line =  " $lines[$i] ";
+        }
+        print $line;
+        if (defined($reglines[$i]) && length($reglines[$i]) > 0) {
+                my $c = 60 - length($line);
+                while ($c > 0) { print " "; $c = $c - 1; };
+                print "| $reglines[$i]";
         }
+        if ($i == $center) {
+                print "<--- faulting instruction";
+        }
+        print "\n";
         $i = $i +1;
 }
 
-print $fulltext;
-
diff --git a/scripts/mksysmap b/scripts/mksysmap
index 1db316a3712b..6e133a0bae7a 100644
--- a/scripts/mksysmap
+++ b/scripts/mksysmap
@@ -37,6 +37,9 @@
 
 # readprofile starts reading symbols when _stext is found, and
 # continue until it finds a symbol which is not either of 'T', 't',
-# 'W' or 'w'.
+# 'W' or 'w'. __crc_ are 'A' and placed in the middle
+# so we just ignore them to let readprofile continue to work.
+# (At least sparc64 has __crc_ in the middle).
+
+$NM -n $1 | grep -v '\( [aNUw] \)\|\(__crc_\)\|\( \$[adt]\)' > $2
 
-$NM -n $1 | grep -v '\( [aNUw] \)\|\( \$[adt]\)' > $2
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index d4dc222a74f3..a3344285ccf4 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -210,6 +210,7 @@ static void do_usb_table(void *symval, unsigned long size,
 static int do_hid_entry(const char *filename,
                              struct hid_device_id *id, char *alias)
 {
+        id->bus = TO_NATIVE(id->bus);
         id->vendor = TO_NATIVE(id->vendor);
         id->product = TO_NATIVE(id->product);
 
@@ -366,11 +367,17 @@ static void do_pnp_device_entry(void *symval, unsigned long size,
 
         for (i = 0; i < count; i++) {
                 const char *id = (char *)devs[i].id;
+                char acpi_id[sizeof(devs[0].id)];
+                int j;
 
                 buf_printf(&mod->dev_table_buf,
                            "MODULE_ALIAS(\"pnp:d%s*\");\n", id);
+
+                /* fix broken pnp bus lowercasing */
+                for (j = 0; j < sizeof(acpi_id); j++)
+                        acpi_id[j] = toupper(id[j]);
                 buf_printf(&mod->dev_table_buf,
-                           "MODULE_ALIAS(\"acpi*:%s:*\");\n", id);
+                           "MODULE_ALIAS(\"acpi*:%s:*\");\n", acpi_id);
         }
 }
 
@@ -416,10 +423,17 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
 
                         /* add an individual alias for every device entry */
                         if (!dup) {
+                                char acpi_id[sizeof(card->devs[0].id)];
+                                int k;
+
                                 buf_printf(&mod->dev_table_buf,
                                            "MODULE_ALIAS(\"pnp:d%s*\");\n", id);
+
+                                /* fix broken pnp bus lowercasing */
+                                for (k = 0; k < sizeof(acpi_id); k++)
+                                        acpi_id[k] = toupper(id[k]);
                                 buf_printf(&mod->dev_table_buf,
-                                           "MODULE_ALIAS(\"acpi*:%s:*\");\n", id);
+                                           "MODULE_ALIAS(\"acpi*:%s:*\");\n", acpi_id);
                         }
                 }
         }
@@ -696,6 +710,14 @@ static int do_dmi_entry(const char *filename, struct dmi_system_id *id,
         strcat(alias, ":");
         return 1;
 }
+
+static int do_platform_entry(const char *filename,
+                             struct platform_device_id *id, char *alias)
+{
+        sprintf(alias, PLATFORM_MODULE_PREFIX "%s", id->name);
+        return 1;
+}
+
 /* Ignore any prefix, eg. some architectures prepend _ */
 static inline int sym_is(const char *symbol, const char *name)
 {
@@ -835,6 +857,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
                 do_table(symval, sym->st_size,
                          sizeof(struct dmi_system_id), "dmi",
                          do_dmi_entry, mod);
+        else if (sym_is(symname, "__mod_platform_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct platform_device_id), "platform",
+                         do_platform_entry, mod);
         free(zeros);
 }
 
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 88921611b22e..8d46ea7d6715 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -415,8 +415,9 @@ static int parse_elf(struct elf_info *info, const char *filename)
                 const char *secstrings
                         = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;
                 const char *secname;
+                int nobits = sechdrs[i].sh_type == SHT_NOBITS;
 
-                if (sechdrs[i].sh_offset > info->size) {
+                if (!nobits && sechdrs[i].sh_offset > info->size) {
                         fatal("%s is truncated. sechdrs[i].sh_offset=%lu > "
                               "sizeof(*hrd)=%zu\n", filename,
                               (unsigned long)sechdrs[i].sh_offset,
@@ -425,6 +426,8 @@ static int parse_elf(struct elf_info *info, const char *filename)
                 }
                 secname = secstrings + sechdrs[i].sh_name;
                 if (strcmp(secname, ".modinfo") == 0) {
+                        if (nobits)
+                                fatal("%s has NOBITS .modinfo\n", filename);
                         info->modinfo = (void *)hdr + sechdrs[i].sh_offset;
                         info->modinfo_len = sechdrs[i].sh_size;
                 } else if (strcmp(secname, "__ksymtab") == 0)
@@ -791,15 +794,6 @@ static const char *init_exit_sections[] =
 /* data section */
 static const char *data_sections[] = { DATA_SECTIONS, NULL };
 
-/* sections that may refer to an init/exit section with no warning */
-static const char *initref_sections[] =
-{
-        ".text.init.refok*",
-        ".exit.text.refok*",
-        ".data.init.refok*",
-        NULL
-};
-
 
 /* symbols in .data that may refer to init/exit sections */
 static const char *symbol_white_list[] =
@@ -912,11 +906,6 @@ static int section_mismatch(const char *fromsec, const char *tosec)
 /**
  * Whitelist to allow certain references to pass with no warning.
  *
- * Pattern 0:
- *   Do not warn if funtion/data are marked with __init_refok/__initdata_refok.
- *   The pattern is identified by:
- *   fromsec = .text.init.refok* | .data.init.refok*
- *
  * Pattern 1:
  *   If a module parameter is declared __initdata and permissions=0
  *   then this is legal despite the warning generated.
@@ -955,10 +944,6 @@ static int section_mismatch(const char *fromsec, const char *tosec)
 static int secref_whitelist(const char *fromsec, const char *fromsym,
                             const char *tosec, const char *tosym)
 {
-        /* Check for pattern 0 */
-        if (match(fromsec, initref_sections))
-                return 0;
-
         /* Check for pattern 1 */
         if (match(tosec, init_data_sections) &&
             match(fromsec, data_sections) &&
@@ -1604,12 +1589,12 @@ static void read_symbols(char *modname)
 
         parse_elf_finish(&info);
 
-        /* Our trick to get versioning for struct_module - it's
+        /* Our trick to get versioning for module struct etc. - it's
          * never passed as an argument to an exported function, so
          * the automatic versioning doesn't pick it up, but it's really
          * important anyhow */
         if (modversions)
-                mod->unres = alloc_symbol("struct_module", 0, mod->unres);
+                mod->unres = alloc_symbol("module_layout", 0, mod->unres);
 }
 
 #define SZ 500
@@ -1910,7 +1895,7 @@ static void read_dump(const char *fname, unsigned int kernel)
                 if (!mod) {
                         if (is_vmlinux(modname))
                                 have_vmlinux = 1;
-                        mod = new_module(NOFAIL(strdup(modname)));
+                        mod = new_module(modname);
                         mod->skip = 1;
                 }
                 s = sym_add_exported(symname, mod, export_no(export));
@@ -1994,7 +1979,7 @@ static void read_markers(const char *fname)
 
                 mod = find_module(modname);
                 if (!mod) {
-                        mod = new_module(NOFAIL(strdup(modname)));
+                        mod = new_module(modname);
                         mod->skip = 1;
                 }
                 if (is_vmlinux(modname)) {
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index 8c6b7b09606a..fa4a0a17b7e0 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -35,9 +35,10 @@ $(objtree)/kernel.spec: $(MKSPEC) $(srctree)/Makefile
 rpm-pkg rpm: $(objtree)/kernel.spec FORCE
         $(MAKE) clean
         $(PREV) ln -sf $(srctree) $(KERNELPATH)
+        $(CONFIG_SHELL) $(srctree)/scripts/setlocalversion > $(objtree)/.scmversion
         $(PREV) tar -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(KERNELPATH)/.
         $(PREV) rm $(KERNELPATH)
-
+        rm -f $(objtree)/.scmversion
         set -e; \
         $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version
         set -e; \
diff --git a/scripts/package/buildtar b/scripts/package/buildtar
index 28574ae55170..b1fd48db1640 100644
--- a/scripts/package/buildtar
+++ b/scripts/package/buildtar
@@ -75,6 +75,10 @@ case "${ARCH}" in
         alpha)
                 [ -f "${objtree}/arch/alpha/boot/vmlinux.gz" ] && cp -v -- "${objtree}/arch/alpha/boot/vmlinux.gz" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
                 ;;
+        parisc*)
+                [ -f "${KBUILD_IMAGE}" ] && cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"
+                [ -f "${objtree}/lifimage" ] && cp -v -- "${objtree}/lifimage" "${tmpdir}/boot/lifimage-${KERNELRELEASE}"
+                ;;
         vax)
                 [ -f "${objtree}/vmlinux.SYS" ] && cp -v -- "${objtree}/vmlinux.SYS" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}.SYS"
                 [ -f "${objtree}/vmlinux.dsk" ] && cp -v -- "${objtree}/vmlinux.dsk" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}.dsk"
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index 2500886fb90a..3d93f8c81252 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -86,9 +86,17 @@ echo "%endif"
 echo 'cp System.map $RPM_BUILD_ROOT'"/boot/System.map-$KERNELRELEASE"
 
 echo 'cp .config $RPM_BUILD_ROOT'"/boot/config-$KERNELRELEASE"
+
+echo "%ifnarch ppc64"
+echo 'cp vmlinux vmlinux.orig'
+echo 'bzip2 -9 vmlinux'
+echo 'mv vmlinux.bz2 $RPM_BUILD_ROOT'"/boot/vmlinux-$KERNELRELEASE.bz2"
+echo 'mv vmlinux.orig vmlinux'
+echo "%endif"
+
 echo ""
 echo "%clean"
-echo '#echo -rf $RPM_BUILD_ROOT'
+echo 'rm -rf $RPM_BUILD_ROOT'
 echo ""
 echo "%files"
 echo '%defattr (-, root, root)'
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index fe831412bea9..409596eca124 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -100,14 +100,19 @@ $P =~ s@.*/@@g;
 
 my $V = '0.1';
 
-if ($#ARGV < 6) {
-        print "usage: $P arch objdump objcopy cc ld nm rm mv inputfile\n";
+if ($#ARGV < 7) {
+        print "usage: $P arch bits objdump objcopy cc ld nm rm mv is_module inputfile\n";
         print "version: $V\n";
         exit(1);
 }
 
 my ($arch, $bits, $objdump, $objcopy, $cc,
-    $ld, $nm, $rm, $mv, $inputfile) = @ARGV;
+    $ld, $nm, $rm, $mv, $is_module, $inputfile) = @ARGV;
+
+# This file refers to mcount and shouldn't be ftraced, so lets' ignore it
+if ($inputfile eq "kernel/trace/ftrace.o") {
+    exit(0);
+}
 
 # Acceptable sections to record.
 my %text_sections = (
@@ -201,6 +206,13 @@ if ($arch eq "x86_64") {
     $alignment = 2;
     $section_type = '%progbits';
 
+} elsif ($arch eq "ia64") {
+    $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s_mcount\$";
+    $type = "data8";
+
+    if ($is_module eq "0") {
+        $cc .= " -mconstant-gp";
+    }
 } else {
     die "Arch $arch is not supported with CONFIG_FTRACE_MCOUNT_RECORD";
 }
@@ -263,7 +275,6 @@ if (!$found_version) {
         "\tDisabling local function references.\n";
 }
 
-
 #
 # Step 1: find all the local (static functions) and weak symbols.
 #        't' is local, 'w/W' is weak (we never use a weak function)
@@ -331,13 +342,16 @@ sub update_funcs
 #
 # Step 2: find the sections and mcount call sites
 #
-open(IN, "$objdump -dr $inputfile|") || die "error running $objdump";
+open(IN, "$objdump -hdr $inputfile|") || die "error running $objdump";
 
 my $text;
 
+my $read_headers = 1;
+
 while (<IN>) {
     # is it a section?
     if (/$section_regex/) {
+        $read_headers = 0;
 
         # Only record text sections that we know are safe
         if (defined($text_sections{$1})) {
@@ -371,6 +385,19 @@ while (<IN>) {
                 $ref_func = $text;
             }
         }
+    } elsif ($read_headers && /$mcount_section/) {
+        #
+        # Somehow the make process can execute this script on an
+        # object twice. If it does, we would duplicate the mcount
+        # section and it will cause the function tracer self test
+        # to fail. Check if the mcount section exists, and if it does,
+        # warn and exit.
+        #
+        print STDERR "ERROR: $mcount_section already in $inputfile\n" .
+            "\tThis may be an indication that your build is corrupted.\n" .
+            "\tDelete $inputfile and try again. If the same object file\n" .
+            "\tstill causes an issue, then disable CONFIG_DYNAMIC_FTRACE.\n";
+        exit(-1);
     }
 
     # is this a call site to mcount? If so, record it to print later
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index f6946cf99ce1..47e75b69a2e9 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -21,7 +21,7 @@ if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
 
         # Is this git on svn?
         if git config --get svn-remote.svn.url >/dev/null; then
-                printf -- '-svn%s' "`git-svn find-rev $head`"
+                printf -- '-svn%s' "`git svn find-rev $head`"
         fi
 
         # Are there uncommitted changes?
@@ -58,14 +58,7 @@ fi
 # Check for svn and a svn repo.
 if rev=`svn info 2>/dev/null | grep '^Last Changed Rev'`; then
         rev=`echo $rev | awk '{print $NF}'`
-        changes=`svn status 2>/dev/null | grep '^[AMD]' | wc -l`
-
-        # Are there uncommitted changes?
-        if [ $changes != 0 ]; then
-                printf -- '-svn%s%s' "$rev" -dirty
-        else
-                printf -- '-svn%s' "$rev"
-        fi
+        printf -- '-svn%s' "$rev"
 
         # All done with svn
         exit
diff --git a/scripts/strip-symbols b/scripts/strip-symbols
deleted file mode 100644
index 29ee8c1a014b..000000000000
--- a/scripts/strip-symbols
+++ /dev/null
@@ -1,22 +0,0 @@
-<*>
-*.h
-__compound_literal[$.][0-9]*
-__crc_[a-zA-Z_]*
-__exitcall_[a-zA-Z_]*
-__func__[$.][0-9]*
-__FUNCTION__[$.][0-9]*
-gcc[0-9]_compiled[$.]
-__initcall_[a-zA-Z_]*
-__kcrctab_[a-zA-Z_]*
-__kstrtab_[a-zA-Z_]*
-__ksymtab_[a-zA-Z_]*
-__mod_[a-zA-Z_]*[0-9]
-__module_depends
-__param_[a-zA-Z_]*
-__pci_fixup_*PCI_ANY_IDPCI_ANY_ID*
-__pci_fixup_*PCI_ANY_IDPCI_DEVICE_ID_*
-__pci_fixup_*PCI_VENDOR_ID_*PCI_ANY_ID*
-__pci_fixup_*PCI_VENDOR_ID_*PCI_DEVICE_ID_*
-__PRETTY_FUNCTION__[$.][0-9]*
-__setup_[a-zA-Z_]*
-____versions
diff --git a/scripts/tags.sh b/scripts/tags.sh
index fdbe78bb5e2b..5bd8b1003d44 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -76,7 +76,10 @@ all_sources()
 
 all_kconfigs()
 {
-        find_sources $ALLSOURCE_ARCHS 'Kconfig*'
+        for arch in $ALLSOURCE_ARCHS; do
+                find_sources $arch 'Kconfig*'
+        done
+        find_other_sources 'Kconfig*'
 }
 
 all_defconfigs()
@@ -99,7 +102,8 @@ exuberant()
         -I ____cacheline_internodealigned_in_smp                \
         -I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL                      \
         --extra=+f --c-kinds=+px                                \
-        --regex-asm='/^ENTRY\(([^)]*)\).*/\1/'
+        --regex-asm='/^ENTRY\(([^)]*)\).*/\1/'                  \
+        --regex-c='/^SYSCALL_DEFINE[[:digit:]]?\(([^,)]*).*/sys_\1/'
 
         all_kconfigs | xargs $1 -a                              \
         --langdef=kconfig --language-force=kconfig              \
@@ -117,7 +121,9 @@ exuberant()
 
 emacs()
 {
-        all_sources | xargs $1 -a
+        all_sources | xargs $1 -a                               \
+        --regex='/^ENTRY(\([^)]*\)).*/\1/'                      \
+        --regex='/^SYSCALL_DEFINE[0-9]?(\([^,)]*\).*/sys_\1/'
 
         all_kconfigs | xargs $1 -a                              \
         --regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/\3/'
diff --git a/scripts/trace/power.pl b/scripts/tracing/power.pl
index 4f729b3501e0..4f729b3501e0 100644
--- a/scripts/trace/power.pl
+++ b/scripts/tracing/power.pl
diff --git a/scripts/unifdef.c b/scripts/unifdef.c
index 552025e72acb..05a31a6c7e1b 100644
--- a/scripts/unifdef.c
+++ b/scripts/unifdef.c
@@ -206,7 +206,7 @@ static void             done(void);
 static void             error(const char *);
 static int              findsym(const char *);
 static void             flushline(bool);
-static Linetype         getline(void);
+static Linetype         get_line(void);
 static Linetype         ifeval(const char **);
 static void             ignoreoff(void);
 static void             ignoreon(void);
@@ -512,7 +512,7 @@ process(void)
 
         for (;;) {
                 linenum++;
-                lineval = getline();
+                lineval = get_line();
                 trans_table[ifstate[depth]][lineval]();
                 debug("process %s -> %s depth %d",
                     linetype_name[lineval],
@@ -526,7 +526,7 @@ process(void)
  * help from skipcomment().
  */
 static Linetype
-getline(void)
+get_line(void)
 {
         const char *cp;
         int cursym;