38 files changed, 933 insertions, 387 deletions

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index bdf42fdf64c9..07125e697d7a 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -156,6 +156,11 @@ cpp_flags      = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE)     \
 
 ld_flags       = $(LDFLAGS) $(ldflags-y)
 
+dtc_cpp_flags  = -Wp,-MD,$(depfile) -nostdinc                            \
+                 -I$(srctree)/arch/$(SRCARCH)/boot/dts                   \
+                 -I$(srctree)/arch/$(SRCARCH)/include/dts                \
+                 -undef -D__DTS__
+
 # Finds the multi-part object the current object will be linked into
 modname-multi = $(sort $(foreach m,$(multi-used),\
                 $(if $(filter $(subst $(obj)/,,$*.o), $($(m:.o=-objs)) $($(m:.o=-y))),$(m:.o=))))
@@ -269,6 +274,15 @@ cmd_dtc = $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 $(DTC_FLAGS) -d $(depfile
 $(obj)/%.dtb: $(src)/%.dts FORCE
         $(call if_changed_dep,dtc)
 
+dtc-tmp = $(subst $(comma),_,$(dot-target).dts)
+
+quiet_cmd_dtc_cpp = DTC+CPP $@
+cmd_dtc_cpp = $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
+        $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 $(DTC_FLAGS) $(dtc-tmp)
+
+$(obj)/%.dtb: $(src)/%.dtsp FORCE
+        $(call if_changed_dep,dtc_cpp)
+
 # Bzip2
 # ---------------------------------------------------------------------------
 
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index cb1f50cf12e3..7f6425e24ce3 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -409,7 +409,7 @@ static void traps(void)
         int *p = (int *)test;
 
         if (*p != INT_CONF) {
-                fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
+                fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianness? %#x\n",
                         *p);
                 exit(2);
         }
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 4d2c7dfdaabd..b28cc384a5bc 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -230,12 +230,12 @@ our $Inline	= qr{inline|__always_inline|noinline};
 our $Member     = qr{->$Ident|\.$Ident|\[[^]]*\]};
 our $Lval       = qr{$Ident(?:$Member)*};
 
-our $Float_hex  = qr{(?i:0x[0-9a-f]+p-?[0-9]+[fl]?)};
-our $Float_dec  = qr{(?i:((?:[0-9]+\.[0-9]*|[0-9]*\.[0-9]+)(?:e-?[0-9]+)?[fl]?))};
-our $Float_int  = qr{(?i:[0-9]+e-?[0-9]+[fl]?)};
+our $Float_hex  = qr{(?i)0x[0-9a-f]+p-?[0-9]+[fl]?};
+our $Float_dec  = qr{(?i)(?:[0-9]+\.[0-9]*|[0-9]*\.[0-9]+)(?:e-?[0-9]+)?[fl]?};
+our $Float_int  = qr{(?i)[0-9]+e-?[0-9]+[fl]?};
 our $Float      = qr{$Float_hex|$Float_dec|$Float_int};
-our $Constant   = qr{(?:$Float|(?i:(?:0x[0-9a-f]+|[0-9]+)[ul]*))};
-our $Assignment = qr{(?:\*\=|/=|%=|\+=|-=|<<=|>>=|&=|\^=|\|=|=)};
+our $Constant   = qr{$Float|(?i)(?:0x[0-9a-f]+|[0-9]+)[ul]*};
+our $Assignment = qr{\*\=|/=|%=|\+=|-=|<<=|>>=|&=|\^=|\|=|=};
 our $Compare    = qr{<=|>=|==|!=|<|>};
 our $Operators  = qr{
                         <=|>=|==|!=|
@@ -1931,6 +1931,12 @@ sub process {
                               "use the SSYNC() macro in asm/blackfin.h\n" . $herevet);
                 }
 
+# check for old HOTPLUG __dev<foo> section markings
+                if ($line =~ /\b(__dev(init|exit)(data|const|))\b/) {
+                        WARN("HOTPLUG_SECTION",
+                             "Using $1 is unnecessary\n" . $herecurr);
+                }
+
 # Check for potential 'bare' types
                 my ($stat, $cond, $line_nr_next, $remain_next, $off_next,
                     $realline_next);
@@ -2430,6 +2436,15 @@ sub process {
                              "Prefer pr_warn(... to pr_warning(...\n" . $herecurr);
                 }
 
+                if ($line =~ /\bdev_printk\s*\(\s*KERN_([A-Z]+)/) {
+                        my $orig = $1;
+                        my $level = lc($orig);
+                        $level = "warn" if ($level eq "warning");
+                        $level = "dbg" if ($level eq "debug");
+                        WARN("PREFER_DEV_LEVEL",
+                             "Prefer dev_$level(... to dev_printk(KERN_$orig, ...\n" . $herecurr);
+                }
+
 # function brace can't be on same line, except for #defines of do while,
 # or if closed on same line
                 if (($line=~/$Type\s*$Ident\(.*\).*\s{/) and
@@ -2915,6 +2930,7 @@ sub process {
                         my $var = $1;
                         if ($var !~ /$Constant/ &&
                             $var =~ /[A-Z]\w*[a-z]|[a-z]\w*[A-Z]/ &&
+                            $var !~ /"^(?:Clear|Set|TestClear|TestSet|)Page[A-Z]/ &&
                             !defined $camelcase{$var}) {
                                 $camelcase{$var} = 1;
                                 WARN("CAMELCASE",
@@ -3237,9 +3253,9 @@ sub process {
                 }
 
 # prefer usleep_range over udelay
-                if ($line =~ /\budelay\s*\(\s*(\w+)\s*\)/) {
+                if ($line =~ /\budelay\s*\(\s*(\d+)\s*\)/) {
                         # ignore udelay's < 10, however
-                        if (! (($1 =~ /(\d+)/) && ($1 < 10)) ) {
+                        if (! ($1 < 10) ) {
                                 CHK("USLEEP_RANGE",
                                     "usleep_range is preferred over udelay; see Documentation/timers/timers-howto.txt\n" . $line);
                         }
@@ -3460,6 +3476,12 @@ sub process {
                              "unnecessary cast may hide bugs, see http://c-faq.com/malloc/mallocnocast.html\n" . $herecurr);
                 }
 
+# check for alloc argument mismatch
+                if ($line =~ /\b(kcalloc|kmalloc_array)\s*\(\s*sizeof\b/) {
+                        WARN("ALLOC_ARRAY_ARGS",
+                             "$1 uses number as first arg, sizeof is generally wrong\n" . $herecurr);
+                }
+
 # check for multiple semicolons
                 if ($line =~ /;\s*;\s*$/) {
                         WARN("ONE_SEMICOLON",
diff --git a/scripts/checkstack.pl b/scripts/checkstack.pl
index 17e384396705..544aa56b6200 100755
--- a/scripts/checkstack.pl
+++ b/scripts/checkstack.pl
@@ -34,7 +34,7 @@ use strict;
 # $1 (first bracket) matches the dynamic amount of the stack growth
 #
 # use anything else and feel the pain ;)
-my (@stack, $re, $dre, $x, $xs);
+my (@stack, $re, $dre, $x, $xs, $funcre);
 {
         my $arch = shift;
         if ($arch eq "") {
@@ -44,6 +44,7 @@ my (@stack, $re, $dre, $x, $xs);
 
         $x      = "[0-9a-f]";   # hex character
         $xs     = "[0-9a-f ]";  # hex character or space
+        $funcre = qr/^$x* <(.*)>:$/;
         if ($arch eq 'arm') {
                 #c0008ffc:      e24dd064        sub     sp, sp, #100    ; 0x64
                 $re = qr/.*sub.*sp, sp, #(([0-9]{2}|[3-9])[0-9]{2})/o;
@@ -66,6 +67,10 @@ my (@stack, $re, $dre, $x, $xs);
                 #    2b6c:       4e56 fb70       linkw %fp,#-1168
                 #  1df770:       defc ffe4       addaw #-28,%sp
                 $re = qr/.*(?:linkw %fp,|addaw )#-([0-9]{1,4})(?:,%sp)?$/o;
+        } elsif ($arch eq 'metag') {
+                #400026fc:       40 00 00 82     ADD       A0StP,A0StP,#0x8
+                $re = qr/.*ADD.*A0StP,A0StP,\#(0x$x{1,8})/o;
+                $funcre = qr/^$x* <[^\$](.*)>:$/;
         } elsif ($arch eq 'mips64') {
                 #8800402c:       67bdfff0        daddiu  sp,sp,-16
                 $re = qr/.*daddiu.*sp,sp,-(([0-9]{2}|[3-9])[0-9]{2})/o;
@@ -109,7 +114,6 @@ my (@stack, $re, $dre, $x, $xs);
 #
 # main()
 #
-my $funcre = qr/^$x* <(.*)>:$/;
 my ($func, $file, $lastslash);
 
 while (my $line = <STDIN>) {
diff --git a/scripts/coccicheck b/scripts/coccicheck
index 1a49d1c7ecfe..85d31899ad98 100755
--- a/scripts/coccicheck
+++ b/scripts/coccicheck
@@ -2,6 +2,15 @@
 
 SPATCH="`which ${SPATCH:=spatch}`"
 
+# The verbosity may be set by the environmental parameter V=
+# as for example with 'make V=1 coccicheck'
+
+if [ -n "$V" -a "$V" != "0" ]; then
+        VERBOSE=1
+else
+        VERBOSE=0
+fi
+
 if [ "$C" = "1" -o "$C" = "2" ]; then
     ONLINE=1
 
@@ -46,6 +55,14 @@ if [ "$ONLINE" = "0" ] ; then
     echo ''
 fi
 
+run_cmd() {
+        if [ $VERBOSE -ne 0 ] ; then
+                echo "Running: $@"
+        fi
+        eval $@
+}
+
+
 coccinelle () {
     COCCI="$1"
 
@@ -55,7 +72,7 @@ coccinelle () {
 #
 #    $SPATCH -D $MODE $FLAGS -parse_cocci $COCCI $OPT > /dev/null
 
-    if [ "$ONLINE" = "0" ] ; then
+    if [ $VERBOSE -ne 0 ] ; then
 
         FILE=`echo $COCCI | sed "s|$srctree/||"`
 
@@ -91,15 +108,21 @@ coccinelle () {
     fi
 
     if [ "$MODE" = "chain" ] ; then
-        $SPATCH -D patch   $FLAGS -sp_file $COCCI $OPT $OPTIONS               || \
-        $SPATCH -D report  $FLAGS -sp_file $COCCI $OPT $OPTIONS -no_show_diff || \
-        $SPATCH -D context $FLAGS -sp_file $COCCI $OPT $OPTIONS               || \
-        $SPATCH -D org     $FLAGS -sp_file $COCCI $OPT $OPTIONS -no_show_diff || exit 1
+        run_cmd $SPATCH -D patch   \
+                $FLAGS -sp_file $COCCI $OPT $OPTIONS               || \
+        run_cmd $SPATCH -D report  \
+                $FLAGS -sp_file $COCCI $OPT $OPTIONS -no_show_diff || \
+        run_cmd $SPATCH -D context \
+                $FLAGS -sp_file $COCCI $OPT $OPTIONS               || \
+        run_cmd $SPATCH -D org     \
+                $FLAGS -sp_file $COCCI $OPT $OPTIONS -no_show_diff || exit 1
     elif [ "$MODE" = "rep+ctxt" ] ; then
-        $SPATCH -D report  $FLAGS -sp_file $COCCI $OPT $OPTIONS -no_show_diff && \
-        $SPATCH -D context $FLAGS -sp_file $COCCI $OPT $OPTIONS || exit 1
+        run_cmd $SPATCH -D report  \
+                $FLAGS -sp_file $COCCI $OPT $OPTIONS -no_show_diff && \
+        run_cmd $SPATCH -D context \
+                $FLAGS -sp_file $COCCI $OPT $OPTIONS || exit 1
     else
-        $SPATCH -D $MODE   $FLAGS -sp_file $COCCI $OPT $OPTIONS || exit 1
+        run_cmd $SPATCH -D $MODE   $FLAGS -sp_file $COCCI $OPT $OPTIONS || exit 1
     fi
 
 }
diff --git a/scripts/coccinelle/api/devm_ioremap_resource.cocci b/scripts/coccinelle/api/devm_ioremap_resource.cocci
new file mode 100644
index 000000000000..495daa3dbf77
--- /dev/null
+++ b/scripts/coccinelle/api/devm_ioremap_resource.cocci
@@ -0,0 +1,90 @@
+virtual patch
+virtual report
+
+@depends on patch@
+expression base, dev, res;
+@@
+
+-base = devm_request_and_ioremap(dev, res);
++base = devm_ioremap_resource(dev, res);
+ ...
+ if (
+-base == NULL
++IS_ERR(base)
+ || ...) {
+<...
+-       return ...;
++       return PTR_ERR(base);
+...>
+ }
+
+@depends on patch@
+expression e, E, ret;
+identifier l;
+@@
+
+ e = devm_ioremap_resource(...);
+ ...
+ if (IS_ERR(e) || ...) {
+        ... when any
+-       ret = E;
++       ret = PTR_ERR(e);
+        ...
+(
+        return ret;
+|
+        goto l;
+)
+ }
+
+@depends on patch@
+expression e;
+@@
+
+ e = devm_ioremap_resource(...);
+ ...
+ if (IS_ERR(e) || ...) {
+        ...
+-       \(dev_dbg\|dev_err\|pr_debug\|pr_err\|DRM_ERROR\)(...);
+        ...
+ }
+
+@depends on patch@
+expression e;
+identifier l;
+@@
+
+ e = devm_ioremap_resource(...);
+ ...
+ if (IS_ERR(e) || ...)
+-{
+(
+        return ...;
+|
+        goto l;
+)
+-}
+
+@r depends on report@
+expression e;
+identifier l;
+position p1;
+@@
+
+*e = devm_request_and_ioremap@p1(...);
+ ...
+ if (e == NULL || ...) {
+        ...
+(
+        return ...;
+|
+        goto l;
+)
+ }
+
+@script:python depends on r@
+p1 << r.p1;
+@@
+
+msg = "ERROR: deprecated devm_request_and_ioremap() API used on line %s" % (p1[0].line)
+coccilib.report.print_report(p1[0], msg)
diff --git a/scripts/coccinelle/misc/memcpy-assign.cocci b/scripts/coccinelle/misc/memcpy-assign.cocci
new file mode 100644
index 000000000000..afd058be497f
--- /dev/null
+++ b/scripts/coccinelle/misc/memcpy-assign.cocci
@@ -0,0 +1,103 @@
+//
+// Replace memcpy with struct assignment.
+//
+// Confidence: High
+// Copyright: (C) 2012 Peter Senna Tschudin, INRIA/LIP6.  GPLv2.
+// URL: http://coccinelle.lip6.fr/
+// Comments:
+// Options: --no-includes --include-headers
+
+virtual patch
+virtual report
+virtual context
+virtual org
+
+@r1 depends on !patch@
+identifier struct_name;
+struct struct_name to;
+struct struct_name from;
+struct struct_name *top;
+struct struct_name *fromp;
+position p;
+@@
+memcpy@p(\(&(to)\|top\), \(&(from)\|fromp\), \(sizeof(to)\|sizeof(from)\|sizeof(struct struct_name)\|sizeof(*top)\|sizeof(*fromp)\))
+
+@script:python depends on report@
+p << r1.p;
+@@
+coccilib.report.print_report(p[0],"Replace memcpy with struct assignment")
+
+@depends on context@
+position r1.p;
+@@
+*memcpy@p(...);
+
+@script:python depends on org@
+p << r1.p;
+@@
+cocci.print_main("Replace memcpy with struct assignment",p)
+
+@depends on patch@
+identifier struct_name;
+struct struct_name to;
+struct struct_name from;
+@@
+(
+-memcpy(&(to), &(from), sizeof(to));
++to = from;
+|
+-memcpy(&(to), &(from), sizeof(from));
++to = from;
+|
+-memcpy(&(to), &(from), sizeof(struct struct_name));
++to = from;
+)
+
+@depends on patch@
+identifier struct_name;
+struct struct_name to;
+struct struct_name *from;
+@@
+(
+-memcpy(&(to), from, sizeof(to));
++to = *from;
+|
+-memcpy(&(to), from, sizeof(*from));
++to = *from;
+|
+-memcpy(&(to), from, sizeof(struct struct_name));
++to = *from;
+)
+
+@depends on patch@
+identifier struct_name;
+struct struct_name *to;
+struct struct_name from;
+@@
+(
+-memcpy(to, &(from), sizeof(*to));
++ *to = from;
+|
+-memcpy(to, &(from), sizeof(from));
++ *to = from;
+|
+-memcpy(to, &(from), sizeof(struct struct_name));
++ *to = from;
+)
+
+@depends on patch@
+identifier struct_name;
+struct struct_name *to;
+struct struct_name *from;
+@@
+(
+-memcpy(to, from, sizeof(*to));
++ *to = *from;
+|
+-memcpy(to, from, sizeof(*from));
++ *to = *from;
+|
+-memcpy(to, from, sizeof(struct struct_name));
++ *to = *from;
+)
+
diff --git a/scripts/coccinelle/misc/orplus.cocci b/scripts/coccinelle/misc/orplus.cocci
new file mode 100644
index 000000000000..4a28cef1484e
--- /dev/null
+++ b/scripts/coccinelle/misc/orplus.cocci
@@ -0,0 +1,55 @@
+/// Check for constants that are added but are used elsewhere as bitmasks
+/// The results should be checked manually to ensure that the nonzero
+/// bits in the two constants are actually disjoint.
+///
+// Confidence: Moderate
+// Copyright: (C) 2013 Julia Lawall, INRIA/LIP6.  GPLv2.
+// Copyright: (C) 2013 Gilles Muller, INRIA/LIP6.  GPLv2.
+// URL: http://coccinelle.lip6.fr/
+// Comments:
+// Options: -no_includes -include_headers
+
+virtual org
+virtual report
+virtual context
+
+@r@
+constant c;
+identifier i;
+expression e;
+@@
+
+(
+e | c@i
+|
+e & c@i
+|
+e |= c@i
+|
+e &= c@i
+)
+
+@s@
+constant r.c,c1;
+identifier i1;
+position p;
+@@
+
+(
+ c1 + c - 1
+|
+*c1@i1 +@p c
+)
+
+@script:python depends on org@
+p << s.p;
+@@
+
+cocci.print_main("sum of probable bitmasks, consider |",p)
+
+@script:python depends on report@
+p << s.p;
+@@
+
+msg = "WARNING: sum of probable bitmasks, consider |"
+coccilib.report.print_report(p[0],msg)
diff --git a/scripts/coccinelle/misc/semicolon.cocci b/scripts/coccinelle/misc/semicolon.cocci
new file mode 100644
index 000000000000..a47eba2edc9e
--- /dev/null
+++ b/scripts/coccinelle/misc/semicolon.cocci
@@ -0,0 +1,83 @@
+///
+/// Removes unneeded semicolon.
+///
+// Confidence: Moderate
+// Copyright: (C) 2012 Peter Senna Tschudin, INRIA/LIP6.  GPLv2.
+// URL: http://coccinelle.lip6.fr/
+// Comments: Some false positives on empty default cases in switch statements.
+// Options: --no-includes --include-headers
+
+virtual patch
+virtual report
+virtual context
+virtual org
+
+@r_default@
+position p;
+@@
+switch (...)
+{
+default: ...;@p
+}
+
+@r_case@
+position p;
+@@
+(
+switch (...)
+{
+case ...:;@p
+}
+|
+switch (...)
+{
+case ...:...
+case ...:;@p
+}
+|
+switch (...)
+{
+case ...:...
+case ...:
+case ...:;@p
+}
+)
+
+@r1@
+statement S;
+position p1;
+position p != {r_default.p, r_case.p};
+identifier label;
+@@
+(
+label:;
+|
+S@p1;@p
+)
+
+@script:python@
+p << r1.p;
+p1 << r1.p1;
+@@
+if p[0].line != p1[0].line_end:
+        cocci.include_match(False)
+
+@depends on patch@
+position r1.p;
+@@
+-;@p
+
+@script:python depends on report@
+p << r1.p;
+@@
+coccilib.report.print_report(p[0],"Unneeded semicolon")
+
+@depends on context@
+position r1.p;
+@@
+*;@p
+
+@script:python depends on org@
+p << r1.p;
+@@
+cocci.print_main("Unneeded semicolon",p)
diff --git a/scripts/genksyms/genksyms.c b/scripts/genksyms/genksyms.c
index 8a106499ec4f..d25e4a118d37 100644
--- a/scripts/genksyms/genksyms.c
+++ b/scripts/genksyms/genksyms.c
@@ -826,7 +826,8 @@ int main(int argc, char **argv)
                         genksyms_usage();
                         return 1;
                 }
-        if ((strcmp(arch, "h8300") == 0) || (strcmp(arch, "blackfin") == 0))
+        if ((strcmp(arch, "h8300") == 0) || (strcmp(arch, "blackfin") == 0) ||
+            (strcmp(arch, "metag") == 0))
                 mod_prefix = "_";
         {
                 extern int yydebug;
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index 8b673dd4627f..ce4cc837b748 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -433,7 +433,7 @@ foreach my $file (@ARGV) {
 
         while (<$patch>) {
             my $patch_line = $_;
-            if (m/^\+\+\+\s+(\S+)/) {
+            if (m/^\+\+\+\s+(\S+)/ or m/^---\s+(\S+)/) {
                 my $filename = $1;
                 $filename =~ s@^[^/]*/@@;
                 $filename =~ s@\n@@;
@@ -611,6 +611,10 @@ sub get_maintainers {
                                     $hash{$tvi} = $value_pd;
                                 }
                             }
+                        } elsif ($type eq 'K') {
+                            if ($file =~ m/$value/x) {
+                                $hash{$tvi} = 0;
+                            }
                         }
                     }
                 }
diff --git a/scripts/headers_install.pl b/scripts/headers_install.pl
index 6c353ae8a451..581ca99c96f2 100644
--- a/scripts/headers_install.pl
+++ b/scripts/headers_install.pl
@@ -42,9 +42,9 @@ foreach my $filename (@files) {
                 $line =~ s/(^|\s)(inline)\b/$1__$2__/g;
                 $line =~ s/(^|\s)(asm)\b(\s|[(]|$)/$1__$2__$3/g;
                 $line =~ s/(^|\s|[(])(volatile)\b(\s|[(]|$)/$1__$2__$3/g;
-                $line =~ s/#ifndef _UAPI/#ifndef /;
-                $line =~ s/#define _UAPI/#define /;
-                $line =~ s!#endif /[*] _UAPI!#endif /* !;
+                $line =~ s/#ifndef\s+_UAPI/#ifndef /;
+                $line =~ s/#define\s+_UAPI/#define /;
+                $line =~ s!#endif\s+/[*]\s*_UAPI!#endif /* !;
                 printf {$out} "%s", $line;
         }
         close $out;
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 3091794e9354..231b4759c714 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -11,6 +11,9 @@ else
 Kconfig := Kconfig
 endif
 
+# We need this, in case the user has it in its environment
+unexport CONFIG_
+
 xconfig: $(obj)/qconf
         $< $(Kconfig)
 
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 4da3b4adfad2..e39fcd8143ea 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -36,6 +36,7 @@ enum input_mode {
 } input_mode = oldaskconfig;
 
 static int indent = 1;
+static int tty_stdio;
 static int valid_stdin = 1;
 static int sync_kconfig;
 static int conf_cnt;
@@ -108,6 +109,8 @@ static int conf_askvalue(struct symbol *sym, const char *def)
         case oldaskconfig:
                 fflush(stdout);
                 xfgets(line, 128, stdin);
+                if (!tty_stdio)
+                        printf("\n");
                 return 1;
         default:
                 break;
@@ -495,6 +498,8 @@ int main(int ac, char **av)
         bindtextdomain(PACKAGE, LOCALEDIR);
         textdomain(PACKAGE);
 
+        tty_stdio = isatty(0) && isatty(1) && isatty(2);
+
         while ((opt = getopt_long(ac, av, "", long_opts, NULL)) != -1) {
                 input_mode = (enum input_mode)opt;
                 switch (opt) {
@@ -621,7 +626,7 @@ int main(int ac, char **av)
                                 return 1;
                         }
                 }
-                valid_stdin = isatty(0) && isatty(1) && isatty(2);
+                valid_stdin = tty_stdio;
         }
 
         switch (input_mode) {
diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c
index 290ce41f8ba4..d6626521f9b9 100644
--- a/scripts/kconfig/expr.c
+++ b/scripts/kconfig/expr.c
@@ -13,7 +13,7 @@
 
 struct expr *expr_alloc_symbol(struct symbol *sym)
 {
-        struct expr *e = calloc(1, sizeof(*e));
+        struct expr *e = xcalloc(1, sizeof(*e));
         e->type = E_SYMBOL;
         e->left.sym = sym;
         return e;
@@ -21,7 +21,7 @@ struct expr *expr_alloc_symbol(struct symbol *sym)
 
 struct expr *expr_alloc_one(enum expr_type type, struct expr *ce)
 {
-        struct expr *e = calloc(1, sizeof(*e));
+        struct expr *e = xcalloc(1, sizeof(*e));
         e->type = type;
         e->left.expr = ce;
         return e;
@@ -29,7 +29,7 @@ struct expr *expr_alloc_one(enum expr_type type, struct expr *ce)
 
 struct expr *expr_alloc_two(enum expr_type type, struct expr *e1, struct expr *e2)
 {
-        struct expr *e = calloc(1, sizeof(*e));
+        struct expr *e = xcalloc(1, sizeof(*e));
         e->type = type;
         e->left.expr = e1;
         e->right.expr = e2;
@@ -38,7 +38,7 @@ struct expr *expr_alloc_two(enum expr_type type, struct expr *e1, struct expr *e
 
 struct expr *expr_alloc_comp(enum expr_type type, struct symbol *s1, struct symbol *s2)
 {
-        struct expr *e = calloc(1, sizeof(*e));
+        struct expr *e = xcalloc(1, sizeof(*e));
         e->type = type;
         e->left.sym = s1;
         e->right.sym = s2;
@@ -66,7 +66,7 @@ struct expr *expr_copy(const struct expr *org)
         if (!org)
                 return NULL;
 
-        e = malloc(sizeof(*org));
+        e = xmalloc(sizeof(*org));
         memcpy(e, org, sizeof(*org));
         switch (org->type) {
         case E_SYMBOL:
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
index adc230638c5b..f2bee70e26f4 100644
--- a/scripts/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -10,6 +10,7 @@
 #  include <config.h>
 #endif
 
+#include <stdlib.h>
 #include "lkc.h"
 #include "images.c"
 
@@ -22,7 +23,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <time.h>
-#include <stdlib.h>
 
 //#define DEBUG
 
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
index c18f2bd9c095..f8aee5fc6d5e 100644
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -39,6 +39,12 @@ extern "C" {
 #ifndef CONFIG_
 #define CONFIG_ "CONFIG_"
 #endif
+static inline const char *CONFIG_prefix(void)
+{
+        return getenv( "CONFIG_" ) ?: CONFIG_;
+}
+#undef CONFIG_
+#define CONFIG_ CONFIG_prefix()
 
 #define TF_COMMAND      0x0001
 #define TF_PARAM        0x0002
@@ -116,6 +122,8 @@ void menu_set_type(int type);
 /* util.c */
 struct file *file_lookup(const char *name);
 int file_write_dep(const char *name);
+void *xmalloc(size_t size);
+void *xcalloc(size_t nmemb, size_t size);
 
 struct gstr {
         size_t len;
diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh
index c8e8a7154753..80788137c670 100644
--- a/scripts/kconfig/lxdialog/check-lxdialog.sh
+++ b/scripts/kconfig/lxdialog/check-lxdialog.sh
@@ -21,6 +21,7 @@ ccflags()
 {
         if [ -f /usr/include/ncursesw/curses.h ]; then
                 echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncursesw/curses.h>"'
+                echo ' -DNCURSES_WIDECHAR=1'
         elif [ -f /usr/include/ncurses/ncurses.h ]; then
                 echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"'
         elif [ -f /usr/include/ncurses/curses.h ]; then
diff --git a/scripts/kconfig/lxdialog/dialog.h b/scripts/kconfig/lxdialog/dialog.h
index ee17a5264d5b..307022a8beef 100644
--- a/scripts/kconfig/lxdialog/dialog.h
+++ b/scripts/kconfig/lxdialog/dialog.h
@@ -221,7 +221,6 @@ int dialog_menu(const char *title, const char *prompt,
                 const void *selected, int *s_scroll);
 int dialog_checklist(const char *title, const char *prompt, int height,
                      int width, int list_height);
-extern char dialog_input_result[];
 int dialog_inputbox(const char *title, const char *prompt, int height,
                     int width, const char *init);
 
diff --git a/scripts/kconfig/lxdialog/inputbox.c b/scripts/kconfig/lxdialog/inputbox.c
index dd8e587c50e2..21404a04d7c3 100644
--- a/scripts/kconfig/lxdialog/inputbox.c
+++ b/scripts/kconfig/lxdialog/inputbox.c
@@ -45,7 +45,8 @@ int dialog_inputbox(const char *title, const char *prompt, int height, int width
                     const char *init)
 {
         int i, x, y, box_y, box_x, box_width;
-        int input_x = 0, scroll = 0, key = 0, button = -1;
+        int input_x = 0, key = 0, button = -1;
+        int show_x, len, pos;
         char *instr = dialog_input_result;
         WINDOW *dialog;
 
@@ -97,14 +98,17 @@ do_resize:
         wmove(dialog, box_y, box_x);
         wattrset(dialog, dlg.inputbox.atr);
 
-        input_x = strlen(instr);
+        len = strlen(instr);
+        pos = len;
 
-        if (input_x >= box_width) {
-                scroll = input_x - box_width + 1;
+        if (len >= box_width) {
+                show_x = len - box_width + 1;
                 input_x = box_width - 1;
                 for (i = 0; i < box_width - 1; i++)
-                        waddch(dialog, instr[scroll + i]);
+                        waddch(dialog, instr[show_x + i]);
         } else {
+                show_x = 0;
+                input_x = len;
                 waddstr(dialog, instr);
         }
 
@@ -121,45 +125,104 @@ do_resize:
                         case KEY_UP:
                         case KEY_DOWN:
                                 break;
-                        case KEY_LEFT:
-                                continue;
-                        case KEY_RIGHT:
-                                continue;
                         case KEY_BACKSPACE:
                         case 127:
-                                if (input_x || scroll) {
+                                if (pos) {
                                         wattrset(dialog, dlg.inputbox.atr);
-                                        if (!input_x) {
-                                                scroll = scroll < box_width - 1 ? 0 : scroll - (box_width - 1);
-                                                wmove(dialog, box_y, box_x);
-                                                for (i = 0; i < box_width; i++)
-                                                        waddch(dialog,
-                                                               instr[scroll + input_x + i] ?
-                                                               instr[scroll + input_x + i] : ' ');
-                                                input_x = strlen(instr) - scroll;
+                                        if (input_x == 0) {
+                                                show_x--;
                                         } else
                                                 input_x--;
-                                        instr[scroll + input_x] = '\0';
-                                        mvwaddch(dialog, box_y, input_x + box_x, ' ');
+
+                                        if (pos < len) {
+                                                for (i = pos - 1; i < len; i++) {
+                                                        instr[i] = instr[i+1];
+                                                }
+                                        }
+
+                                        pos--;
+                                        len--;
+                                        instr[len] = '\0';
+                                        wmove(dialog, box_y, box_x);
+                                        for (i = 0; i < box_width; i++) {
+                                                if (!instr[show_x + i]) {
+                                                        waddch(dialog, ' ');
+                                                        break;
+                                                }
+                                                waddch(dialog, instr[show_x + i]);
+                                        }
                                         wmove(dialog, box_y, input_x + box_x);
                                         wrefresh(dialog);
                                 }
                                 continue;
+                        case KEY_LEFT:
+                                if (pos > 0) {
+                                        if (input_x > 0) {
+                                                wmove(dialog, box_y, --input_x + box_x);
+                                        } else if (input_x == 0) {
+                                                show_x--;
+                                                wmove(dialog, box_y, box_x);
+                                                for (i = 0; i < box_width; i++) {
+                                                        if (!instr[show_x + i]) {
+                                                                waddch(dialog, ' ');
+                                                                break;
+                                                        }
+                                                        waddch(dialog, instr[show_x + i]);
+                                                }
+                                                wmove(dialog, box_y, box_x);
+                                        }
+                                        pos--;
+                                }
+                                continue;
+                        case KEY_RIGHT:
+                                if (pos < len) {
+                                        if (input_x < box_width - 1) {
+                                                wmove(dialog, box_y, ++input_x + box_x);
+                                        } else if (input_x == box_width - 1) {
+                                                show_x++;
+                                                wmove(dialog, box_y, box_x);
+                                                for (i = 0; i < box_width; i++) {
+                                                        if (!instr[show_x + i]) {
+                                                                waddch(dialog, ' ');
+                                                                break;
+                                                        }
+                                                        waddch(dialog, instr[show_x + i]);
+                                                }
+                                                wmove(dialog, box_y, input_x + box_x);
+                                        }
+                                        pos++;
+                                }
+                                continue;
                         default:
                                 if (key < 0x100 && isprint(key)) {
-                                        if (scroll + input_x < MAX_LEN) {
+                                        if (len < MAX_LEN) {
                                                 wattrset(dialog, dlg.inputbox.atr);
-                                                instr[scroll + input_x] = key;
-                                                instr[scroll + input_x + 1] = '\0';
+                                                if (pos < len) {
+                                                        for (i = len; i > pos; i--)
+                                                                instr[i] = instr[i-1];
+                                                        instr[pos] = key;
+                                                } else {
+                                                        instr[len] = key;
+                                                }
+                                                pos++;
+                                                len++;
+                                                instr[len] = '\0';
+
                                                 if (input_x == box_width - 1) {
-                                                        scroll++;
-                                                        wmove(dialog, box_y, box_x);
-                                                        for (i = 0; i < box_width - 1; i++)
-                                                                waddch(dialog, instr [scroll + i]);
+                                                        show_x++;
                                                 } else {
-                                                        wmove(dialog, box_y, input_x++ + box_x);
-                                                        waddch(dialog, key);
+                                                        input_x++;
+                                                }
+
+                                                wmove(dialog, box_y, box_x);
+                                                for (i = 0; i < box_width; i++) {
+                                                        if (!instr[show_x + i]) {
+                                                                waddch(dialog, ' ');
+                                                                break;
+                                                        }
+                                                        waddch(dialog, instr[show_x + i]);
                                                 }
+                                                wmove(dialog, box_y, input_x + box_x);
                                                 wrefresh(dialog);
                                         } else
                                                 flash();        /* Alarm user about overflow */
diff --git a/scripts/kconfig/lxdialog/menubox.c b/scripts/kconfig/lxdialog/menubox.c
index 1d604738fa13..48d382e7e374 100644
--- a/scripts/kconfig/lxdialog/menubox.c
+++ b/scripts/kconfig/lxdialog/menubox.c
@@ -26,7 +26,7 @@
  *
  *    *)  A bugfix for the Page-Down problem
  *
- *    *)  Formerly when I used Page Down and Page Up, the cursor would be set 
+ *    *)  Formerly when I used Page Down and Page Up, the cursor would be set
  *        to the first position in the menu box.  Now lxdialog is a bit
  *        smarter and works more like other menu systems (just have a look at
  *        it).
@@ -154,12 +154,14 @@ static void print_arrows(WINDOW * win, int item_no, int scroll, int y, int x,
  */
 static void print_buttons(WINDOW * win, int height, int width, int selected)
 {
-        int x = width / 2 - 16;
+        int x = width / 2 - 28;
         int y = height - 2;
 
         print_button(win, gettext("Select"), y, x, selected == 0);
         print_button(win, gettext(" Exit "), y, x + 12, selected == 1);
         print_button(win, gettext(" Help "), y, x + 24, selected == 2);
+        print_button(win, gettext(" Save "), y, x + 36, selected == 3);
+        print_button(win, gettext(" Load "), y, x + 48, selected == 4);
 
         wmove(win, y, x + 1 + 12 * selected);
         wrefresh(win);
@@ -372,7 +374,7 @@ do_resize:
                 case TAB:
                 case KEY_RIGHT:
                         button = ((key == KEY_LEFT ? --button : ++button) < 0)
-                            ? 2 : (button > 2 ? 0 : button);
+                            ? 4 : (button > 4 ? 0 : button);
 
                         print_buttons(dialog, height, width, button);
                         wrefresh(menu);
@@ -399,17 +401,17 @@ do_resize:
                                 return 2;
                         case 's':
                         case 'y':
-                                return 3;
+                                return 5;
                         case 'n':
-                                return 4;
+                                return 6;
                         case 'm':
-                                return 5;
+                                return 7;
                         case ' ':
-                                return 6;
+                                return 8;
                         case '/':
-                                return 7;
+                                return 9;
                         case 'z':
-                                return 8;
+                                return 10;
                         case '\n':
                                 return button;
                         }
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 53975cf87608..566288a76370 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -280,6 +280,7 @@ static struct menu *current_menu;
 static int child_count;
 static int single_menu_mode;
 static int show_all_options;
+static int save_and_exit;
 
 static void conf(struct menu *menu, struct menu *active_menu);
 static void conf_choice(struct menu *menu);
@@ -348,15 +349,19 @@ static void search_conf(void)
 {
         struct symbol **sym_arr;
         struct gstr res;
+        struct gstr title;
         char *dialog_input;
         int dres, vscroll = 0, hscroll = 0;
         bool again;
 
+        title = str_new();
+        str_printf( &title, _("Enter %s (sub)string to search for "
+                              "(with or without \"%s\")"), CONFIG_, CONFIG_);
+
 again:
         dialog_clear();
         dres = dialog_inputbox(_("Search Configuration Parameter"),
-                              _("Enter " CONFIG_ " (sub)string to search for "
-                                "(with or without \"" CONFIG_ "\")"),
+                              str_get(&title),
                               10, 75, "");
         switch (dres) {
         case 0:
@@ -365,6 +370,7 @@ again:
                 show_helptext(_("Search Configuration"), search_help);
                 goto again;
         default:
+                str_free(&title);
                 return;
         }
 
@@ -398,6 +404,7 @@ again:
                 str_free(&res);
         } while (again);
         free(sym_arr);
+        str_free(&title);
 }
 
 static void build_conf(struct menu *menu)
@@ -592,14 +599,6 @@ static void conf(struct menu *menu, struct menu *active_menu)
                 build_conf(menu);
                 if (!child_count)
                         break;
-                if (menu == &rootmenu) {
-                        item_make("--- ");
-                        item_set_tag(':');
-                        item_make(_("    Load an Alternate Configuration File"));
-                        item_set_tag('L');
-                        item_make(_("    Save an Alternate Configuration File"));
-                        item_set_tag('S');
-                }
                 dialog_clear();
                 res = dialog_menu(prompt ? _(prompt) : _("Main Menu"),
                                   _(menu_instructions),
@@ -636,12 +635,6 @@ static void conf(struct menu *menu, struct menu *active_menu)
                         case 's':
                                 conf_string(submenu);
                                 break;
-                        case 'L':
-                                conf_load();
-                                break;
-                        case 'S':
-                                conf_save();
-                                break;
                         }
                         break;
                 case 2:
@@ -651,6 +644,12 @@ static void conf(struct menu *menu, struct menu *active_menu)
                                 show_helptext(_("README"), _(mconf_readme));
                         break;
                 case 3:
+                        conf_save();
+                        break;
+                case 4:
+                        conf_load();
+                        break;
+                case 5:
                         if (item_is_tag('t')) {
                                 if (sym_set_tristate_value(sym, yes))
                                         break;
@@ -658,24 +657,24 @@ static void conf(struct menu *menu, struct menu *active_menu)
                                         show_textbox(NULL, setmod_text, 6, 74);
                         }
                         break;
-                case 4:
+                case 6:
                         if (item_is_tag('t'))
                                 sym_set_tristate_value(sym, no);
                         break;
-                case 5:
+                case 7:
                         if (item_is_tag('t'))
                                 sym_set_tristate_value(sym, mod);
                         break;
-                case 6:
+                case 8:
                         if (item_is_tag('t'))
                                 sym_toggle_tristate_value(sym);
                         else if (item_is_tag('m'))
                                 conf(submenu, NULL);
                         break;
-                case 7:
+                case 9:
                         search_conf();
                         break;
-                case 8:
+                case 10:
                         show_all_options = !show_all_options;
                         break;
                 }
@@ -702,6 +701,17 @@ static void show_helptext(const char *title, const char *text)
         show_textbox(title, text, 0, 0);
 }
 
+static void conf_message_callback(const char *fmt, va_list ap)
+{
+        char buf[PATH_MAX+1];
+
+        vsnprintf(buf, sizeof(buf), fmt, ap);
+        if (save_and_exit)
+                printf("%s", buf);
+        else
+                show_textbox(NULL, buf, 6, 60);
+}
+
 static void show_help(struct menu *menu)
 {
         struct gstr help = str_new();
@@ -870,6 +880,7 @@ static int handle_exit(void)
 {
         int res;
 
+        save_and_exit = 1;
         dialog_clear();
         if (conf_get_changed())
                 res = dialog_yesno(NULL,
@@ -941,6 +952,7 @@ int main(int ac, char **av)
         }
 
         set_config_filename(conf_get_configname());
+        conf_set_message_callback(conf_message_callback);
         do {
                 conf(&rootmenu, NULL);
                 res = handle_exit();
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index e98a05c8e508..f3bffa309333 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -48,7 +48,7 @@ void menu_add_entry(struct symbol *sym)
 {
         struct menu *menu;
 
-        menu = malloc(sizeof(*menu));
+        menu = xmalloc(sizeof(*menu));
         memset(menu, 0, sizeof(*menu));
         menu->sym = sym;
         menu->parent = current_menu;
@@ -531,7 +531,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop,
                         location = menu;
         }
         if (head && location) {
-                jump = malloc(sizeof(struct jump_key));
+                jump = xmalloc(sizeof(struct jump_key));
 
                 if (menu_is_visible(prop->menu)) {
                         /*
diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index 974d5cb7e30a..05274fccb88e 100755
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -32,11 +32,13 @@ usage() {
         echo "  -m    only merge the fragments, do not execute the make command"
         echo "  -n    use allnoconfig instead of alldefconfig"
         echo "  -r    list redundant entries when merging fragments"
+        echo "  -O    dir to put generated output files"
 }
 
 MAKE=true
 ALLTARGET=alldefconfig
 WARNREDUN=false
+OUTPUT=.
 
 while true; do
         case $1 in
@@ -59,6 +61,16 @@ while true; do
                 shift
                 continue
                 ;;
+        "-O")
+                if [ -d $2 ];then
+                        OUTPUT=$(echo $2 | sed 's/\/*$//')
+                else
+                        echo "output directory $2 does not exist" 1>&2
+                        exit 1
+                fi
+                shift 2
+                continue
+                ;;
         *)
                 break
                 ;;
@@ -100,9 +112,9 @@ for MERGE_FILE in $MERGE_LIST ; do
 done
 
 if [ "$MAKE" = "false" ]; then
-        cp $TMP_FILE .config
+        cp $TMP_FILE $OUTPUT/.config
         echo "#"
-        echo "# merged configuration written to .config (needs make)"
+        echo "# merged configuration written to $OUTPUT/.config (needs make)"
         echo "#"
         clean_up
         exit
@@ -111,14 +123,14 @@ fi
 # Use the merged file as the starting point for:
 # alldefconfig: Fills in any missing symbols with Kconfig default
 # allnoconfig: Fills in any missing symbols with # CONFIG_* is not set
-make KCONFIG_ALLCONFIG=$TMP_FILE $ALLTARGET
+make KCONFIG_ALLCONFIG=$TMP_FILE O=$OUTPUT $ALLTARGET
 
 
 # Check all specified config values took (might have missed-dependency issues)
 for CFG in $(sed -n "$SED_CONFIG_EXP" $TMP_FILE); do
 
         REQUESTED_VAL=$(grep -w -e "$CFG" $TMP_FILE)
-        ACTUAL_VAL=$(grep -w -e "$CFG" .config)
+        ACTUAL_VAL=$(grep -w -e "$CFG" $OUTPUT/.config)
         if [ "x$REQUESTED_VAL" != "x$ACTUAL_VAL" ] ; then
                 echo "Value requested for $CFG not in final .config"
                 echo "Requested value:  $REQUESTED_VAL"
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
index 87d4b15da951..dbf31edd22b2 100644
--- a/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
@@ -7,215 +7,208 @@
  */
 #define _GNU_SOURCE
 #include <string.h>
+#include <stdlib.h>
 
 #include "lkc.h"
 #include "nconf.h"
 #include <ctype.h>
 
-static const char nconf_readme[] = N_(
-"Overview\n"
-"--------\n"
-"This interface let you select features and parameters for the build.\n"
-"Features can either be built-in, modularized, or ignored. Parameters\n"
-"must be entered in as decimal or hexadecimal numbers or text.\n"
+static const char nconf_global_help[] = N_(
+"Help windows\n"
+"------------\n"
+"o  Global help:  Unless in a data entry window, pressing <F1> will give \n"
+"   you the global help window, which you are just reading.\n"
 "\n"
-"Menu items beginning with following braces represent features that\n"
-"  [ ] can be built in or removed\n"
-"  < > can be built in, modularized or removed\n"
-"  { } can be built in or modularized (selected by other feature)\n"
-"  - - are selected by other feature,\n"
-"  XXX cannot be selected. Use Symbol Info to find out why,\n"
-"while *, M or whitespace inside braces means to build in, build as\n"
-"a module or to exclude the feature respectively.\n"
+"o  A short version of the global help is available by pressing <F3>.\n"
 "\n"
-"To change any of these features, highlight it with the cursor\n"
-"keys and press <Y> to build it in, <M> to make it a module or\n"
-"<N> to removed it.  You may also press the <Space Bar> to cycle\n"
-"through the available options (ie. Y->N->M->Y).\n"
+"o  Local help:  To get help related to the current menu entry, use any\n"
+"   of <?> <h>, or if in a data entry window then press <F1>.\n"
 "\n"
-"Some additional keyboard hints:\n"
 "\n"
-"Menus\n"
-"----------\n"
-"o  Use the Up/Down arrow keys (cursor keys) to highlight the item\n"
-"   you wish to change use <Enter> or <Space>. Goto submenu by \n"
-"   pressing <Enter> of <right-arrow>. Use <Esc> or <left-arrow> to go back.\n"
-"   Submenus are designated by \"--->\".\n"
-"\n"
-"   Searching: pressing '/' triggers interactive search mode.\n"
-"              nconfig performs a case insensitive search for the string\n"
-"              in the menu prompts (no regex support).\n"
-"              Pressing the up/down keys highlights the previous/next\n"
-"              matching item. Backspace removes one character from the\n"
-"              match string. Pressing either '/' again or ESC exits\n"
-"              search mode. All other keys behave normally.\n"
+"Menu entries\n"
+"------------\n"
+"This interface lets you select features and parameters for the kernel\n"
+"build.  Kernel features can either be built-in, modularized, or removed.\n"
+"Parameters must be entered as text or decimal or hexadecimal numbers.\n"
 "\n"
-"   You may also use the <PAGE UP> and <PAGE DOWN> keys to scroll\n"
-"   unseen options into view.\n"
+"Menu entries beginning with following braces represent features that\n"
+"  [ ]  can be built in or removed\n"
+"  < >  can be built in, modularized or removed\n"
+"  { }  can be built in or modularized, are selected by another feature\n"
+"  - -  are selected by another feature\n"
+"  XXX  cannot be selected.  Symbol Info <F2> tells you why.\n"
+"*, M or whitespace inside braces means to build in, build as a module\n"
+"or to exclude the feature respectively.\n"
 "\n"
-"o  To exit a menu use the just press <ESC> <F5> <F8> or <left-arrow>.\n"
+"To change any of these features, highlight it with the movement keys\n"
+"listed below and press <y> to build it in, <m> to make it a module or\n"
+"<n> to remove it.  You may press the <Space> key to cycle through the\n"
+"available options.\n"
 "\n"
-"o  To get help with an item, press <F1>\n"
-"   Shortcut: Press <h> or <?>.\n"
+"A trailing \"--->\" designates a submenu.\n"
 "\n"
 "\n"
-"Radiolists  (Choice lists)\n"
-"-----------\n"
-"o  Use the cursor keys to select the option you wish to set and press\n"
-"   <S> or the <SPACE BAR>.\n"
+"Menu navigation keys\n"
+"----------------------------------------------------------------------\n"
+"Linewise up                 <Up>\n"
+"Linewise down               <Down>\n"
+"Pagewise up                 <Page Up>\n"
+"Pagewise down               <Page Down>\n"
+"First entry                 <Home>\n"
+"Last entry                  <End>\n"
+"Enter a submenu             <Right>  <Enter>\n"
+"Go back to parent menu      <Left>   <Esc>  <F5>\n"
+"Close a help window         <Enter>  <Esc>  <F5>\n"
+"Close entry window, apply   <Enter>\n"
+"Close entry window, forget  <Esc>  <F5>\n"
+"Start incremental, case-insensitive search for STRING in menu entries,\n"
+"    no regex support, STRING is displayed in upper left corner\n"
+"                            </>STRING\n"
+"    Remove last character   <Backspace>\n"
+"    Jump to next hit        <Down>\n"
+"    Jump to previous hit    <Up>\n"
+"Exit menu search mode       </>  <Esc>\n"
+"Search for configuration variables with or without leading CONFIG_\n"
+"                            <F8>RegExpr<Enter>\n"
+"Verbose search help         <F8><F1>\n"
+"----------------------------------------------------------------------\n"
 "\n"
-"   Shortcut: Press the first letter of the option you wish to set then\n"
-"             press <S> or <SPACE BAR>.\n"
+"Unless in a data entry window, key <1> may be used instead of <F1>,\n"
+"<2> instead of <F2>, etc.\n"
 "\n"
-"o  To see available help for the item, press <F1>\n"
-"   Shortcut: Press <H> or <?>.\n"
 "\n"
+"Radiolist (Choice list)\n"
+"-----------------------\n"
+"Use the movement keys listed above to select the option you wish to set\n"
+"and press <Space>.\n"
 "\n"
-"Data Entry\n"
-"-----------\n"
-"o  Enter the requested information and press <ENTER>\n"
-"   If you are entering hexadecimal values, it is not necessary to\n"
-"   add the '0x' prefix to the entry.\n"
 "\n"
-"o  For help, press <F1>.\n"
+"Data entry\n"
+"----------\n"
+"Enter the requested information and press <Enter>.  Hexadecimal values\n"
+"may be entered without the \"0x\" prefix.\n"
 "\n"
 "\n"
-"Text Box    (Help Window)\n"
-"--------\n"
-"o  Use the cursor keys to scroll up/down/left/right.  The VI editor\n"
-"   keys h,j,k,l function here as do <u>, <d> and <SPACE BAR> for\n"
-"   those who are familiar with less and lynx.\n"
+"Text Box (Help Window)\n"
+"----------------------\n"
+"Use movement keys as listed in table above.\n"
 "\n"
-"o  Press <Enter>, <F1>, <F5>, <F9>, <q> or <Esc> to exit.\n"
+"Press any of <Enter> <Esc> <q> <F5> <F9> to exit.\n"
 "\n"
 "\n"
-"Alternate Configuration Files\n"
+"Alternate configuration files\n"
 "-----------------------------\n"
-"nconfig supports the use of alternate configuration files for\n"
-"those who, for various reasons, find it necessary to switch\n"
-"between different configurations.\n"
+"nconfig supports switching between different configurations.\n"
+"Press <F6> to save your current configuration.  Press <F7> and enter\n"
+"a file name to load a previously saved configuration.\n"
 "\n"
-"At the end of the main menu you will find two options.  One is\n"
-"for saving the current configuration to a file of your choosing.\n"
-"The other option is for loading a previously saved alternate\n"
-"configuration.\n"
 "\n"
-"Even if you don't use alternate configuration files, but you\n"
-"find during a nconfig session that you have completely messed\n"
-"up your settings, you may use the \"Load Alternate...\" option to\n"
-"restore your previously saved settings from \".config\" without\n"
-"restarting nconfig.\n"
+"Terminal configuration\n"
+"----------------------\n"
+"If you use nconfig in a xterm window, make sure your TERM environment\n"
+"variable specifies a terminal configuration which supports at least\n"
+"16 colors.  Otherwise nconfig will look rather bad.\n"
 "\n"
-"Other information\n"
-"-----------------\n"
-"If you use nconfig in an XTERM window make sure you have your\n"
-"$TERM variable set to point to a xterm definition which supports color.\n"
-"Otherwise, nconfig will look rather bad.  nconfig will not\n"
-"display correctly in a RXVT window because rxvt displays only one\n"
-"intensity of color, bright.\n"
+"If the \"stty size\" command reports the current terminalsize correctly,\n"
+"nconfig will adapt to sizes larger than the traditional 80x25 \"standard\"\n"
+"and display longer menus properly.\n"
 "\n"
-"nconfig will display larger menus on screens or xterms which are\n"
-"set to display more than the standard 25 row by 80 column geometry.\n"
-"In order for this to work, the \"stty size\" command must be able to\n"
-"display the screen's current row and column geometry.  I STRONGLY\n"
-"RECOMMEND that you make sure you do NOT have the shell variables\n"
-"LINES and COLUMNS exported into your environment.  Some distributions\n"
-"export those variables via /etc/profile.  Some ncurses programs can\n"
-"become confused when those variables (LINES & COLUMNS) don't reflect\n"
-"the true screen size.\n"
 "\n"
-"Optional personality available\n"
-"------------------------------\n"
-"If you prefer to have all of the options listed in a single menu, rather\n"
-"than the default multimenu hierarchy, run the nconfig with NCONFIG_MODE\n"
-"environment variable set to single_menu. Example:\n"
+"Single menu mode\n"
+"----------------\n"
+"If you prefer to have all of the menu entries listed in a single menu,\n"
+"rather than the default multimenu hierarchy, run nconfig with\n"
+"NCONFIG_MODE environment variable set to single_menu.  Example:\n"
 "\n"
 "make NCONFIG_MODE=single_menu nconfig\n"
 "\n"
-"<Enter> will then unroll the appropriate category, or enfold it if it\n"
-"is already unrolled.\n"
+"<Enter> will then unfold the appropriate category, or fold it if it\n"
+"is already unfolded.  Folded menu entries will be designated by a\n"
+"leading \"++>\" and unfolded entries by a leading \"-->\".\n"
 "\n"
-"Note that this mode can eventually be a little more CPU expensive\n"
-"(especially with a larger number of unrolled categories) than the\n"
-"default mode.\n"
+"Note that this mode can eventually be a little more CPU expensive than\n"
+"the default mode, especially with a larger number of unfolded submenus.\n"
 "\n"),
 menu_no_f_instructions[] = N_(
-" You do not have function keys support. Please follow the\n"
-" following instructions:\n"
-" Arrow keys navigate the menu.\n"
-" <Enter> or <right-arrow> selects submenus --->.\n"
-" Capital Letters are hotkeys.\n"
-" Pressing <Y> includes, <N> excludes, <M> modularizes features.\n"
-" Pressing SpaceBar toggles between the above options.\n"
-" Press <Esc> or <left-arrow> to go back one menu,\n"
-" <?> or <h> for Help, </> for Search.\n"
-" <1> is interchangeable with <F1>, <2> with <F2>, etc.\n"
-" Legend: [*] built-in  [ ] excluded  <M> module  < > module capable.\n"
-" <Esc> always leaves the current window.\n"),
+"Legend:  [*] built-in  [ ] excluded  <M> module  < > module capable.\n"
+"Submenus are designated by a trailing \"--->\".\n"
+"\n"
+"Use the following keys to navigate the menus:\n"
+"Move up or down with <Up> and <Down>.\n"
+"Enter a submenu with <Enter> or <Right>.\n"
+"Exit a submenu to its parent menu with <Esc> or <Left>.\n"
+"Pressing <y> includes, <n> excludes, <m> modularizes features.\n"
+"Pressing <Space> cycles through the available options.\n"
+"To search for menu entries press </>.\n"
+"<Esc> always leaves the current window.\n"
+"\n"
+"You do not have function keys support.\n"
+"Press <1> instead of <F1>, <2> instead of <F2>, etc.\n"
+"For verbose global help use key <1>.\n"
+"For help related to the current menu entry press <?> or <h>.\n"),
 menu_instructions[] = N_(
-" Arrow keys navigate the menu.\n"
-" <Enter> or <right-arrow> selects submenus --->.\n"
-" Capital Letters are hotkeys.\n"
-" Pressing <Y> includes, <N> excludes, <M> modularizes features.\n"
-" Pressing SpaceBar toggles between the above options\n"
-" Press <Esc>, <F5> or <left-arrow> to go back one menu,\n"
-" <?>, <F1> or <h> for Help, </> for Search.\n"
-" <1> is interchangeable with <F1>, <2> with <F2>, etc.\n"
-" Legend: [*] built-in  [ ] excluded  <M> module  < > module capable.\n"
-" <Esc> always leaves the current window\n"),
+"Legend:  [*] built-in  [ ] excluded  <M> module  < > module capable.\n"
+"Submenus are designated by a trailing \"--->\".\n"
+"\n"
+"Use the following keys to navigate the menus:\n"
+"Move up or down with <Up> or <Down>.\n"
+"Enter a submenu with <Enter> or <Right>.\n"
+"Exit a submenu to its parent menu with <Esc> or <Left>.\n"
+"Pressing <y> includes, <n> excludes, <m> modularizes features.\n"
+"Pressing <Space> cycles through the available options.\n"
+"To search for menu entries press </>.\n"
+"<Esc> always leaves the current window.\n"
+"\n"
+"Pressing <1> may be used instead of <F1>, <2> instead of <F2>, etc.\n"
+"For verbose global help press <F1>.\n"
+"For help related to the current menu entry press <?> or <h>.\n"),
 radiolist_instructions[] = N_(
-" Use the arrow keys to navigate this window or\n"
-" press the hotkey of the item you wish to select\n"
-" followed by the <SPACE BAR>.\n"
-" Press <?>, <F1> or <h> for additional information about this option.\n"),
+"Press <Up>, <Down>, <Home> or <End> to navigate a radiolist, select\n"
+"with <Space>.\n"
+"For help related to the current entry press <?> or <h>.\n"
+"For global help press <F1>.\n"),
 inputbox_instructions_int[] = N_(
 "Please enter a decimal value.\n"
 "Fractions will not be accepted.\n"
-"Press <RETURN> to accept, <ESC> to cancel."),
+"Press <Enter> to apply, <Esc> to cancel."),
 inputbox_instructions_hex[] = N_(
 "Please enter a hexadecimal value.\n"
-"Press <RETURN> to accept, <ESC> to cancel."),
+"Press <Enter> to apply, <Esc> to cancel."),
 inputbox_instructions_string[] = N_(
 "Please enter a string value.\n"
-"Press <RETURN> to accept, <ESC> to cancel."),
+"Press <Enter> to apply, <Esc> to cancel."),
 setmod_text[] = N_(
-"This feature depends on another which\n"
-"has been configured as a module.\n"
-"As a result, this feature will be built as a module."),
+"This feature depends on another feature which has been configured as a\n"
+"module.  As a result, the current feature will be built as a module too."),
 load_config_text[] = N_(
 "Enter the name of the configuration file you wish to load.\n"
-"Accept the name shown to restore the configuration you\n"
-"last retrieved.  Leave blank to abort."),
+"Accept the name shown to restore the configuration you last\n"
+"retrieved.  Leave empty to abort."),
 load_config_help[] = N_(
-"\n"
 "For various reasons, one may wish to keep several different\n"
 "configurations available on a single machine.\n"
 "\n"
 "If you have saved a previous configuration in a file other than the\n"
-"default one, entering its name here will allow you to modify that\n"
-"configuration.\n"
+"default one, entering its name here will allow you to load and modify\n"
+"that configuration.\n"
 "\n"
-"If you are uncertain, then you have probably never used alternate\n"
-"configuration files.  You should therefor leave this blank to abort.\n"),
+"Leave empty to abort.\n"),
 save_config_text[] = N_(
 "Enter a filename to which this configuration should be saved\n"
-"as an alternate.  Leave blank to abort."),
+"as an alternate.  Leave empty to abort."),
 save_config_help[] = N_(
-"\n"
-"For various reasons, one may wish to keep different configurations\n"
-"available on a single machine.\n"
+"For various reasons, one may wish to keep several different\n"
+"configurations available on a single machine.\n"
 "\n"
 "Entering a file name here will allow you to later retrieve, modify\n"
 "and use the current configuration as an alternate to whatever\n"
 "configuration options you have selected at that time.\n"
 "\n"
-"If you are uncertain what all this means then you should probably\n"
-"leave this blank.\n"),
+"Leave empty to abort.\n"),
 search_help[] = N_(
-"\n"
-"Search for symbols and display their relations. Regular expressions\n"
-"are allowed.\n"
-"Example: search for \"^FOO\"\n"
+"Search for symbols (configuration variable names CONFIG_*) and display\n"
+"their relations.  Regular expressions are supported.\n"
+"Example:  Search for \"^FOO\".\n"
 "Result:\n"
 "-----------------------------------------------------------------\n"
 "Symbol: FOO [ = m]\n"
@@ -229,26 +222,26 @@ search_help[] = N_(
 "Selects: LIBCRC32\n"
 "Selected by: BAR\n"
 "-----------------------------------------------------------------\n"
-"o The line 'Prompt:' shows the text used in the menu structure for\n"
-"  this symbol\n"
-"o The 'Defined at' line tell at what file / line number the symbol\n"
-"  is defined\n"
-"o The 'Depends on:' line tell what symbols needs to be defined for\n"
-"  this symbol to be visible in the menu (selectable)\n"
-"o The 'Location:' lines tell where in the menu structure this symbol\n"
-"  is located\n"
-"    A location followed by a [ = y] indicate that this is a selectable\n"
-"    menu item - and current value is displayed inside brackets.\n"
-"o The 'Selects:' line tell what symbol will be automatically\n"
-"  selected if this symbol is selected (y or m)\n"
-"o The 'Selected by' line tell what symbol has selected this symbol\n"
+"o  The line 'Prompt:' shows the text displayed for this symbol in\n"
+"   the menu hierarchy.\n"
+"o  The 'Defined at' line tells at what file / line number the symbol is\n"
+"   defined.\n"
+"o  The 'Depends on:' line lists symbols that need to be defined for\n"
+"   this symbol to be visible and selectable in the menu.\n"
+"o  The 'Location:' lines tell, where in the menu structure this symbol\n"
+"   is located.  A location followed by a [ = y] indicates that this is\n"
+"   a selectable menu item, and the current value is displayed inside\n"
+"   brackets.\n"
+"o  The 'Selects:' line tells, what symbol will be automatically selected\n"
+"   if this symbol is selected (y or m).\n"
+"o  The 'Selected by' line tells what symbol has selected this symbol.\n"
 "\n"
 "Only relevant lines are shown.\n"
 "\n\n"
 "Search examples:\n"
-"Examples: USB  => find all symbols containing USB\n"
-"          ^USB => find all symbols starting with USB\n"
-"          USB$ => find all symbols ending with USB\n"
+"USB  => find all symbols containing USB\n"
+"^USB => find all symbols starting with USB\n"
+"USB$ => find all symbols ending with USB\n"
 "\n");
 
 struct mitem {
@@ -319,19 +312,19 @@ struct function_keys function_keys[] = {
         },
         {
                 .key_str = "F2",
-                .func = "Sym Info",
+                .func = "SymInfo",
                 .key = F_SYMBOL,
                 .handler = handle_f2,
         },
         {
                 .key_str = "F3",
-                .func = "Insts",
+                .func = "Help 2",
                 .key = F_INSTS,
                 .handler = handle_f3,
         },
         {
                 .key_str = "F4",
-                .func = "Config",
+                .func = "ShowAll",
                 .key = F_CONF,
                 .handler = handle_f4,
         },
@@ -355,7 +348,7 @@ struct function_keys function_keys[] = {
         },
         {
                 .key_str = "F8",
-                .func = "Sym Search",
+                .func = "SymSearch",
                 .key = F_SEARCH,
                 .handler = handle_f8,
         },
@@ -392,7 +385,7 @@ static void print_function_line(void)
 static void handle_f1(int *key, struct menu *current_item)
 {
         show_scroll_win(main_window,
-                        _("README"), _(nconf_readme));
+                        _("Global help"), _(nconf_global_help));
         return;
 }
 
@@ -407,7 +400,7 @@ static void handle_f2(int *key, struct menu *current_item)
 static void handle_f3(int *key, struct menu *current_item)
 {
         show_scroll_win(main_window,
-                        _("Instructions"),
+                        _("Short help"),
                         _(current_instructions));
         return;
 }
@@ -696,13 +689,18 @@ static void search_conf(void)
 {
         struct symbol **sym_arr;
         struct gstr res;
+        struct gstr title;
         char *dialog_input;
         int dres;
+
+        title = str_new();
+        str_printf( &title, _("Enter %s (sub)string to search for "
+                              "(with or without \"%s\")"), CONFIG_, CONFIG_);
+
 again:
         dres = dialog_inputbox(main_window,
                         _("Search Configuration Parameter"),
-                        _("Enter " CONFIG_ " (sub)string to search for "
-                                "(with or without \"" CONFIG_ "\")"),
+                        str_get(&title),
                         "", &dialog_input_result, &dialog_input_result_len);
         switch (dres) {
         case 0:
@@ -712,6 +710,7 @@ again:
                                 _("Search Configuration"), search_help);
                 goto again;
         default:
+                str_free(&title);
                 return;
         }
 
@@ -726,6 +725,7 @@ again:
         show_scroll_win(main_window,
                         _("Search Results"), str_get(&res));
         str_free(&res);
+        str_free(&title);
 }
 
 
diff --git a/scripts/kconfig/nconf.gui.c b/scripts/kconfig/nconf.gui.c
index 379003c7a2b4..9f8c44ecc703 100644
--- a/scripts/kconfig/nconf.gui.c
+++ b/scripts/kconfig/nconf.gui.c
@@ -48,7 +48,7 @@ static void set_normal_colors(void)
         init_pair(INPUT_FIELD, -1, -1);
 
         init_pair(FUNCTION_HIGHLIGHT, -1, -1);
-        init_pair(FUNCTION_TEXT, COLOR_BLUE, -1);
+        init_pair(FUNCTION_TEXT, COLOR_YELLOW, -1);
 }
 
 /* available attributes:
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index df274febb3e5..1500c38f0cca 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -6,6 +6,7 @@
 #include <qglobal.h>
 
 #if QT_VERSION < 0x040000
+#include <stddef.h>
 #include <qmainwindow.h>
 #include <qvbox.h>
 #include <qvaluelist.h>
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 22a3c400fc41..ecc5aa5f865d 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -656,11 +656,11 @@ bool sym_set_string_value(struct symbol *sym, const char *newval)
         size = strlen(newval) + 1;
         if (sym->type == S_HEX && (newval[0] != '0' || (newval[1] != 'x' && newval[1] != 'X'))) {
                 size += 2;
-                sym->def[S_DEF_USER].val = val = malloc(size);
+                sym->def[S_DEF_USER].val = val = xmalloc(size);
                 *val++ = '0';
                 *val++ = 'x';
         } else if (!oldval || strcmp(oldval, newval))
-                sym->def[S_DEF_USER].val = val = malloc(size);
+                sym->def[S_DEF_USER].val = val = xmalloc(size);
         else
                 return true;
 
@@ -812,7 +812,7 @@ struct symbol *sym_lookup(const char *name, int flags)
                 hash = 0;
         }
 
-        symbol = malloc(sizeof(*symbol));
+        symbol = xmalloc(sizeof(*symbol));
         memset(symbol, 0, sizeof(*symbol));
         symbol->name = new_name;
         symbol->type = S_UNKNOWN;
@@ -863,7 +863,7 @@ const char *sym_expand_string_value(const char *in)
         size_t reslen;
 
         reslen = strlen(in) + 1;
-        res = malloc(reslen);
+        res = xmalloc(reslen);
         res[0] = '\0';
 
         while ((src = strchr(in, '$'))) {
@@ -921,7 +921,7 @@ const char *sym_escape_string_value(const char *in)
                 p++;
         }
 
-        res = malloc(reslen);
+        res = xmalloc(reslen);
         res[0] = '\0';
 
         strcat(res, "\"");
@@ -1228,7 +1228,7 @@ struct property *prop_alloc(enum prop_type type, struct symbol *sym)
         struct property *prop;
         struct property **propp;
 
-        prop = malloc(sizeof(*prop));
+        prop = xmalloc(sizeof(*prop));
         memset(prop, 0, sizeof(*prop));
         prop->type = type;
         prop->sym = sym;
diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c
index d0b8b2318e48..6e7fbf196809 100644
--- a/scripts/kconfig/util.c
+++ b/scripts/kconfig/util.c
@@ -23,7 +23,7 @@ struct file *file_lookup(const char *name)
                 }
         }
 
-        file = malloc(sizeof(*file));
+        file = xmalloc(sizeof(*file));
         memset(file, 0, sizeof(*file));
         file->name = file_name;
         file->next = file_list;
@@ -81,7 +81,7 @@ int file_write_dep(const char *name)
 struct gstr str_new(void)
 {
         struct gstr gs;
-        gs.s = malloc(sizeof(char) * 64);
+        gs.s = xmalloc(sizeof(char) * 64);
         gs.len = 64;
         gs.max_width = 0;
         strcpy(gs.s, "\0");
@@ -138,3 +138,22 @@ const char *str_get(struct gstr *gs)
         return gs->s;
 }
 
+void *xmalloc(size_t size)
+{
+        void *p = malloc(size);
+        if (p)
+                return p;
+        fprintf(stderr, "Out of memory.\n");
+        exit(1);
+}
+
+void *xcalloc(size_t nmemb, size_t size)
+{
+        void *p = calloc(nmemb, size);
+        if (p)
+                return p;
+        fprintf(stderr, "Out of memory.\n");
+        exit(1);
+}
+
+
diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l
index 00f9d3a9cf8b..6555a475453b 100644
--- a/scripts/kconfig/zconf.l
+++ b/scripts/kconfig/zconf.l
@@ -40,7 +40,7 @@ static void zconf_endfile(void);
 
 static void new_string(void)
 {
-        text = malloc(START_STRSIZE);
+        text = xmalloc(START_STRSIZE);
         text_asize = START_STRSIZE;
         text_size = 0;
         *text = 0;
@@ -62,7 +62,7 @@ static void append_string(const char *str, int size)
 
 static void alloc_string(const char *str, int size)
 {
-        text = malloc(size + 1);
+        text = xmalloc(size + 1);
         memcpy(text, str, size);
         text[size] = 0;
 }
@@ -288,7 +288,7 @@ void zconf_initscan(const char *name)
                 exit(1);
         }
 
-        current_buf = malloc(sizeof(*current_buf));
+        current_buf = xmalloc(sizeof(*current_buf));
         memset(current_buf, 0, sizeof(*current_buf));
 
         current_file = file_lookup(name);
@@ -299,7 +299,7 @@ void zconf_nextfile(const char *name)
 {
         struct file *iter;
         struct file *file = file_lookup(name);
-        struct buffer *buf = malloc(sizeof(*buf));
+        struct buffer *buf = xmalloc(sizeof(*buf));
         memset(buf, 0, sizeof(*buf));
 
         current_buf->state = YY_CURRENT_BUFFER;
diff --git a/scripts/kconfig/zconf.lex.c_shipped b/scripts/kconfig/zconf.lex.c_shipped
index c32b1a49f5a3..a0521aa5974b 100644
--- a/scripts/kconfig/zconf.lex.c_shipped
+++ b/scripts/kconfig/zconf.lex.c_shipped
@@ -802,7 +802,7 @@ static void zconf_endfile(void);
 
 static void new_string(void)
 {
-        text = malloc(START_STRSIZE);
+        text = xmalloc(START_STRSIZE);
         text_asize = START_STRSIZE;
         text_size = 0;
         *text = 0;
@@ -824,7 +824,7 @@ static void append_string(const char *str, int size)
 
 static void alloc_string(const char *str, int size)
 {
-        text = malloc(size + 1);
+        text = xmalloc(size + 1);
         memcpy(text, str, size);
         text[size] = 0;
 }
@@ -2343,7 +2343,7 @@ void zconf_initscan(const char *name)
                 exit(1);
         }
 
-        current_buf = malloc(sizeof(*current_buf));
+        current_buf = xmalloc(sizeof(*current_buf));
         memset(current_buf, 0, sizeof(*current_buf));
 
         current_file = file_lookup(name);
@@ -2354,7 +2354,7 @@ void zconf_nextfile(const char *name)
 {
         struct file *iter;
         struct file *file = file_lookup(name);
-        struct buffer *buf = malloc(sizeof(*buf));
+        struct buffer *buf = xmalloc(sizeof(*buf));
         memset(buf, 0, sizeof(*buf));
 
         current_buf->state = YY_CURRENT_BUFFER;
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 28b761567815..4305b2f2ec5e 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1750,7 +1750,7 @@ sub dump_struct($$) {
         # strip kmemcheck_bitfield_{begin,end}.*;
         $members =~ s/kmemcheck_bitfield_.*?;//gos;
         # strip attributes
-        $members =~ s/__aligned\s*\(\d+\)//gos;
+        $members =~ s/__aligned\s*\(.+\)//gos;
 
         create_parameterlist($members, ';', $file);
         check_sections($file, $declaration_name, "struct", $sectcheck, $struct_actual, $nested);
@@ -2079,7 +2079,6 @@ sub dump_function($$) {
     $prototype =~ s/^__inline +//;
     $prototype =~ s/^__always_inline +//;
     $prototype =~ s/^noinline +//;
-    $prototype =~ s/__devinit +//;
     $prototype =~ s/__init +//;
     $prototype =~ s/__init_or_module +//;
     $prototype =~ s/__must_check +//;
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 11a8c3010ed9..78b30c1548e9 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -830,6 +830,8 @@ static const char *section_white_list[] =
         ".toc*",
         ".xt.prop",                              /* xtensa */
         ".xt.lit",         /* xtensa */
+        ".arcextmap*",                  /* arc */
+        ".gnu.linkonce.arcext*",        /* arc : modules */
         NULL
 };
 
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index 4bf17ddf7c7f..fbbfd08853d3 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -95,7 +95,7 @@ echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/vmlinuz-$KERNELRELEASE"
 echo "%endif"
 echo "%endif"
 
-echo 'make %{?_smp_mflags} INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr headers_install'
+echo 'make %{?_smp_mflags} INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr KBUILD_SRC= headers_install'
 echo 'cp System.map $RPM_BUILD_ROOT'"/boot/System.map-$KERNELRELEASE"
 
 echo 'cp .config $RPM_BUILD_ROOT'"/boot/config-$KERNELRELEASE"
diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c
index ee52cb8e17ad..9c22317778eb 100644
--- a/scripts/recordmcount.c
+++ b/scripts/recordmcount.c
@@ -33,6 +33,13 @@
 #include <string.h>
 #include <unistd.h>
 
+#ifndef EM_METAG
+/* Remove this when these make it to the standard system elf.h. */
+#define EM_METAG      174
+#define R_METAG_ADDR32                   2
+#define R_METAG_NONE                     3
+#endif
+
 static int fd_map;      /* File descriptor for file being modified. */
 static int mmap_failed; /* Boolean flag. */
 static void *ehdr_curr; /* current ElfXX_Ehdr *  for resource cleanup */
@@ -341,6 +348,12 @@ do_file(char const *const fname)
                          altmcount = "__gnu_mcount_nc";
                          break;
         case EM_IA_64:   reltype = R_IA64_IMM64;   gpfx = '_'; break;
+        case EM_METAG:   reltype = R_METAG_ADDR32;
+                         altmcount = "_mcount_wrapper";
+                         rel_type_nop = R_METAG_NONE;
+                         /* We happen to have the same requirement as MIPS */
+                         is_fake_mcount32 = MIPS32_is_fake_mcount;
+                         break;
         case EM_MIPS:    /* reltype: e_class    */ gpfx = '_'; break;
         case EM_PPC:     reltype = R_PPC_ADDR32;   gpfx = '_'; break;
         case EM_PPC64:   reltype = R_PPC64_ADDR64; gpfx = '_'; break;
diff --git a/scripts/sign-file b/scripts/sign-file
index 974a20b661b7..2b7c4484d46c 100755
--- a/scripts/sign-file
+++ b/scripts/sign-file
@@ -2,51 +2,45 @@
 #
 # Sign a module file using the given key.
 #
-# Format:
-#
-#       ./scripts/sign-file [-v] <key> <x509> <module> [<dest>]
-#
-#
+
+my $USAGE =
+"Usage: scripts/sign-file [-v] <hash algo> <key> <x509> <module> [<dest>]\n" .
+"       scripts/sign-file [-v] -s <raw sig> <hash algo> <x509> <module> [<dest>]\n";
+
 use strict;
 use FileHandle;
 use IPC::Open2;
+use Getopt::Std;
 
-my $verbose = 0;
-if ($#ARGV >= 0 && $ARGV[0] eq "-v") {
-    $verbose = 1;
-    shift;
-}
+my %opts;
+getopts('vs:', \%opts) or die $USAGE;
+my $verbose = $opts{'v'};
+my $signature_file = $opts{'s'};
 
-die "Format: ./scripts/sign-file [-v] <key> <x509> <module> [<dest>]\n"
-    if ($#ARGV != 2 && $#ARGV != 3);
+die $USAGE if ($#ARGV > 4);
+die $USAGE if (!$signature_file && $#ARGV < 3 || $signature_file && $#ARGV < 2);
 
-my $private_key = $ARGV[0];
-my $x509 = $ARGV[1];
-my $module = $ARGV[2];
-my $dest = ($#ARGV == 3) ? $ARGV[3] : $ARGV[2] . "~";
+my $dgst = shift @ARGV;
+my $private_key;
+if (!$signature_file) {
+        $private_key = shift @ARGV;
+}
+my $x509 = shift @ARGV;
+my $module = shift @ARGV;
+my ($dest, $keep_orig);
+if (@ARGV) {
+        $dest = $ARGV[0];
+        $keep_orig = 1;
+} else {
+        $dest = $module . "~";
+}
 
-die "Can't read private key\n" unless (-r $private_key);
+die "Can't read private key\n" if (!$signature_file && !-r $private_key);
+die "Can't read signature file\n" if ($signature_file && !-r $signature_file);
 die "Can't read X.509 certificate\n" unless (-r $x509);
 die "Can't read module\n" unless (-r $module);
 
 #
-# Read the kernel configuration
-#
-my %config = (
-    CONFIG_MODULE_SIG_SHA512 => 1
-    );
-
-if (-r ".config") {
-    open(FD, "<.config") || die ".config";
-    while (<FD>) {
-        if ($_ =~ /^(CONFIG_.*)=[ym]/) {
-            $config{$1} = 1;
-        }
-    }
-    close(FD);
-}
-
-#
 # Function to read the contents of a file into a variable.
 #
 sub read_file($)
@@ -321,73 +315,71 @@ my $id_type = 1;	# Identifier type: X.509
 #
 # Digest the data
 #
-my ($dgst, $prologue) = ();
-if (exists $config{"CONFIG_MODULE_SIG_SHA1"}) {
+my $prologue;
+if ($dgst eq "sha1") {
     $prologue = pack("C*",
                      0x30, 0x21, 0x30, 0x09, 0x06, 0x05,
                      0x2B, 0x0E, 0x03, 0x02, 0x1A,
                      0x05, 0x00, 0x04, 0x14);
-    $dgst = "-sha1";
     $hash = 2;
-} elsif (exists $config{"CONFIG_MODULE_SIG_SHA224"}) {
+} elsif ($dgst eq "sha224") {
     $prologue = pack("C*",
                      0x30, 0x2d, 0x30, 0x0d, 0x06, 0x09,
                      0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x04,
                      0x05, 0x00, 0x04, 0x1C);
-    $dgst = "-sha224";
     $hash = 7;
-} elsif (exists $config{"CONFIG_MODULE_SIG_SHA256"}) {
+} elsif ($dgst eq "sha256") {
     $prologue = pack("C*",
                      0x30, 0x31, 0x30, 0x0d, 0x06, 0x09,
                      0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01,
                      0x05, 0x00, 0x04, 0x20);
-    $dgst = "-sha256";
     $hash = 4;
-} elsif (exists $config{"CONFIG_MODULE_SIG_SHA384"}) {
+} elsif ($dgst eq "sha384") {
     $prologue = pack("C*",
                      0x30, 0x41, 0x30, 0x0d, 0x06, 0x09,
                      0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x02,
                      0x05, 0x00, 0x04, 0x30);
-    $dgst = "-sha384";
     $hash = 5;
-} elsif (exists $config{"CONFIG_MODULE_SIG_SHA512"}) {
+} elsif ($dgst eq "sha512") {
     $prologue = pack("C*",
                      0x30, 0x51, 0x30, 0x0d, 0x06, 0x09,
                      0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x03,
                      0x05, 0x00, 0x04, 0x40);
-    $dgst = "-sha512";
     $hash = 6;
 } else {
-    die "Can't determine hash algorithm";
+    die "Unknown hash algorithm: $dgst\n";
 }
 
-#
-# Generate the digest and read from openssl's stdout
-#
-my $digest;
-$digest = readpipe("openssl dgst $dgst -binary $module") || die "openssl dgst";
-
-#
-# Generate the binary signature, which will be just the integer that comprises
-# the signature with no metadata attached.
-#
-my $pid;
-$pid = open2(*read_from, *write_to,
-             "openssl rsautl -sign -inkey $private_key -keyform PEM") ||
-    die "openssl rsautl";
-binmode write_to;
-print write_to $prologue . $digest || die "pipe to openssl rsautl";
-close(write_to) || die "pipe to openssl rsautl";
-
-binmode read_from;
 my $signature;
-read(read_from, $signature, 4096) || die "pipe from openssl rsautl";
-close(read_from) || die "pipe from openssl rsautl";
+if ($signature_file) {
+        $signature = read_file($signature_file);
+} else {
+        #
+        # Generate the digest and read from openssl's stdout
+        #
+        my $digest;
+        $digest = readpipe("openssl dgst -$dgst -binary $module") || die "openssl dgst";
+
+        #
+        # Generate the binary signature, which will be just the integer that
+        # comprises the signature with no metadata attached.
+        #
+        my $pid;
+        $pid = open2(*read_from, *write_to,
+                     "openssl rsautl -sign -inkey $private_key -keyform PEM") ||
+            die "openssl rsautl";
+        binmode write_to;
+        print write_to $prologue . $digest || die "pipe to openssl rsautl";
+        close(write_to) || die "pipe to openssl rsautl";
+
+        binmode read_from;
+        read(read_from, $signature, 4096) || die "pipe from openssl rsautl";
+        close(read_from) || die "pipe from openssl rsautl";
+        waitpid($pid, 0) || die;
+        die "openssl rsautl died: $?" if ($? >> 8);
+}
 $signature = pack("n", length($signature)) . $signature,
 
-waitpid($pid, 0) || die;
-die "openssl rsautl died: $?" if ($? >> 8);
-
 #
 # Build the signed binary
 #
@@ -424,6 +416,6 @@ print FD
     ;
 close FD || die $dest;
 
-if ($#ARGV != 3) {
+if (!$keep_orig) {
     rename($dest, $module) || die $module;
 }
diff --git a/scripts/sortextable.h b/scripts/sortextable.h
index e4fd45b7e456..f5eb43d42926 100644
--- a/scripts/sortextable.h
+++ b/scripts/sortextable.h
@@ -182,7 +182,7 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort)
                 _r(&sort_needed_sym->st_value) -
                 _r(&sort_needed_sec->sh_addr);
 
-#if 1
+#if 0
         printf("sort done marker at %lx\n",
                (unsigned long)((char *)sort_done_location - (char *)ehdr));
 #endif
diff --git a/scripts/tags.sh b/scripts/tags.sh
index 08f06c00745e..26a87e68afed 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -149,12 +149,17 @@ dogtags()
 exuberant()
 {
         all_target_sources | xargs $1 -a                        \
-        -I __initdata,__exitdata,__acquires,__releases          \
-        -I __read_mostly,____cacheline_aligned                  \
+        -I __initdata,__exitdata,__initconst,__devinitdata      \
+        -I __devinitconst,__cpuinitdata,__initdata_memblock     \
+        -I __refdata,__attribute                                \
+        -I __acquires,__releases,__deprecated                   \
+        -I __read_mostly,__aligned,____cacheline_aligned        \
         -I ____cacheline_aligned_in_smp                         \
         -I ____cacheline_internodealigned_in_smp                \
+        -I __used,__packed,__packed2__,__must_check,__must_hold \
         -I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL                      \
         -I DEFINE_TRACE,EXPORT_TRACEPOINT_SYMBOL,EXPORT_TRACEPOINT_SYMBOL_GPL \
+        -I static,const                                         \
         --extra=+f --c-kinds=+px                                \
         --regex-asm='/^(ENTRY|_GLOBAL)\(([^)]*)\).*/\2/'        \
         --regex-c='/^SYSCALL_DEFINE[[:digit:]]?\(([^,)]*).*/sys_\1/' \
@@ -182,8 +187,19 @@ exuberant()
         --regex-c++='/TESTCLEARFLAG_FALSE\(([^,)]*).*/TestClearPage\1/' \
         --regex-c++='/__TESTCLEARFLAG_FALSE\(([^,)]*).*/__TestClearPage\1/' \
         --regex-c++='/_PE\(([^,)]*).*/PEVENT_ERRNO__\1/'                \
-        --regex-c='/PCI_OP_READ\(([a-z]*[a-z]).*[1-4]\)/pci_bus_read_config_\1/' \
-        --regex-c='/PCI_OP_WRITE\(([a-z]*[a-z]).*[1-4]\)/pci_bus_write_config_\1/'
+        --regex-c='/PCI_OP_READ\((\w*).*[1-4]\)/pci_bus_read_config_\1/' \
+        --regex-c='/PCI_OP_WRITE\((\w*).*[1-4]\)/pci_bus_write_config_\1/' \
+        --regex-c='/DEFINE_(MUTEX|SEMAPHORE|SPINLOCK)\((\w*)/\2/v/'     \
+        --regex-c='/DEFINE_(RAW_SPINLOCK|RWLOCK|SEQLOCK)\((\w*)/\2/v/'  \
+        --regex-c='/DECLARE_(RWSEM|COMPLETION)\((\w*)/\2/v/'            \
+        --regex-c='/DECLARE_BITMAP\((\w*)/\1/v/'                        \
+        --regex-c='/(^|\s)(|L|H)LIST_HEAD\((\w*)/\3/v/'                 \
+        --regex-c='/(^|\s)RADIX_TREE\((\w*)/\2/v/'                      \
+        --regex-c='/DEFINE_PER_CPU\(([^,]*,\s*)(\w*).*\)/\2/v/'         \
+        --regex-c='/DEFINE_PER_CPU_SHARED_ALIGNED\(([^,]*,\s*)(\w*).*\)/\2/v/' \
+        --regex-c='/DECLARE_WAIT_QUEUE_HEAD\((\w*)/\1/v/'               \
+        --regex-c='/DECLARE_(TASKLET|WORK|DELAYED_WORK)\((\w*)/\2/v/'   \
+        --regex-c='/DEFINE_PCI_DEVICE_TABLE\((\w*)/\1/v/'
 
         all_kconfigs | xargs $1 -a                              \
         --langdef=kconfig --language-force=kconfig              \
@@ -201,34 +217,34 @@ exuberant()
 emacs()
 {
         all_target_sources | xargs $1 -a                        \
-        --regex='/^(ENTRY|_GLOBAL)(\([^)]*\)).*/\2/'            \
+        --regex='/^\(ENTRY\|_GLOBAL\)(\([^)]*\)).*/\2/'         \
         --regex='/^SYSCALL_DEFINE[0-9]?(\([^,)]*\).*/sys_\1/'   \
         --regex='/^TRACE_EVENT(\([^,)]*\).*/trace_\1/'          \
         --regex='/^DEFINE_EVENT([^,)]*, *\([^,)]*\).*/trace_\1/' \
-        --regex='/PAGEFLAG\(([^,)]*).*/Page\1/'                 \
-        --regex='/PAGEFLAG\(([^,)]*).*/SetPage\1/'              \
-        --regex='/PAGEFLAG\(([^,)]*).*/ClearPage\1/'            \
-        --regex='/TESTSETFLAG\(([^,)]*).*/TestSetPage\1/'       \
-        --regex='/TESTPAGEFLAG\(([^,)]*).*/Page\1/'             \
-        --regex='/SETPAGEFLAG\(([^,)]*).*/SetPage\1/'           \
-        --regex='/__SETPAGEFLAG\(([^,)]*).*/__SetPage\1/'       \
-        --regex='/TESTCLEARFLAG\(([^,)]*).*/TestClearPage\1/'   \
-        --regex='/__TESTCLEARFLAG\(([^,)]*).*/TestClearPage\1/' \
-        --regex='/CLEARPAGEFLAG\(([^,)]*).*/ClearPage\1/'       \
-        --regex='/__CLEARPAGEFLAG\(([^,)]*).*/__ClearPage\1/'   \
-        --regex='/__PAGEFLAG\(([^,)]*).*/__SetPage\1/'          \
-        --regex='/__PAGEFLAG\(([^,)]*).*/__ClearPage\1/'        \
-        --regex='/PAGEFLAG_FALSE\(([^,)]*).*/Page\1/'           \
-        --regex='/TESTSCFLAG\(([^,)]*).*/TestSetPage\1/'        \
-        --regex='/TESTSCFLAG\(([^,)]*).*/TestClearPage\1/'      \
-        --regex='/SETPAGEFLAG_NOOP\(([^,)]*).*/SetPage\1/'      \
-        --regex='/CLEARPAGEFLAG_NOOP\(([^,)]*).*/ClearPage\1/'  \
-        --regex='/__CLEARPAGEFLAG_NOOP\(([^,)]*).*/__ClearPage\1/' \
-        --regex='/TESTCLEARFLAG_FALSE\(([^,)]*).*/TestClearPage\1/' \
-        --regex='/__TESTCLEARFLAG_FALSE\(([^,)]*).*/__TestClearPage\1/' \
-        --regex='/_PE\(([^,)]*).*/PEVENT_ERRNO__\1/'            \
-        --regex='/PCI_OP_READ\(([a-z]*[a-z]).*[1-4]\)/pci_bus_read_config_\1/' \
-        --regex='/PCI_OP_WRITE\(([a-z]*[a-z]).*[1-4]\)/pci_bus_write_config_\1/'
+        --regex='/PAGEFLAG(\([^,)]*\).*/Page\1/'                        \
+        --regex='/PAGEFLAG(\([^,)]*\).*/SetPage\1/'             \
+        --regex='/PAGEFLAG(\([^,)]*\).*/ClearPage\1/'           \
+        --regex='/TESTSETFLAG(\([^,)]*\).*/TestSetPage\1/'      \
+        --regex='/TESTPAGEFLAG(\([^,)]*\).*/Page\1/'            \
+        --regex='/SETPAGEFLAG(\([^,)]*\).*/SetPage\1/'          \
+        --regex='/__SETPAGEFLAG(\([^,)]*\).*/__SetPage\1/'      \
+        --regex='/TESTCLEARFLAG(\([^,)]*\).*/TestClearPage\1/'  \
+        --regex='/__TESTCLEARFLAG(\([^,)]*\).*/TestClearPage\1/'        \
+        --regex='/CLEARPAGEFLAG(\([^,)]*\).*/ClearPage\1/'      \
+        --regex='/__CLEARPAGEFLAG(\([^,)]*\).*/__ClearPage\1/'  \
+        --regex='/__PAGEFLAG(\([^,)]*\).*/__SetPage\1/'         \
+        --regex='/__PAGEFLAG(\([^,)]*\).*/__ClearPage\1/'       \
+        --regex='/PAGEFLAG_FALSE(\([^,)]*\).*/Page\1/'          \
+        --regex='/TESTSCFLAG(\([^,)]*\).*/TestSetPage\1/'       \
+        --regex='/TESTSCFLAG(\([^,)]*\).*/TestClearPage\1/'     \
+        --regex='/SETPAGEFLAG_NOOP(\([^,)]*\).*/SetPage\1/'     \
+        --regex='/CLEARPAGEFLAG_NOOP(\([^,)]*\).*/ClearPage\1/' \
+        --regex='/__CLEARPAGEFLAG_NOOP(\([^,)]*\).*/__ClearPage\1/' \
+        --regex='/TESTCLEARFLAG_FALSE(\([^,)]*\).*/TestClearPage\1/' \
+        --regex='/__TESTCLEARFLAG_FALSE(\([^,)]*\).*/__TestClearPage\1/' \
+        --regex='/_PE(\([^,)]*\).*/PEVENT_ERRNO__\1/'           \
+        --regex='/PCI_OP_READ(\([a-z]*[a-z]\).*[1-4])/pci_bus_read_config_\1/' \
+        --regex='/PCI_OP_WRITE(\([a-z]*[a-z]\).*[1-4])/pci_bus_write_config_\1/'
 
         all_kconfigs | xargs $1 -a                              \
         --regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/\3/'