36 files changed, 1168 insertions, 686 deletions
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index 8dcdca27d836..69f0a1417e9a 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -79,9 +79,11 @@ modpost = scripts/mod/modpost                    \
 $(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S)      \
 $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w)
+MODPOST_OPT=$(subst -i,-n,$(filter -i,$(MAKEFLAGS)))
 # We can go over command line length here, so be careful.
 quiet_cmd_modpost = MODPOST $(words $(filter-out vmlinux FORCE, $^)) modules
-      cmd_modpost = $(MODLISTCMD) | sed 's/\.ko$$/.o/' | $(modpost) -s -T -
+      cmd_modpost = $(MODLISTCMD) | sed 's/\.ko$$/.o/' | $(modpost) $(MODPOST_OPT) -s -T -
 PHONY += __modpost
 __modpost: $(modules:.ko=.o) FORCE
diff --git a/scripts/asn1_compiler.c b/scripts/asn1_compiler.c
index db0e5cd34c70..91c4117637ae 100644
--- a/scripts/asn1_compiler.c
+++ b/scripts/asn1_compiler.c
@@ -1353,6 +1353,8 @@ static void render_out_of_line_list(FILE *out)
                        render_opcode(out, "ASN1_OP_END_SET_OF%s,\n", act);
                        render_opcode(out, "_jump_target(%u),\n", entry);
                        break;
+                default:
+                        break;
                }
                if (e->action)
                        render_opcode(out, "_action(ACT_%s),\n",
diff --git a/scripts/bloat-o-meter b/scripts/bloat-o-meter
index 6129020c41a9..549d0ab8c662 100755
--- a/scripts/bloat-o-meter
+++ b/scripts/bloat-o-meter
@@ -19,9 +19,10 @@ def getsizes(file):
        size, type, name = l[:-1].split()
        if type in "tTdDbBrR":
            # strip generated symbols
-            if name[:6] == "__mod_": continue
+            if name.startswith("__mod_"): continue
-            # function names begin with '.' on 64-bit powerpc
+            if name == "linux_banner": continue
-            if "." in name[1:]: name = "static." + name.split(".")[0]
+            # statics and some other optimizations adds random .NUMBER
+            name = re.sub(r'\.[0-9]+', '', name)
            sym[name] = sym.get(name, 0) + int(size, 16)
    return sym
diff --git a/scripts/checkkconfigsymbols.sh b/scripts/checkkconfigsymbols.sh
index 2ca49bb31efc..ccb3391882d1 100755
--- a/scripts/checkkconfigsymbols.sh
+++ b/scripts/checkkconfigsymbols.sh
@@ -9,7 +9,7 @@ paths="$@"
 # Doing this once at the beginning saves a lot of time, on a cache-hot tree.
 Kconfigs="`find . -name 'Kconfig' -o -name 'Kconfig*[^~]'`"
-/bin/echo -e "File list \tundefined symbol used"
+printf "File list \tundefined symbol used\n"
 find $paths -name '*.[chS]' -o -name 'Makefile' -o -name 'Makefile*[^~]'| while read i
 do
        # Output the bare Kconfig variable and the filename; the _MODULE part at
@@ -54,6 +54,6 @@ while read symb files; do
        # beyond the purpose of this script.
        symb_bare=`echo $symb | sed -e 's/_MODULE//'`
        if ! grep -q "\<$symb_bare\>" $Kconfigs; then
-                /bin/echo -e "$files: \t$symb"
+                printf "$files: \t$symb\n"
        fi
 done|sort
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 2ee9eb750560..9c9810030377 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -31,12 +31,16 @@ my $show_types = 0;
 my $fix = 0;
 my $root;
 my %debug;
-my %ignore_type = ();
 my %camelcase = ();
+my %use_type = ();
+my @use = ();
+my %ignore_type = ();
 my @ignore = ();
 my $help = 0;
 my $configuration_file = ".checkpatch.conf";
 my $max_line_length = 80;
+my $ignore_perl_version = 0;
+my $minimum_perl_version = 5.10.0;
 sub help {
        my ($exitcode) = @_;
@@ -54,6 +58,7 @@ Options:
  --terse                    one line per report
  -f, --file                 treat FILE as regular source file
  --subjective, --strict     enable more subjective tests
+  --types TYPE(,TYPE2...)    show only these comma separated message types
  --ignore TYPE(,TYPE2...)   ignore various comma separated message types
  --max-line-length=n        set the maximum line length, if exceeded, warn
  --show-types               show the message "types" in the output
@@ -71,6 +76,8 @@ Options:
                             "<inputfile>.EXPERIMENTAL-checkpatch-fixes"
                             with potential errors corrected to the preferred
                             checkpatch style
+  --ignore-perl-version      override checking of perl version.  expect
+                             runtime errors.
  -h, --help, --version      display this help and exit
 When FILE is - read standard input.
@@ -116,6 +123,7 @@ GetOptions(
        'subjective!'   => \$check,
        'strict!'       => \$check,
        'ignore=s'      => \@ignore,
+        'types=s'       => \@use,
        'show-types!'   => \$show_types,
        'max-line-length=i' => \$max_line_length,
        'root=s'        => \$root,
@@ -123,6 +131,7 @@ GetOptions(
        'mailback!'     => \$mailback,
        'summary-file!' => \$summary_file,
        'fix!'          => \$fix,
+        'ignore-perl-version!' => \$ignore_perl_version,
        'debug=s'       => \%debug,
        'test-only=s'   => \$tst_only,
        'h|help'        => \$help,
@@ -133,24 +142,50 @@ help(0) if ($help);
 my $exit = 0;
+if ($^V && $^V lt $minimum_perl_version) {
+        printf "$P: requires at least perl version %vd\n", $minimum_perl_version;
+        if (!$ignore_perl_version) {
+                exit(1);
+        }
+}
 if ($#ARGV < 0) {
        print "$P: no input files\n";
        exit(1);
 }
-@ignore = split(/,/, join(',',@ignore));
+sub hash_save_array_words {
-foreach my $word (@ignore) {
+        my ($hashRef, $arrayRef) = @_;
-        $word =~ s/\s*\n?$//g;
-        $word =~ s/^\s*//g;
-        $word =~ s/\s+/ /g;
-        $word =~ tr/[a-z]/[A-Z]/;
-        next if ($word =~ m/^\s*#/);
+        my @array = split(/,/, join(',', @$arrayRef));
-        next if ($word =~ m/^\s*$/);
+        foreach my $word (@array) {
+                $word =~ s/\s*\n?$//g;
+                $word =~ s/^\s*//g;
+                $word =~ s/\s+/ /g;
+                $word =~ tr/[a-z]/[A-Z]/;
-        $ignore_type{$word}++;
+                next if ($word =~ m/^\s*#/);
+                next if ($word =~ m/^\s*$/);
+                $hashRef->{$word}++;
+        }
 }
+sub hash_show_words {
+        my ($hashRef, $prefix) = @_;
+        if ($quiet == 0 && keys %$hashRef) {
+                print "NOTE: $prefix message types:";
+                foreach my $word (sort keys %$hashRef) {
+                        print " $word";
+                }
+                print "\n\n";
+        }
+}
+hash_save_array_words(\%ignore_type, \@ignore);
+hash_save_array_words(\%use_type, \@use);
 my $dbg_values = 0;
 my $dbg_possible = 0;
 my $dbg_type = 0;
@@ -206,6 +241,11 @@ our $Sparse	= qr{
                        __ref|
                        __rcu
                }x;
+our $InitAttributePrefix = qr{__(?:mem|cpu|dev|net_|)};
+our $InitAttributeData = qr{$InitAttributePrefix(?:initdata\b)};
+our $InitAttributeConst = qr{$InitAttributePrefix(?:initconst\b)};
+our $InitAttributeInit = qr{$InitAttributePrefix(?:init\b)};
+our $InitAttribute = qr{$InitAttributeData|$InitAttributeConst|$InitAttributeInit};
 # Notes to $Attribute:
 # We need \b after 'init' otherwise 'initconst' will cause a false positive in a check
@@ -227,7 +267,7 @@ our $Attribute	= qr{
                        __deprecated|
                        __read_mostly|
                        __kprobes|
-                        __(?:mem|cpu|dev|)(?:initdata|initconst|init\b)|
+                        $InitAttribute|
                        ____cacheline_aligned|
                        ____cacheline_aligned_in_smp|
                        ____cacheline_internodealigned_in_smp|
@@ -257,6 +297,7 @@ our $Operators	= qr{
                  }x;
 our $NonptrType;
+our $NonptrTypeWithAttr;
 our $Type;
 our $Declare;
@@ -285,7 +326,8 @@ our $logFunctions = qr{(?x:
        (?:[a-z0-9]+_){1,2}(?:printk|emerg|alert|crit|err|warning|warn|notice|info|debug|dbg|vdbg|devel|cont|WARN)(?:_ratelimited|_once|)|
        WARN(?:_RATELIMIT|_ONCE|)|
        panic|
-        MODULE_[A-Z_]+
+        MODULE_[A-Z_]+|
+        seq_vprintf|seq_printf|seq_puts
 )};
 our $signature_tags = qr{(?xi:
@@ -319,6 +361,12 @@ our @typeList = (
        qr{${Ident}_handler},
        qr{${Ident}_handler_fn},
 );
+our @typeListWithAttr = (
+        @typeList,
+        qr{struct\s+$InitAttribute\s+$Ident},
+        qr{union\s+$InitAttribute\s+$Ident},
+);
 our @modifierList = (
        qr{fastcall},
 );
@@ -332,6 +380,7 @@ our $allowed_asm_includes = qr{(?x:
 sub build_types {
        my $mods = "(?x:  \n" . join("|\n  ", @modifierList) . "\n)";
        my $all = "(?x:  \n" . join("|\n  ", @typeList) . "\n)";
+        my $allWithAttr = "(?x:  \n" . join("|\n  ", @typeListWithAttr) . "\n)";
        $Modifier       = qr{(?:$Attribute|$Sparse|$mods)};
        $NonptrType     = qr{
                        (?:$Modifier\s+|const\s+)*
@@ -342,6 +391,15 @@ sub build_types {
                        )
                        (?:\s+$Modifier|\s+const)*
                  }x;
+        $NonptrTypeWithAttr     = qr{
+                        (?:$Modifier\s+|const\s+)*
+                        (?:
+                                (?:typeof|__typeof__)\s*\([^\)]*\)|
+                                (?:$typeTypedefs\b)|
+                                (?:${allWithAttr}\b)
+                        )
+                        (?:\s+$Modifier|\s+const)*
+                  }x;
        $Type   = qr{
                        $NonptrType
                        (?:(?:\s|\*|\[\])+\s*const|(?:\s|\*|\[\])+|(?:\s*\[\s*\])+)?
@@ -388,8 +446,9 @@ sub seed_camelcase_file {
                next if ($line !~ /(?:[A-Z][a-z]|[a-z][A-Z])/);
                if ($line =~ /^[ \t]*(?:#[ \t]*define|typedef\s+$Type)\s+(\w*(?:[A-Z][a-z]|[a-z][A-Z])\w*)/) {
                        $camelcase{$1} = 1;
-                }
+                } elsif ($line =~ /^\s*$Declare\s+(\w*(?:[A-Z][a-z]|[a-z][A-Z])\w*)\s*[\(\[,;]/) {
-                elsif ($line =~ /^\s*$Declare\s+(\w*(?:[A-Z][a-z]|[a-z][A-Z])\w*)\s*\(/) {
+                        $camelcase{$1} = 1;
+                } elsif ($line =~ /^\s*(?:union|struct|enum)\s+(\w*(?:[A-Z][a-z]|[a-z][A-Z])\w*)\s*[;\{]/) {
                        $camelcase{$1} = 1;
                }
        }
@@ -1355,7 +1414,9 @@ sub possible {
 my $prefix = '';
 sub show_type {
-       return !defined $ignore_type{$_[0]};
+        return defined $use_type{$_[0]} if (scalar keys %use_type > 0);
+        return !defined $ignore_type{$_[0]};
 }
 sub report {
@@ -1435,7 +1496,31 @@ sub check_absolute_file {
 sub trim {
        my ($string) = @_;
-        $string =~ s/(^\s+|\s+$)//g;
+        $string =~ s/^\s+|\s+$//g;
+        return $string;
+}
+sub ltrim {
+        my ($string) = @_;
+        $string =~ s/^\s+//;
+        return $string;
+}
+sub rtrim {
+        my ($string) = @_;
+        $string =~ s/\s+$//;
+        return $string;
+}
+sub string_find_replace {
+        my ($string, $find, $replace) = @_;
+        $string =~ s/$find/$replace/g;
        return $string;
 }
@@ -1532,6 +1617,7 @@ sub process {
        my %suppress_export;
        my $suppress_statement = 0;
+        my %signatures = ();
        # Pre-scan the patch sanitizing the lines.
        # Pre-scan the patch looking for any __setup documentation.
@@ -1539,6 +1625,8 @@ sub process {
        my @setup_docs = ();
        my $setup_docs = 0;
+        my $camelcase_file_seeded = 0;
        sanitise_line_reset();
        my $line;
        foreach my $rawline (@rawlines) {
@@ -1624,6 +1712,8 @@ sub process {
        $linenr = 0;
        foreach my $line (@lines) {
                $linenr++;
+                my $sline = $line;      #copy of $line
+                $sline =~ s/$;/ /g;     #with comments as spaces
                my $rawline = $rawlines[$linenr - 1];
@@ -1679,11 +1769,11 @@ sub process {
                # extract the filename as it passes
                if ($line =~ /^diff --git.*?(\S+)$/) {
                        $realfile = $1;
-                        $realfile =~ s@^([^/]*)/@@;
+                        $realfile =~ s@^([^/]*)/@@ if (!$file);
                        $in_commit_log = 0;
                } elsif ($line =~ /^\+\+\+\s+(\S+)/) {
                        $realfile = $1;
-                        $realfile =~ s@^([^/]*)/@@;
+                        $realfile =~ s@^([^/]*)/@@ if (!$file);
                        $in_commit_log = 0;
                        $p1_prefix = $1;
@@ -1781,6 +1871,17 @@ sub process {
                                             "email address '$email' might be better as '$suggested_email$comment'\n" . $herecurr);
                                }
                        }
+# Check for duplicate signatures
+                        my $sig_nospace = $line;
+                        $sig_nospace =~ s/\s//g;
+                        $sig_nospace = lc($sig_nospace);
+                        if (defined $signatures{$sig_nospace}) {
+                                WARN("BAD_SIGN_OFF",
+                                     "Duplicate signature\n" . $herecurr);
+                        } else {
+                                $signatures{$sig_nospace} = 1;
+                        }
                }
 # Check for wrappage within a valid hunk of the file
@@ -1845,20 +1946,34 @@ sub process {
 #trailing whitespace
                if ($line =~ /^\+.*\015/) {
                        my $herevet = "$here\n" . cat_vet($rawline) . "\n";
-                        ERROR("DOS_LINE_ENDINGS",
+                        if (ERROR("DOS_LINE_ENDINGS",
-                              "DOS line endings\n" . $herevet);
+                                  "DOS line endings\n" . $herevet) &&
+                            $fix) {
+                                $fixed[$linenr - 1] =~ s/[\s\015]+$//;
+                        }
                } elsif ($rawline =~ /^\+.*\S\s+$/ || $rawline =~ /^\+\s+$/) {
                        my $herevet = "$here\n" . cat_vet($rawline) . "\n";
                        if (ERROR("TRAILING_WHITESPACE",
                                  "trailing whitespace\n" . $herevet) &&
                            $fix) {
-                                $fixed[$linenr - 1] =~ s/^(\+.*?)\s+$/$1/;
+                                $fixed[$linenr - 1] =~ s/\s+$//;
                        }
                        $rpt_cleaners = 1;
                }
+# Check for FSF mailing addresses.
+                if ($rawline =~ /You should have received a copy/ ||
+                    $rawline =~ /write to the Free Software/ ||
+                    $rawline =~ /59 Temple Place/ ||
+                    $rawline =~ /51 Franklin Street/) {
+                        my $herevet = "$here\n" . cat_vet($rawline) . "\n";
+                        my $msg_type = \&ERROR;
+                        $msg_type = \&CHK if ($file);
+                        &{$msg_type}("FSF_MAILING_ADDRESS",
+                                "Do not include the paragraph about writing to the Free Software Foundation's mailing address from the sample GPL notice. The FSF has changed addresses in the past, and may do so again. Linux already includes a copy of the GPL.\n" . $herevet)
+                }
 # check for Kconfig help text having a real description
 # Only applies when adding the entry originally, after that we do not have
 # sufficient context to determine whether it is indeed long enough.
@@ -2060,6 +2175,7 @@ sub process {
                if ($realfile =~ m@^(drivers/net/|net/)@ &&
                    $prevrawline =~ /^\+[ \t]*\/\*/ &&          #starting /*
                    $prevrawline !~ /\*\/[ \t]*$/ &&            #no trailing */
+                    $rawline =~ /^\+/ &&                        #line is new
                    $rawline !~ /^\+[ \t]*\*/) {                #no leading *
                        WARN("NETWORKING_BLOCK_COMMENT_STYLE",
                             "networking block comments start with * on subsequent lines\n" . $hereprev);
@@ -2126,7 +2242,7 @@ sub process {
                    $realline_next);
 #print "LINE<$line>\n";
                if ($linenr >= $suppress_statement &&
-                    $realcnt && $line =~ /.\s*\S/) {
+                    $realcnt && $sline =~ /.\s*\S/) {
                        ($stat, $cond, $line_nr_next, $remain_next, $off_next) =
                                ctx_statement_block($linenr, $realcnt, 0);
                        $stat =~ s/\n./\n /g;
@@ -2486,16 +2602,22 @@ sub process {
                }
 # check for global initialisers.
-                if ($line =~ /^.$Type\s*$Ident\s*(?:\s+$Modifier)*\s*=\s*(0|NULL|false)\s*;/) {
+                if ($line =~ /^\+(\s*$Type\s*$Ident\s*(?:\s+$Modifier))*\s*=\s*(0|NULL|false)\s*;/) {
-                        ERROR("GLOBAL_INITIALISERS",
+                        if (ERROR("GLOBAL_INITIALISERS",
-                              "do not initialise globals to 0 or NULL\n" .
+                                  "do not initialise globals to 0 or NULL\n" .
-                                $herecurr);
+                                      $herecurr) &&
+                            $fix) {
+                                $fixed[$linenr - 1] =~ s/($Type\s*$Ident\s*(?:\s+$Modifier))*\s*=\s*(0|NULL|false)\s*;/$1;/;
+                        }
                }
 # check for static initialisers.
-                if ($line =~ /\bstatic\s.*=\s*(0|NULL|false)\s*;/) {
+                if ($line =~ /^\+.*\bstatic\s.*=\s*(0|NULL|false)\s*;/) {
-                        ERROR("INITIALISED_STATIC",
+                        if (ERROR("INITIALISED_STATIC",
-                              "do not initialise statics to 0 or NULL\n" .
+                                  "do not initialise statics to 0 or NULL\n" .
-                                $herecurr);
+                                      $herecurr) &&
+                            $fix) {
+                                $fixed[$linenr - 1] =~ s/(\bstatic\s.*?)\s*=\s*(0|NULL|false)\s*;/$1;/;
+                        }
                }
 # check for static const char * arrays.
@@ -2638,8 +2760,12 @@ sub process {
                }
                if ($line =~ /\bpr_warning\s*\(/) {
-                        WARN("PREFER_PR_LEVEL",
+                        if (WARN("PREFER_PR_LEVEL",
-                             "Prefer pr_warn(... to pr_warning(...\n" . $herecurr);
+                                 "Prefer pr_warn(... to pr_warning(...\n" . $herecurr) &&
+                            $fix) {
+                                $fixed[$linenr - 1] =~
+                                    s/\bpr_warning\b/pr_warn/;
+                        }
                }
                if ($line =~ /\bdev_printk\s*\(\s*KERN_([A-Z]+)/) {
@@ -2739,7 +2865,7 @@ sub process {
                                \+=|-=|\*=|\/=|%=|\^=|\|=|&=|
                                =>|->|<<|>>|<|>|=|!|~|
                                &&|\|\||,|\^|\+\+|--|&|\||\+|-|\*|\/|%|
-                                \?|:
+                                \?:|\?|:
                        }x;
                        my @elements = split(/($ops|;)/, $opline);
@@ -2759,6 +2885,7 @@ sub process {
                        $off = 0;
                        my $blank = copy_spacing($opline);
+                        my $last_after = -1;
                        for (my $n = 0; $n < $#elements; $n += 2) {
@@ -2824,7 +2951,7 @@ sub process {
                                            $cc !~ /^\\/ && $cc !~ /^;/) {
                                                if (ERROR("SPACING",
                                                          "space required after that '$op' $at\n" . $hereptr)) {
-                                                        $good = trim($fix_elements[$n]) . " " . trim($fix_elements[$n + 1]) . " ";
+                                                        $good = $fix_elements[$n] . trim($fix_elements[$n + 1]) . " ";
                                                        $line_fixed = 1;
                                                }
                                        }
@@ -2839,11 +2966,11 @@ sub process {
                                        if ($ctx =~ /Wx.|.xW/) {
                                                if (ERROR("SPACING",
                                                          "spaces prohibited around that '$op' $at\n" . $hereptr)) {
-                                                        $good = trim($fix_elements[$n]) . trim($fix_elements[$n + 1]);
+                                                        $good = rtrim($fix_elements[$n]) . trim($fix_elements[$n + 1]);
-                                                        $line_fixed = 1;
                                                        if (defined $fix_elements[$n + 2]) {
                                                                $fix_elements[$n + 2] =~ s/^\s+//;
                                                        }
+                                                        $line_fixed = 1;
                                                }
                                        }
@@ -2852,8 +2979,9 @@ sub process {
                                        if ($ctx !~ /.x[WEC]/ && $cc !~ /^}/) {
                                                if (ERROR("SPACING",
                                                          "space required after that '$op' $at\n" . $hereptr)) {
-                                                        $good = trim($fix_elements[$n]) . trim($fix_elements[$n + 1]) . " ";
+                                                        $good = $fix_elements[$n] . trim($fix_elements[$n + 1]) . " ";
                                                        $line_fixed = 1;
+                                                        $last_after = $n;
                                                }
                                        }
@@ -2870,8 +2998,10 @@ sub process {
                                        if ($ctx !~ /[WEBC]x./ && $ca !~ /(?:\)|!|~|\*|-|\&|\||\+\+|\-\-|\{)$/) {
                                                if (ERROR("SPACING",
                                                          "space required before that '$op' $at\n" . $hereptr)) {
-                                                        $good = trim($fix_elements[$n]) . " " . trim($fix_elements[$n + 1]);
+                                                        if ($n != $last_after + 2) {
-                                                        $line_fixed = 1;
+                                                                $good = $fix_elements[$n] . " " . ltrim($fix_elements[$n + 1]);
+                                                                $line_fixed = 1;
+                                                        }
                                                }
                                        }
                                        if ($op eq '*' && $cc =~/\s*$Modifier\b/) {
@@ -2880,12 +3010,11 @@ sub process {
                                        } elsif ($ctx =~ /.xW/) {
                                                if (ERROR("SPACING",
                                                          "space prohibited after that '$op' $at\n" . $hereptr)) {
-                                                        $fixed_line =~ s/\s+$//;
+                                                        $good = $fix_elements[$n] . rtrim($fix_elements[$n + 1]);
-                                                        $good = trim($fix_elements[$n]) . trim($fix_elements[$n + 1]);
-                                                        $line_fixed = 1;
                                                        if (defined $fix_elements[$n + 2]) {
                                                                $fix_elements[$n + 2] =~ s/^\s+//;
                                                        }
+                                                        $line_fixed = 1;
                                                }
                                        }
@@ -2894,8 +3023,7 @@ sub process {
                                        if ($ctx !~ /[WEOBC]x[^W]/ && $ctx !~ /[^W]x[WOBEC]/) {
                                                if (ERROR("SPACING",
                                                          "space required one side of that '$op' $at\n" . $hereptr)) {
-                                                        $fixed_line =~ s/\s+$//;
+                                                        $good = $fix_elements[$n] . trim($fix_elements[$n + 1]) . " ";
-                                                        $good = trim($fix_elements[$n]) . trim($fix_elements[$n + 1]) . " ";
                                                        $line_fixed = 1;
                                                }
                                        }
@@ -2903,20 +3031,18 @@ sub process {
                                            ($ctx =~ /Wx./ && $cc =~ /^;/)) {
                                                if (ERROR("SPACING",
                                                          "space prohibited before that '$op' $at\n" . $hereptr)) {
-                                                        $fixed_line =~ s/\s+$//;
+                                                        $good = rtrim($fix_elements[$n]) . trim($fix_elements[$n + 1]);
-                                                        $good = trim($fix_elements[$n]) . trim($fix_elements[$n + 1]);
                                                        $line_fixed = 1;
                                                }
                                        }
                                        if ($ctx =~ /ExW/) {
                                                if (ERROR("SPACING",
                                                          "space prohibited after that '$op' $at\n" . $hereptr)) {
-                                                        $fixed_line =~ s/\s+$//;
+                                                        $good = $fix_elements[$n] . trim($fix_elements[$n + 1]);
-                                                        $good = trim($fix_elements[$n]) . trim($fix_elements[$n + 1]);
-                                                        $line_fixed = 1;
                                                        if (defined $fix_elements[$n + 2]) {
                                                                $fix_elements[$n + 2] =~ s/^\s+//;
                                                        }
+                                                        $line_fixed = 1;
                                                }
                                        }
@@ -2930,8 +3056,10 @@ sub process {
                                        if ($ctx =~ /Wx[^WCE]|[^WCE]xW/) {
                                                if (ERROR("SPACING",
                                                          "need consistent spacing around '$op' $at\n" . $hereptr)) {
-                                                        $fixed_line =~ s/\s+$//;
+                                                        $good = rtrim($fix_elements[$n]) . " " . trim($fix_elements[$n + 1]) . " ";
-                                                        $good = trim($fix_elements[$n]) . " " . trim($fix_elements[$n + 1]) . " ";
+                                                        if (defined $fix_elements[$n + 2]) {
+                                                                $fix_elements[$n + 2] =~ s/^\s+//;
+                                                        }
                                                        $line_fixed = 1;
                                                }
                                        }
@@ -2942,7 +3070,7 @@ sub process {
                                        if ($ctx =~ /Wx./) {
                                                if (ERROR("SPACING",
                                                          "space prohibited before that '$op' $at\n" . $hereptr)) {
-                                                        $good = trim($fix_elements[$n]) . trim($fix_elements[$n + 1]);
+                                                        $good = rtrim($fix_elements[$n]) . trim($fix_elements[$n + 1]);
                                                        $line_fixed = 1;
                                                }
                                        }
@@ -2960,17 +3088,17 @@ sub process {
                                                $ok = 1;
                                        }
-                                        # Ignore ?:
+                                        # messages are ERROR, but ?: are CHK
-                                        if (($opv eq ':O' && $ca =~ /\?$/) ||
-                                            ($op eq '?' && $cc =~ /^:/)) {
-                                                $ok = 1;
-                                        }
                                        if ($ok == 0) {
-                                                if (ERROR("SPACING",
+                                                my $msg_type = \&ERROR;
-                                                          "spaces required around that '$op' $at\n" . $hereptr)) {
+                                                $msg_type = \&CHK if (($op eq '?:' || $op eq '?' || $op eq ':') && $ctx =~ /VxV/);
-                                                        $good = trim($fix_elements[$n]) . " " . trim($fix_elements[$n + 1]) . " ";
-                                                        $good = $fix_elements[$n] . " " . trim($fix_elements[$n + 1]) . " ";
+                                                if (&{$msg_type}("SPACING",
+                                                                 "spaces required around that '$op' $at\n" . $hereptr)) {
+                                                        $good = rtrim($fix_elements[$n]) . " " . trim($fix_elements[$n + 1]) . " ";
+                                                        if (defined $fix_elements[$n + 2]) {
+                                                                $fix_elements[$n + 2] =~ s/^\s+//;
+                                                        }
                                                        $line_fixed = 1;
                                                }
                                        }
@@ -3031,8 +3159,7 @@ sub process {
                        if (ERROR("SPACING",
                                  "space required before the open brace '{'\n" . $herecurr) &&
                            $fix) {
-                                $fixed[$linenr - 1] =~
+                                $fixed[$linenr - 1] =~ s/^(\+.*(?:do|\))){/$1 {/;
-                                    s/^(\+.*(?:do|\))){/$1 {/;
                        }
                }
@@ -3047,8 +3174,12 @@ sub process {
 # closing brace should have a space following it when it has anything
 # on the line
                if ($line =~ /}(?!(?:,|;|\)))\S/) {
-                        ERROR("SPACING",
+                        if (ERROR("SPACING",
-                              "space required after that close brace '}'\n" . $herecurr);
+                                  "space required after that close brace '}'\n" . $herecurr) &&
+                            $fix) {
+                                $fixed[$linenr - 1] =~
+                                    s/}((?!(?:,|;|\)))\S)/} $1/;
+                        }
                }
 # check spacing on square brackets
@@ -3102,21 +3233,10 @@ sub process {
                }
 # Return is not a function.
-                if (defined($stat) && $stat =~ /^.\s*return(\s*)(\(.*);/s) {
+                if (defined($stat) && $stat =~ /^.\s*return(\s*)\(/s) {
                        my $spacing = $1;
-                        my $value = $2;
+                        if ($^V && $^V ge 5.10.0 &&
+                            $stat =~ /^.\s*return\s*$balanced_parens\s*;\s*$/) {
-                        # Flatten any parentheses
-                        $value =~ s/\(/ \(/g;
-                        $value =~ s/\)/\) /g;
-                        while ($value =~ s/\[[^\[\]]*\]/1/ ||
-                               $value !~ /(?:$Ident|-?$Constant)\s*
-                                             $Compare\s*
-                                             (?:$Ident|-?$Constant)/x &&
-                               $value =~ s/\([^\(\)]*\)/1/) {
-                        }
-#print "value<$value>\n";
-                        if ($value =~ /^\s*(?:$Ident|-?$Constant)\s*$/) {
                                ERROR("RETURN_PARENTHESES",
                                      "return is not a function, parentheses are not required\n" . $herecurr);
@@ -3125,6 +3245,7 @@ sub process {
                                      "space required before the open parenthesis '('\n" . $herecurr);
                        }
                }
 # Return of what appears to be an errno should normally be -'ve
                if ($line =~ /^.\s*return\s*(E[A-Z]*)\s*;/) {
                        my $name = $1;
@@ -3168,6 +3289,7 @@ sub process {
                        }
                }
                if (!defined $suppress_whiletrailers{$linenr} &&
+                    defined($stat) && defined($cond) &&
                    $line =~ /\b(?:if|while|for)\s*\(/ && $line !~ /^.\s*#/) {
                        my ($s, $c) = ($stat, $cond);
@@ -3271,8 +3393,13 @@ sub process {
 #gcc binary extension
                        if ($var =~ /^$Binary$/) {
-                                WARN("GCC_BINARY_CONSTANT",
+                                if (WARN("GCC_BINARY_CONSTANT",
-                                     "Avoid gcc v4.3+ binary constant extension: <$var>\n" . $herecurr);
+                                         "Avoid gcc v4.3+ binary constant extension: <$var>\n" . $herecurr) &&
+                                    $fix) {
+                                        my $hexval = sprintf("0x%x", oct($var));
+                                        $fixed[$linenr - 1] =~
+                                            s/\b$var\b/$hexval/;
+                                }
                        }
 #CamelCase
@@ -3282,19 +3409,32 @@ sub process {
                            $var !~ /^(?:Clear|Set|TestClear|TestSet|)Page[A-Z]/ &&
 #Ignore SI style variants like nS, mV and dB (ie: max_uV, regulator_min_uA_show)
                            $var !~ /^(?:[a-z_]*?)_?[a-z][A-Z](?:_[a-z_]+)?$/) {
-                                seed_camelcase_includes() if ($check);
+                                while ($var =~ m{($Ident)}g) {
-                                if (!defined $camelcase{$var}) {
+                                        my $word = $1;
-                                        $camelcase{$var} = 1;
+                                        next if ($word !~ /[A-Z][a-z]|[a-z][A-Z]/);
-                                        CHK("CAMELCASE",
+                                        if ($check) {
-                                            "Avoid CamelCase: <$var>\n" . $herecurr);
+                                                seed_camelcase_includes();
+                                                if (!$file && !$camelcase_file_seeded) {
+                                                        seed_camelcase_file($realfile);
+                                                        $camelcase_file_seeded = 1;
+                                                }
+                                        }
+                                        if (!defined $camelcase{$word}) {
+                                                $camelcase{$word} = 1;
+                                                CHK("CAMELCASE",
+                                                    "Avoid CamelCase: <$word>\n" . $herecurr);
+                                        }
                                }
                        }
                }
 #no spaces allowed after \ in define
-                if ($line=~/\#\s*define.*\\\s$/) {
+                if ($line =~ /\#\s*define.*\\\s+$/) {
-                        WARN("WHITESPACE_AFTER_LINE_CONTINUATION",
+                        if (WARN("WHITESPACE_AFTER_LINE_CONTINUATION",
-                             "Whitepspace after \\ makes next lines useless\n" . $herecurr);
+                                 "Whitespace after \\ makes next lines useless\n" . $herecurr) &&
+                            $fix) {
+                                $fixed[$linenr - 1] =~ s/\s+$//;
+                        }
                }
 #warn if <asm/foo.h> is #included and <linux/foo.h> is available (uses RAW line)
@@ -3374,7 +3514,8 @@ sub process {
                            $dstat !~ /^for\s*$Constant$/ &&                            # for (...)
                            $dstat !~ /^for\s*$Constant\s+(?:$Ident|-?$Constant)$/ &&   # for (...) bar()
                            $dstat !~ /^do\s*{/ &&                                      # do {...
-                            $dstat !~ /^\({/)                                           # ({...
+                            $dstat !~ /^\({/ &&                                         # ({...
+                            $ctx !~ /^.\s*#\s*define\s+TRACE_(?:SYSTEM|INCLUDE_FILE|INCLUDE_PATH)\b/)
                        {
                                $ctx =~ s/\n*$//;
                                my $herectx = $here . "\n";
@@ -3606,6 +3747,53 @@ sub process {
                        }
                }
+# check for bad placement of section $InitAttribute (e.g.: __initdata)
+                if ($line =~ /(\b$InitAttribute\b)/) {
+                        my $attr = $1;
+                        if ($line =~ /^\+\s*static\s+(?:const\s+)?(?:$attr\s+)?($NonptrTypeWithAttr)\s+(?:$attr\s+)?($Ident(?:\[[^]]*\])?)\s*[=;]/) {
+                                my $ptr = $1;
+                                my $var = $2;
+                                if ((($ptr =~ /\b(union|struct)\s+$attr\b/ &&
+                                      ERROR("MISPLACED_INIT",
+                                            "$attr should be placed after $var\n" . $herecurr)) ||
+                                     ($ptr !~ /\b(union|struct)\s+$attr\b/ &&
+                                      WARN("MISPLACED_INIT",
+                                           "$attr should be placed after $var\n" . $herecurr))) &&
+                                    $fix) {
+                                        $fixed[$linenr - 1] =~ s/(\bstatic\s+(?:const\s+)?)(?:$attr\s+)?($NonptrTypeWithAttr)\s+(?:$attr\s+)?($Ident(?:\[[^]]*\])?)\s*([=;])\s*/"$1" . trim(string_find_replace($2, "\\s*$attr\\s*", " ")) . " " . trim(string_find_replace($3, "\\s*$attr\\s*", "")) . " $attr" . ("$4" eq ";" ? ";" : " = ")/e;
+                                }
+                        }
+                }
+# check for $InitAttributeData (ie: __initdata) with const
+                if ($line =~ /\bconst\b/ && $line =~ /($InitAttributeData)/) {
+                        my $attr = $1;
+                        $attr =~ /($InitAttributePrefix)(.*)/;
+                        my $attr_prefix = $1;
+                        my $attr_type = $2;
+                        if (ERROR("INIT_ATTRIBUTE",
+                                  "Use of const init definition must use ${attr_prefix}initconst\n" . $herecurr) &&
+                            $fix) {
+                                $fixed[$linenr - 1] =~
+                                    s/$InitAttributeData/${attr_prefix}initconst/;
+                        }
+                }
+# check for $InitAttributeConst (ie: __initconst) without const
+                if ($line !~ /\bconst\b/ && $line =~ /($InitAttributeConst)/) {
+                        my $attr = $1;
+                        if (ERROR("INIT_ATTRIBUTE",
+                                  "Use of $attr requires a separate use of const\n" . $herecurr) &&
+                            $fix) {
+                                my $lead = $fixed[$linenr - 1] =~
+                                    /(^\+\s*(?:static\s+))/;
+                                $lead = rtrim($1);
+                                $lead = "$lead " if ($lead !~ /^\+$/);
+                                $lead = "${lead}const ";
+                                $fixed[$linenr - 1] =~ s/(^\+\s*(?:static\s+))/$lead/;
+                        }
+                }
 # prefer usleep_range over udelay
                if ($line =~ /\budelay\s*\(\s*(\d+)\s*\)/) {
                        # ignore udelay's < 10, however
@@ -3665,8 +3853,8 @@ sub process {
 # check for memory barriers without a comment.
                if ($line =~ /\b(mb|rmb|wmb|read_barrier_depends|smp_mb|smp_rmb|smp_wmb|smp_read_barrier_depends)\(/) {
                        if (!ctx_has_comment($first_line, $linenr)) {
-                                CHK("MEMORY_BARRIER",
+                                WARN("MEMORY_BARRIER",
-                                    "memory barrier without comment\n" . $herecurr);
+                                     "memory barrier without comment\n" . $herecurr);
                        }
                }
 # check of hardware specific defines
@@ -3690,33 +3878,49 @@ sub process {
                }
 # Check for __inline__ and __inline, prefer inline
-                if ($line =~ /\b(__inline__|__inline)\b/) {
+                if ($realfile !~ m@\binclude/uapi/@ &&
-                        WARN("INLINE",
+                    $line =~ /\b(__inline__|__inline)\b/) {
-                             "plain inline is preferred over $1\n" . $herecurr);
+                        if (WARN("INLINE",
+                                 "plain inline is preferred over $1\n" . $herecurr) &&
+                            $fix) {
+                                $fixed[$linenr - 1] =~ s/\b(__inline__|__inline)\b/inline/;
+                        }
                }
 # Check for __attribute__ packed, prefer __packed
-                if ($line =~ /\b__attribute__\s*\(\s*\(.*\bpacked\b/) {
+                if ($realfile !~ m@\binclude/uapi/@ &&
+                    $line =~ /\b__attribute__\s*\(\s*\(.*\bpacked\b/) {
                        WARN("PREFER_PACKED",
                             "__packed is preferred over __attribute__((packed))\n" . $herecurr);
                }
 # Check for __attribute__ aligned, prefer __aligned
-                if ($line =~ /\b__attribute__\s*\(\s*\(.*aligned/) {
+                if ($realfile !~ m@\binclude/uapi/@ &&
+                    $line =~ /\b__attribute__\s*\(\s*\(.*aligned/) {
                        WARN("PREFER_ALIGNED",
                             "__aligned(size) is preferred over __attribute__((aligned(size)))\n" . $herecurr);
                }
 # Check for __attribute__ format(printf, prefer __printf
-                if ($line =~ /\b__attribute__\s*\(\s*\(\s*format\s*\(\s*printf/) {
+                if ($realfile !~ m@\binclude/uapi/@ &&
-                        WARN("PREFER_PRINTF",
+                    $line =~ /\b__attribute__\s*\(\s*\(\s*format\s*\(\s*printf/) {
-                             "__printf(string-index, first-to-check) is preferred over __attribute__((format(printf, string-index, first-to-check)))\n" . $herecurr);
+                        if (WARN("PREFER_PRINTF",
+                                 "__printf(string-index, first-to-check) is preferred over __attribute__((format(printf, string-index, first-to-check)))\n" . $herecurr) &&
+                            $fix) {
+                                $fixed[$linenr - 1] =~ s/\b__attribute__\s*\(\s*\(\s*format\s*\(\s*printf\s*,\s*(.*)\)\s*\)\s*\)/"__printf(" . trim($1) . ")"/ex;
+                        }
                }
 # Check for __attribute__ format(scanf, prefer __scanf
-                if ($line =~ /\b__attribute__\s*\(\s*\(\s*format\s*\(\s*scanf\b/) {
+                if ($realfile !~ m@\binclude/uapi/@ &&
-                        WARN("PREFER_SCANF",
+                    $line =~ /\b__attribute__\s*\(\s*\(\s*format\s*\(\s*scanf\b/) {
-                             "__scanf(string-index, first-to-check) is preferred over __attribute__((format(scanf, string-index, first-to-check)))\n" . $herecurr);
+                        if (WARN("PREFER_SCANF",
+                                 "__scanf(string-index, first-to-check) is preferred over __attribute__((format(scanf, string-index, first-to-check)))\n" . $herecurr) &&
+                            $fix) {
+                                $fixed[$linenr - 1] =~ s/\b__attribute__\s*\(\s*\(\s*format\s*\(\s*scanf\s*,\s*(.*)\)\s*\)\s*\)/"__scanf(" . trim($1) . ")"/ex;
+                        }
                }
 # check for sizeof(&)
@@ -3727,8 +3931,11 @@ sub process {
 # check for sizeof without parenthesis
                if ($line =~ /\bsizeof\s+((?:\*\s*|)$Lval|$Type(?:\s+$Lval|))/) {
-                        WARN("SIZEOF_PARENTHESIS",
+                        if (WARN("SIZEOF_PARENTHESIS",
-                             "sizeof $1 should be sizeof($1)\n" . $herecurr);
+                                 "sizeof $1 should be sizeof($1)\n" . $herecurr) &&
+                            $fix) {
+                                $fixed[$linenr - 1] =~ s/\bsizeof\s+((?:\*\s*|)$Lval|$Type(?:\s+$Lval|))/"sizeof(" . trim($1) . ")"/ex;
+                        }
                }
 # check for line continuations in quoted strings with odd counts of "
@@ -3744,11 +3951,14 @@ sub process {
                }
 # check for seq_printf uses that could be seq_puts
-                if ($line =~ /\bseq_printf\s*\(/) {
+                if ($sline =~ /\bseq_printf\s*\(.*"\s*\)\s*;\s*$/) {
                        my $fmt = get_quoted_string($line, $rawline);
-                        if ($fmt !~ /[^\\]\%/) {
+                        if ($fmt ne "" && $fmt !~ /[^\\]\%/) {
-                                WARN("PREFER_SEQ_PUTS",
+                                if (WARN("PREFER_SEQ_PUTS",
-                                     "Prefer seq_puts to seq_printf\n" . $herecurr);
+                                         "Prefer seq_puts to seq_printf\n" . $herecurr) &&
+                                    $fix) {
+                                        $fixed[$linenr - 1] =~ s/\bseq_printf\b/seq_puts/;
+                                }
                        }
                }
@@ -3810,6 +4020,33 @@ sub process {
                        }
                }
+# check for naked sscanf
+                if ($^V && $^V ge 5.10.0 &&
+                    defined $stat &&
+                    $stat =~ /\bsscanf\b/ &&
+                    ($stat !~ /$Ident\s*=\s*sscanf\s*$balanced_parens/ &&
+                     $stat !~ /\bsscanf\s*$balanced_parens\s*(?:$Compare)/ &&
+                     $stat !~ /(?:$Compare)\s*\bsscanf\s*$balanced_parens/)) {
+                        my $lc = $stat =~ tr@\n@@;
+                        $lc = $lc + $linenr;
+                        my $stat_real = raw_line($linenr, 0);
+                        for (my $count = $linenr + 1; $count <= $lc; $count++) {
+                                $stat_real = $stat_real . "\n" . raw_line($count, 0);
+                        }
+                        WARN("NAKED_SSCANF",
+                             "unchecked sscanf return value\n" . "$here\n$stat_real\n");
+                }
+# check for new externs in .h files.
+                if ($realfile =~ /\.h$/ &&
+                    $line =~ /^\+\s*(extern\s+)$Type\s*$Ident\s*\(/s) {
+                        if (CHK("AVOID_EXTERNS",
+                                "extern prototypes should be avoided in .h files\n" . $herecurr) &&
+                            $fix) {
+                                $fixed[$linenr - 1] =~ s/(.*)\bextern\b\s*(.*)/$1$2/;
+                        }
+                }
 # check for new externs in .c files.
                if ($realfile =~ /\.c$/ && defined $stat &&
                    $stat =~ /^.\s*(?:extern\s+)?$Type\s+($Ident)(\s*)\(/s)
@@ -3879,8 +4116,11 @@ sub process {
 # check for multiple semicolons
                if ($line =~ /;\s*;\s*$/) {
-                        WARN("ONE_SEMICOLON",
+                        if (WARN("ONE_SEMICOLON",
-                             "Statements terminations use 1 semicolon\n" . $herecurr);
+                                 "Statements terminations use 1 semicolon\n" . $herecurr) &&
+                            $fix) {
+                                $fixed[$linenr - 1] =~ s/(\s*;\s*){2,}$/;/g;
+                        }
                }
 # check for switch/default statements without a break;
@@ -3898,9 +4138,12 @@ sub process {
                }
 # check for gcc specific __FUNCTION__
-                if ($line =~ /__FUNCTION__/) {
+                if ($line =~ /\b__FUNCTION__\b/) {
-                        WARN("USE_FUNC",
+                        if (WARN("USE_FUNC",
-                             "__func__ should be used instead of gcc specific __FUNCTION__\n"  . $herecurr);
+                                 "__func__ should be used instead of gcc specific __FUNCTION__\n"  . $herecurr) &&
+                            $fix) {
+                                $fixed[$linenr - 1] =~ s/\b__FUNCTION__\b/__func__/g;
+                        }
                }
 # check for use of yield()
@@ -4012,6 +4255,12 @@ sub process {
                             "usage of NR_CPUS is often wrong - consider using cpu_possible(), num_possible_cpus(), for_each_possible_cpu(), etc\n" . $herecurr);
                }
+# Use of __ARCH_HAS_<FOO> or ARCH_HAVE_<BAR> is wrong.
+                if ($line =~ /\+\s*#\s*define\s+((?:__)?ARCH_(?:HAS|HAVE)\w*)\b/) {
+                        ERROR("DEFINE_ARCH_HAS",
+                              "#define of '$1' is wrong - use Kconfig variables or standard guards instead\n" . $herecurr);
+                }
 # check for %L{u,d,i} in strings
                my $string;
                while ($line =~ /(?:^|")([X\t]*)(?:"|$)/g) {
@@ -4105,13 +4354,8 @@ sub process {
                }
        }
-        if ($quiet == 0 && keys %ignore_type) {
+        hash_show_words(\%use_type, "Used");
-            print "NOTE: Ignored message types:";
+        hash_show_words(\%ignore_type, "Ignored");
-            foreach my $ignore (sort keys %ignore_type) {
-                print " $ignore";
-            }
-            print "\n\n";
-        }
        if ($clean == 0 && $fix && "@rawlines" ne "@fixed") {
                my $newfile = $filename . ".EXPERIMENTAL-checkpatch-fixes";
diff --git a/scripts/coccinelle/api/devm_request_and_ioremap.cocci b/scripts/coccinelle/api/devm_request_and_ioremap.cocci
deleted file mode 100644
index 562ec88b6352..000000000000
--- a/scripts/coccinelle/api/devm_request_and_ioremap.cocci
+++ /dev/null
@@ -1,105 +0,0 @@
-/// Reimplement a call to devm_request_mem_region followed by a call to ioremap
-/// or ioremap_nocache by a call to devm_request_and_ioremap.
-/// Devm_request_and_ioremap was introduced in
-/// 72f8c0bfa0de64c68ee59f40eb9b2683bffffbb0.  It makes the code much more
-/// concise.
-///
-///
-// Confidence: High
-// Copyright: (C) 2011 Julia Lawall, INRIA/LIP6.  GPLv2.
-// Copyright: (C) 2011 Gilles Muller, INRIA/LiP6.  GPLv2.
-// URL: http://coccinelle.lip6.fr/
-// Comments:
-// Options: --no-includes --include-headers
-virtual patch
-virtual org
-virtual report
-virtual context
-@nm@
-expression myname;
-identifier i;
-@@
-struct platform_driver i = { .driver = { .name = myname } };
-@depends on patch@
-expression dev,res,size;
-@@
-if (!devm_request_mem_region(dev, res->start, size,
-                              \(res->name\|dev_name(dev)\))) {
-   ...
-   return ...;
-}
-... when != res->start
-(
-devm_ioremap(dev,res->start,size)
-+devm_request_and_ioremap(dev,res)
-|
-devm_ioremap_nocache(dev,res->start,size)
-+devm_request_and_ioremap(dev,res)
-)
-... when any
-    when != res->start
-// this rule is separate from the previous one, because a single file can
-// have multiple values of myname
-@depends on patch@
-expression dev,res,size;
-expression nm.myname;
-@@
-if (!devm_request_mem_region(dev, res->start, size,myname)) {
-   ...
-   return ...;
-}
-... when != res->start
-(
-devm_ioremap(dev,res->start,size)
-+devm_request_and_ioremap(dev,res)
-|
-devm_ioremap_nocache(dev,res->start,size)
-+devm_request_and_ioremap(dev,res)
-)
-... when any
-    when != res->start
-@pb depends on org || report || context@
-expression dev,res,size;
-expression nm.myname;
-position p1,p2;
-@@
-*if
-  (!devm_request_mem_region@p1(dev, res->start, size,
-                              \(res->name\|dev_name(dev)\|myname\))) {
-   ...
-   return ...;
-}
-... when != res->start
-(
-*devm_ioremap@p2(dev,res->start,size)
-|
-*devm_ioremap_nocache@p2(dev,res->start,size)
-)
-... when any
-    when != res->start
-@script:python depends on org@
-p1 << pb.p1;
-p2 << pb.p2;
-@@
-cocci.print_main("INFO: replace by devm_request_and_ioremap",p1)
-cocci.print_secs("",p2)
-@script:python depends on report@
-p1 << pb.p1;
-p2 << pb.p2;
-@@
-msg = "INFO: devm_request_mem_region followed by ioremap on line %s can be replaced by devm_request_and_ioremap" % (p2[0].line)
-coccilib.report.print_report(p1[0],msg)
diff --git a/scripts/coccinelle/misc/boolreturn.cocci b/scripts/coccinelle/misc/boolreturn.cocci
new file mode 100644
index 000000000000..a43c7b0c36ef
--- /dev/null
+++ b/scripts/coccinelle/misc/boolreturn.cocci
@@ -0,0 +1,58 @@
+/// Return statements in functions returning bool should use
+/// true/false instead of 1/0.
+//
+// Confidence: High
+// Options: --no-includes --include-headers
+virtual patch
+virtual report
+virtual context
+@r1 depends on patch@
+identifier fn;
+typedef bool;
+symbol false;
+symbol true;
+@@
+bool fn ( ... )
+{
+<...
+return
+(
+- 0
+ false
+|
+- 1
+ true
+)
+  ;
+...>
+}
+@r2 depends on report || context@
+identifier fn;
+position p;
+@@
+bool fn ( ... )
+{
+<...
+return
+(
+* 0@p
+|
+* 1@p
+)
+  ;
+...>
+}
+@script:python depends on report@
+p << r2.p;
+fn << r2.fn;
+@@
+msg = "WARNING: return of 0/1 in function '%s' with return type bool" % fn
+coccilib.report.print_report(p[0], msg)
diff --git a/scripts/config b/scripts/config
index 567120a87c39..68041793698c 100755
--- a/scripts/config
+++ b/scripts/config
@@ -62,15 +62,52 @@ checkarg() {
        fi
 }
+txt_append() {
+        local anchor="$1"
+        local insert="$2"
+        local infile="$3"
+        local tmpfile="$infile.swp"
+        # sed append cmd: 'a\' + newline + text + newline
+        cmd="$(printf "a\\%b$insert" "\n")"
+        sed -e "/$anchor/$cmd" "$infile" >"$tmpfile"
+        # replace original file with the edited one
+        mv "$tmpfile" "$infile"
+}
+txt_subst() {
+        local before="$1"
+        local after="$2"
+        local infile="$3"
+        local tmpfile="$infile.swp"
+        sed -e "s:$before:$after:" "$infile" >"$tmpfile"
+        # replace original file with the edited one
+        mv "$tmpfile" "$infile"
+}
+txt_delete() {
+        local text="$1"
+        local infile="$2"
+        local tmpfile="$infile.swp"
+        sed -e "/$text/d" "$infile" >"$tmpfile"
+        # replace original file with the edited one
+        mv "$tmpfile" "$infile"
+}
 set_var() {
        local name=$1 new=$2 before=$3
        name_re="^($name=|# $name is not set)"
        before_re="^($before=|# $before is not set)"
        if test -n "$before" && grep -Eq "$before_re" "$FN"; then
-                sed -ri "/$before_re/a $new" "$FN"
+                txt_append "^$before=" "$new" "$FN"
+                txt_append "^# $before is not set" "$new" "$FN"
        elif grep -Eq "$name_re" "$FN"; then
-                sed -ri "s:$name_re.*:$new:" "$FN"
+                txt_subst "^$name=.*" "$new" "$FN"
+                txt_subst "^# $name is not set" "$new" "$FN"
        else
                echo "$new" >>"$FN"
        fi
@@ -79,7 +116,8 @@ set_var() {
 undef_var() {
        local name=$1
-        sed -ri "/^($name=|# $name is not set)/d" "$FN"
+        txt_delete "^$name=" "$FN"
+        txt_delete "^# $name is not set" "$FN"
 }
 if [ "$1" = "--file" ]; then
diff --git a/scripts/diffconfig b/scripts/diffconfig
index b91f3e34d44d..6d672836e187 100755
--- a/scripts/diffconfig
+++ b/scripts/diffconfig
@@ -10,7 +10,7 @@
 import sys, os
 def usage():
-    print """Usage: diffconfig [-h] [-m] [<config1> <config2>]
+    print("""Usage: diffconfig [-h] [-m] [<config1> <config2>]
 Diffconfig is a simple utility for comparing two .config files.
 Using standard diff to compare .config files often includes extraneous and
@@ -33,7 +33,7 @@ Example usage:
 EXT2_FS  y -> n
 LOG_BUF_SHIFT  14 -> 16
 PRINTK_TIME  n -> y
-"""
+""")
    sys.exit(0)
 # returns a dictionary of name/value pairs for config items in the file
@@ -54,23 +54,23 @@ def print_config(op, config, value, new_value):
    if merge_style:
        if new_value:
            if new_value=="n":
-                print "# CONFIG_%s is not set" % config
+                print("# CONFIG_%s is not set" % config)
            else:
-                print "CONFIG_%s=%s" % (config, new_value)
+                print("CONFIG_%s=%s" % (config, new_value))
    else:
        if op=="-":
-            print "-%s %s" % (config, value)
+            print("-%s %s" % (config, value))
        elif op=="+":
-            print "+%s %s" % (config, new_value)
+            print("+%s %s" % (config, new_value))
        else:
-            print " %s %s -> %s" % (config, value, new_value)
+            print(" %s %s -> %s" % (config, value, new_value))
 def main():
    global merge_style
    # parse command line args
    if ("-h" in sys.argv or "--help" in sys.argv):
-        usage()
+        usage()
    merge_style = 0
    if "-m" in sys.argv:
@@ -79,23 +79,27 @@ def main():
    argc = len(sys.argv)
    if not (argc==1 or argc == 3):
-        print "Error: incorrect number of arguments or unrecognized option"
+        print("Error: incorrect number of arguments or unrecognized option")
        usage()
    if argc == 1:
        # if no filenames given, assume .config and .config.old
        build_dir=""
-        if os.environ.has_key("KBUILD_OUTPUT"):
+        if "KBUILD_OUTPUT" in os.environ:
            build_dir = os.environ["KBUILD_OUTPUT"]+"/"
        configa_filename = build_dir + ".config.old"
        configb_filename = build_dir + ".config"
    else:
        configa_filename = sys.argv[1]
        configb_filename = sys.argv[2]
-    a = readconfig(file(configa_filename))
+    try:
-    b = readconfig(file(configb_filename))
+        a = readconfig(open(configa_filename))
+        b = readconfig(open(configb_filename))
+    except (IOError):
+        e = sys.exc_info()[1]
+        print("I/O error[%s]: %s\n" % (e.args[0],e.args[1]))
+        usage()
    # print items in a but not b (accumulate, sort and print)
    old = []
@@ -121,8 +125,7 @@ def main():
    # now print items in b but not in a
    # (items from b that were in a were removed above)
-    new = b.keys()
+    new = sorted(b.keys())
-    new.sort()
    for config in new:
        print_config("+", config, None, b[config])
diff --git a/scripts/docproc.c b/scripts/docproc.c
index 4cfdc1797eb8..2b69eaf5b646 100644
--- a/scripts/docproc.c
+++ b/scripts/docproc.c
@@ -72,6 +72,7 @@ FILELINE * docsection;
 #define FUNCTION      "-function"
 #define NOFUNCTION    "-nofunction"
 #define NODOCSECTIONS "-no-doc-sections"
+#define SHOWNOTFOUND  "-show-not-found"
 static char *srctree, *kernsrctree;
@@ -294,6 +295,7 @@ static void singfunc(char * filename, char * line)
        int startofsym = 1;
        vec[idx++] = KERNELDOC;
        vec[idx++] = DOCBOOK;
+        vec[idx++] = SHOWNOTFOUND;
        /* Split line up in individual parameters preceded by FUNCTION */
        for (i=0; line[i]; i++) {
@@ -325,7 +327,8 @@ static void singfunc(char * filename, char * line)
 */
 static void docsect(char *filename, char *line)
 {
-        char *vec[6]; /* kerneldoc -docbook -function "section" file NULL */
+        /* kerneldoc -docbook -show-not-found -function "section" file NULL */
+        char *vec[7];
        char *s;
        for (s = line; *s; s++)
@@ -341,10 +344,11 @@ static void docsect(char *filename, char *line)
        vec[0] = KERNELDOC;
        vec[1] = DOCBOOK;
-        vec[2] = FUNCTION;
+        vec[2] = SHOWNOTFOUND;
-        vec[3] = line;
+        vec[3] = FUNCTION;
-        vec[4] = filename;
+        vec[4] = line;
-        vec[5] = NULL;
+        vec[5] = filename;
+        vec[6] = NULL;
        exec_kernel_doc(vec);
 }
diff --git a/scripts/gen_initramfs_list.sh b/scripts/gen_initramfs_list.sh
index b482f162a18a..ef474098d9f1 100644
--- a/scripts/gen_initramfs_list.sh
+++ b/scripts/gen_initramfs_list.sh
@@ -240,12 +240,24 @@ case "$arg" in
                output_file="$1"
                cpio_list="$(mktemp ${TMPDIR:-/tmp}/cpiolist.XXXXXX)"
                output=${cpio_list}
-                echo "$output_file" | grep -q "\.gz$" && compr="gzip -n -9 -f"
+                echo "$output_file" | grep -q "\.gz$" \
-                echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f"
+                && [ -x "`which gzip 2> /dev/null`" ] \
-                echo "$output_file" | grep -q "\.lzma$" && compr="lzma -9 -f"
+                && compr="gzip -n -9 -f"
-                echo "$output_file" | grep -q "\.xz$" && \
+                echo "$output_file" | grep -q "\.bz2$" \
-                                compr="xz --check=crc32 --lzma2=dict=1MiB"
+                && [ -x "`which bzip2 2> /dev/null`" ] \
-                echo "$output_file" | grep -q "\.lzo$" && compr="lzop -9 -f"
+                && compr="bzip2 -9 -f"
+                echo "$output_file" | grep -q "\.lzma$" \
+                && [ -x "`which lzma 2> /dev/null`" ] \
+                && compr="lzma -9 -f"
+                echo "$output_file" | grep -q "\.xz$" \
+                && [ -x "`which xz 2> /dev/null`" ] \
+                && compr="xz --check=crc32 --lzma2=dict=1MiB"
+                echo "$output_file" | grep -q "\.lzo$" \
+                && [ -x "`which lzop 2> /dev/null`" ] \
+                && compr="lzop -9 -f"
+                echo "$output_file" | grep -q "\.lz4$" \
+                && [ -x "`which lz4 2> /dev/null`" ] \
+                && compr="lz4 -9 -f"
                echo "$output_file" | grep -q "\.cpio$" && compr="cat"
                shift
                ;;
diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
index 487ac6f37ca2..10085de886fe 100644
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -55,6 +55,7 @@ static struct sym_entry *table;
 static unsigned int table_size, table_cnt;
 static int all_symbols = 0;
 static char symbol_prefix_char = '\0';
+static unsigned long long kernel_start_addr = 0;
 int token_profit[0x10000];
@@ -65,7 +66,10 @@ unsigned char best_table_len[256];
 static void usage(void)
 {
-        fprintf(stderr, "Usage: kallsyms [--all-symbols] [--symbol-prefix=<prefix char>] < in.map > out.S\n");
+        fprintf(stderr, "Usage: kallsyms [--all-symbols] "
+                        "[--symbol-prefix=<prefix char>] "
+                        "[--page-offset=<CONFIG_PAGE_OFFSET>] "
+                        "< in.map > out.S\n");
        exit(1);
 }
@@ -111,6 +115,12 @@ static int read_symbol(FILE *in, struct sym_entry *s)
                        fprintf(stderr, "Read error or end of file.\n");
                return -1;
        }
+        if (strlen(str) > KSYM_NAME_LEN) {
+                fprintf(stderr, "Symbol %s too long for kallsyms (%zu vs %d).\n"
+                                "Please increase KSYM_NAME_LEN both in kernel and kallsyms.c\n",
+                        str, strlen(str), KSYM_NAME_LEN);
+                return -1;
+        }
        sym = str;
        /* skip prefix char */
@@ -194,6 +204,9 @@ static int symbol_valid(struct sym_entry *s)
        int i;
        int offset = 1;
+        if (s->addr < kernel_start_addr)
+                return 0;
        /* skip prefix char */
        if (symbol_prefix_char && *(s->sym + 1) == symbol_prefix_char)
                offset++;
@@ -646,6 +659,9 @@ int main(int argc, char **argv)
                                if ((*p == '"' && *(p+2) == '"') || (*p == '\'' && *(p+2) == '\''))
                                        p++;
                                symbol_prefix_char = *p;
+                        } else if (strncmp(argv[i], "--page-offset=", 14) == 0) {
+                                const char *p = &argv[i][14];
+                                kernel_start_addr = strtoull(p, NULL, 16);
                        } else
                                usage();
                }
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index c55c227af463..87f723804079 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -140,7 +140,9 @@ static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p)
                        sym->flags |= def_flags;
                        break;
                }
-                conf_warning("symbol value '%s' invalid for %s", p, sym->name);
+                if (def != S_DEF_AUTO)
+                        conf_warning("symbol value '%s' invalid for %s",
+                                     p, sym->name);
                return 1;
        case S_OTHER:
                if (*p != '"') {
@@ -161,7 +163,8 @@ static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p)
                        memmove(p2, p2 + 1, strlen(p2));
                }
                if (!p2) {
-                        conf_warning("invalid string found");
+                        if (def != S_DEF_AUTO)
+                                conf_warning("invalid string found");
                        return 1;
                }
                /* fall through */
@@ -172,7 +175,9 @@ static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p)
                        sym->def[def].val = strdup(p);
                        sym->flags |= def_flags;
                } else {
-                        conf_warning("symbol value '%s' invalid for %s", p, sym->name);
+                        if (def != S_DEF_AUTO)
+                                conf_warning("symbol value '%s' invalid for %s",
+                                             p, sym->name);
                        return 1;
                }
                break;
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index df198a5f4822..ba663e1dc7e3 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -93,7 +93,7 @@ struct symbol {
 #define SYMBOL_CHOICEVAL  0x0020  /* used as a value in a choice block */
 #define SYMBOL_VALID      0x0080  /* set when symbol.curr is calculated */
 #define SYMBOL_OPTIONAL   0x0100  /* choice is optional - values can be 'n' */
-#define SYMBOL_WRITE      0x0200  /* ? */
+#define SYMBOL_WRITE      0x0200  /* write symbol to file (KCONFIG_CONFIG) */
 #define SYMBOL_CHANGED    0x0400  /* ? */
 #define SYMBOL_AUTO       0x1000  /* value from environment variable */
 #define SYMBOL_CHECKED    0x2000  /* used during dependency checking */
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 6c9c45f9fbba..59184bb41ef8 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -25,7 +25,7 @@
 static const char mconf_readme[] = N_(
 "Overview\n"
 "--------\n"
-"This interface let you select features and parameters for the build.\n"
+"This interface lets 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"
 "\n"
@@ -39,15 +39,15 @@ static const char mconf_readme[] = 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"
+"<N> to remove it.  You may also press the <Space Bar> to cycle\n"
-"through the available options (ie. Y->N->M->Y).\n"
+"through the available options (i.e. Y->N->M->Y).\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"
+"o  Use the Up/Down arrow keys (cursor keys) to highlight the item you\n"
-"   you wish to change or submenu wish to select and press <Enter>.\n"
+"   wish to change or the submenu you wish to select and press <Enter>.\n"
 "   Submenus are designated by \"--->\", empty ones by \"----\".\n"
 "\n"
 "   Shortcut: Press the option's highlighted letter (hotkey).\n"
@@ -65,7 +65,7 @@ static const char mconf_readme[] = N_(
 "             there is a delayed response which you may find annoying.\n"
 "\n"
 "   Also, the <TAB> and cursor keys will cycle between <Select>,\n"
-"   <Exit> and <Help>.\n"
+"   <Exit>, <Help>, <Save>, and <Load>.\n"
 "\n"
 "o  To get help with an item, use the cursor keys to highlight <Help>\n"
 "   and press <ENTER>.\n"
@@ -105,7 +105,7 @@ static const char mconf_readme[] = 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>, <SPACE BAR> and <B> for \n"
+"   keys h,j,k,l function here as do <u>, <d>, <SPACE BAR> and <B> for\n"
 "   those who are familiar with less and lynx.\n"
 "\n"
 "o  Press <E>, <X>, <q>, <Enter> or <Esc><Esc> to exit.\n"
@@ -117,23 +117,21 @@ static const char mconf_readme[] = N_(
 "those who, for various reasons, find it necessary to switch\n"
 "between different configurations.\n"
 "\n"
-"At the end of the main menu you will find two options.  One is\n"
+"The <Save> button will let you save the current configuration to\n"
-"for saving the current configuration to a file of your choosing.\n"
+"a file of your choosing.  Use the <Load> button to load a previously\n"
-"The other option is for loading a previously saved alternate\n"
+"saved alternate configuration.\n"
-"configuration.\n"
 "\n"
-"Even if you don't use alternate configuration files, but you\n"
+"Even if you don't use alternate configuration files, but you find\n"
-"find during a Menuconfig session that you have completely messed\n"
+"during a Menuconfig session that you have completely messed up your\n"
-"up your settings, you may use the \"Load Alternate...\" option to\n"
+"settings, you may use the <Load> button to restore your previously\n"
-"restore your previously saved settings from \".config\" without\n"
+"saved settings from \".config\" without restarting Menuconfig.\n"
-"restarting Menuconfig.\n"
 "\n"
 "Other information\n"
 "-----------------\n"
-"If you use Menuconfig in an XTERM window make sure you have your\n"
+"If you use Menuconfig in an XTERM window, make sure you have your\n"
-"$TERM variable set to point to a xterm definition which supports color.\n"
+"$TERM variable set to point to an xterm definition which supports\n"
-"Otherwise, Menuconfig will look rather bad.  Menuconfig will not\n"
+"color.  Otherwise, Menuconfig will look rather bad.  Menuconfig will\n"
-"display correctly in a RXVT window because rxvt displays only one\n"
+"not display correctly in an RXVT window because rxvt displays only one\n"
 "intensity of color, bright.\n"
 "\n"
 "Menuconfig will display larger menus on screens or xterms which are\n"
@@ -148,8 +146,8 @@ static const char mconf_readme[] = N_(
 "\n"
 "Optional personality available\n"
 "------------------------------\n"
-"If you prefer to have all of the options listed in a single menu, rather\n"
+"If you prefer to have all of the options listed in a single menu,\n"
-"than the default multimenu hierarchy, run the menuconfig with\n"
+"rather than the default multimenu hierarchy, run the menuconfig with\n"
 "MENUCONFIG_MODE environment variable set to single_menu. Example:\n"
 "\n"
 "make MENUCONFIG_MODE=single_menu menuconfig\n"
@@ -172,7 +170,7 @@ static const char mconf_readme[] = N_(
 " mono       => selects colors suitable for monochrome displays\n"
 " blackbg    => selects a color scheme with black background\n"
 " classic    => theme with blue background. The classic look\n"
-" bluetitle  => a LCD friendly version of classic. (default)\n"
+" bluetitle  => an LCD friendly version of classic. (default)\n"
 "\n"),
 menu_instructions[] = N_(
        "Arrow keys navigate the menu.  "
@@ -238,24 +236,24 @@ search_help[] = N_(
        "Symbol: FOO [=m]\n"
        "Type  : tristate\n"
        "Prompt: Foo bus is used to drive the bar HW\n"
-        "  Defined at drivers/pci/Kconfig:47\n"
-        "  Depends on: X86_LOCAL_APIC && X86_IO_APIC || IA64\n"
        "  Location:\n"
        "    -> Bus options (PCI, PCMCIA, EISA, ISA)\n"
        "      -> PCI support (PCI [=y])\n"
        "(1)     -> PCI access mode (<choice> [=y])\n"
+        "  Defined at drivers/pci/Kconfig:47\n"
+        "  Depends on: X86_LOCAL_APIC && X86_IO_APIC || IA64\n"
        "  Selects: LIBCRC32\n"
-        "  Selected by: BAR\n"
+        "  Selected by: BAR [=n]\n"
        "-----------------------------------------------------------------\n"
        "o The line 'Type:' shows the type of the configuration option for\n"
        "  this symbol (boolean, tristate, string, ...)\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"
+        "o The 'Defined at' line tells 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"
+        "o The 'Depends on:' line tells what symbols need 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"
+        "o The 'Location:' lines tells where in the menu structure this symbol\n"
        "  is located\n"
        "    A location followed by a [=y] indicates that this is a\n"
        "    selectable menu item - and the current value is displayed inside\n"
@@ -263,9 +261,9 @@ search_help[] = N_(
        "    Press the key in the (#) prefix to jump directly to that\n"
        "    location. You will be returned to the current search results\n"
        "    after exiting this new menu.\n"
-        "o The 'Selects:' line tell what symbol will be automatically\n"
+        "o The 'Selects:' line tells what symbols 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 'Selected by' line tells what symbol has selected this symbol\n"
        "\n"
        "Only relevant lines are shown.\n"
        "\n\n"
@@ -401,8 +399,8 @@ static void search_conf(void)
        struct subtitle_part stpart;
        title = str_new();
-        str_printf( &title, _("Enter %s (sub)string or regexp to search for "
+        str_printf( &title, _("Enter (sub)string or regexp to search for "
-                              "(with or without \"%s\")"), CONFIG_, CONFIG_);
+                              "(with or without \"%s\")"), CONFIG_);
 again:
        dialog_clear();
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 7e233a6ca64e..db1512ae30cc 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -119,9 +119,10 @@ void menu_set_type(int type)
                sym->type = type;
                return;
        }
-        menu_warn(current_entry, "type of '%s' redefined from '%s' to '%s'",
+        menu_warn(current_entry,
-            sym->name ? sym->name : "<choice>",
+                "ignoring type redefinition of '%s' from '%s' to '%s'",
-            sym_type_name(sym->type), sym_type_name(type));
+                sym->name ? sym->name : "<choice>",
+                sym_type_name(sym->type), sym_type_name(type));
 }
 struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *expr, struct expr *dep)
@@ -197,12 +198,15 @@ void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep)
 void menu_add_option(int token, char *arg)
 {
-        struct property *prop;
        switch (token) {
        case T_OPT_MODULES:
-                prop = prop_alloc(P_DEFAULT, modules_sym);
+                if (modules_sym)
-                prop->expr = expr_alloc_symbol(current_entry->sym);
+                        zconf_error("symbol '%s' redefines option 'modules'"
+                                    " already defined by symbol '%s'",
+                                    current_entry->sym->name,
+                                    modules_sym->name
+                                    );
+                modules_sym = current_entry->sym;
                break;
        case T_OPT_DEFCONFIG_LIST:
                if (!sym_defconfig_list)
@@ -580,7 +584,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop,
                for (j = 4; --i >= 0; j += 2) {
                        menu = submenu[i];
                        if (head && location && menu == location)
-                                jump->offset = r->len - 1;
+                                jump->offset = strlen(r->s);
                        str_printf(r, "%*c-> %s", j, ' ',
                                   _(menu_get_prompt(menu)));
                        if (menu->sym) {
@@ -594,7 +598,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop,
 }
 /*
- * get peoperty of type P_SYMBOL
+ * get property of type P_SYMBOL
 */
 static struct property *get_symbol_prop(struct symbol *sym)
 {
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
index 7975d8d258c3..4fbecd2473bc 100644
--- a/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
@@ -695,8 +695,8 @@ static void search_conf(void)
        int dres;
        title = str_new();
-        str_printf( &title, _("Enter %s (sub)string or regexp to search for "
+        str_printf( &title, _("Enter (sub)string or regexp to search for "
-                              "(with or without \"%s\")"), CONFIG_, CONFIG_);
+                              "(with or without \"%s\")"), CONFIG_);
 again:
        dres = dialog_inputbox(main_window,
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 1500c38f0cca..9d3b04b0769c 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -69,6 +69,11 @@ static inline QString qgettext(const QString& str)
        return QString::fromLocal8Bit(gettext(str.latin1()));
 }
+ConfigSettings::ConfigSettings()
+        : QSettings("kernel.org", "qconf")
+{
+}
 /**
 * Reads a list of integer values from the application settings.
 */
diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h
index 3715b3e7212c..bde0c6b6f9e8 100644
--- a/scripts/kconfig/qconf.h
+++ b/scripts/kconfig/qconf.h
@@ -32,6 +32,7 @@ class ConfigMainWindow;
 class ConfigSettings : public QSettings {
 public:
+        ConfigSettings();
        Q3ValueList<int> readSizes(const QString& key, bool *ok);
        bool writeSizes(const QString& key, const Q3ValueList<int>& value);
 };
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index d550300ec00c..7caabdb51c64 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -136,7 +136,7 @@ static struct property *sym_get_range_prop(struct symbol *sym)
        return NULL;
 }
-static long sym_get_range_val(struct symbol *sym, int base)
+static long long sym_get_range_val(struct symbol *sym, int base)
 {
        sym_calc_value(sym);
        switch (sym->type) {
@@ -149,13 +149,14 @@ static long sym_get_range_val(struct symbol *sym, int base)
        default:
                break;
        }
-        return strtol(sym->curr.val, NULL, base);
+        return strtoll(sym->curr.val, NULL, base);
 }
 static void sym_validate_range(struct symbol *sym)
 {
        struct property *prop;
-        long base, val, val2;
+        int base;
+        long long val, val2;
        char str[64];
        switch (sym->type) {
@@ -171,7 +172,7 @@ static void sym_validate_range(struct symbol *sym)
        prop = sym_get_range_prop(sym);
        if (!prop)
                return;
-        val = strtol(sym->curr.val, NULL, base);
+        val = strtoll(sym->curr.val, NULL, base);
        val2 = sym_get_range_val(prop->expr->left.sym, base);
        if (val >= val2) {
                val2 = sym_get_range_val(prop->expr->right.sym, base);
@@ -179,9 +180,9 @@ static void sym_validate_range(struct symbol *sym)
                        return;
        }
        if (sym->type == S_INT)
-                sprintf(str, "%ld", val2);
+                sprintf(str, "%lld", val2);
        else
-                sprintf(str, "0x%lx", val2);
+                sprintf(str, "0x%llx", val2);
        sym->curr.val = strdup(str);
 }
@@ -594,7 +595,7 @@ bool sym_string_valid(struct symbol *sym, const char *str)
 bool sym_string_within_range(struct symbol *sym, const char *str)
 {
        struct property *prop;
-        long val;
+        long long val;
        switch (sym->type) {
        case S_STRING:
@@ -605,7 +606,7 @@ bool sym_string_within_range(struct symbol *sym, const char *str)
                prop = sym_get_range_prop(sym);
                if (!prop)
                        return true;
-                val = strtol(str, NULL, 10);
+                val = strtoll(str, NULL, 10);
                return val >= sym_get_range_val(prop->expr->left.sym, 10) &&
                       val <= sym_get_range_val(prop->expr->right.sym, 10);
        case S_HEX:
@@ -614,7 +615,7 @@ bool sym_string_within_range(struct symbol *sym, const char *str)
                prop = sym_get_range_prop(sym);
                if (!prop)
                        return true;
-                val = strtol(str, NULL, 16);
+                val = strtoll(str, NULL, 16);
                return val >= sym_get_range_val(prop->expr->left.sym, 16) &&
                       val <= sym_get_range_val(prop->expr->right.sym, 16);
        case S_BOOLEAN:
@@ -963,11 +964,11 @@ struct sym_match {
 * - first, symbols that match exactly
 * - then, alphabetical sort
 */
-static int sym_rel_comp( const void *sym1, const void *sym2 )
+static int sym_rel_comp(const void *sym1, const void *sym2)
 {
-        struct sym_match *s1 = *(struct sym_match **)sym1;
+        const struct sym_match *s1 = sym1;
-        struct sym_match *s2 = *(struct sym_match **)sym2;
+        const struct sym_match *s2 = sym2;
-        int l1, l2;
+        int exact1, exact2;
        /* Exact match:
         * - if matched length on symbol s1 is the length of that symbol,
@@ -978,11 +979,11 @@ static int sym_rel_comp( const void *sym1, const void *sym2 )
         * exactly; if this is the case, we can't decide which comes first,
         * and we fallback to sorting alphabetically.
         */
-        l1 = s1->eo - s1->so;
+        exact1 = (s1->eo - s1->so) == strlen(s1->sym->name);
-        l2 = s2->eo - s2->so;
+        exact2 = (s2->eo - s2->so) == strlen(s2->sym->name);
-        if (l1 == strlen(s1->sym->name) && l2 != strlen(s2->sym->name))
+        if (exact1 && !exact2)
                return -1;
-        if (l1 != strlen(s1->sym->name) && l2 == strlen(s2->sym->name))
+        if (!exact1 && exact2)
                return 1;
        /* As a fallback, sort symbols alphabetically */
@@ -992,7 +993,7 @@ static int sym_rel_comp( const void *sym1, const void *sym2 )
 struct symbol **sym_re_search(const char *pattern)
 {
        struct symbol *sym, **sym_arr = NULL;
-        struct sym_match **sym_match_arr = NULL;
+        struct sym_match *sym_match_arr = NULL;
        int i, cnt, size;
        regex_t re;
        regmatch_t match[1];
@@ -1005,47 +1006,38 @@ struct symbol **sym_re_search(const char *pattern)
                return NULL;
        for_all_symbols(i, sym) {
-                struct sym_match *tmp_sym_match;
                if (sym->flags & SYMBOL_CONST || !sym->name)
                        continue;
                if (regexec(&re, sym->name, 1, match, 0))
                        continue;
-                if (cnt + 1 >= size) {
+                if (cnt >= size) {
                        void *tmp;
                        size += 16;
-                        tmp = realloc(sym_match_arr, size * sizeof(struct sym_match *));
+                        tmp = realloc(sym_match_arr, size * sizeof(struct sym_match));
-                        if (!tmp) {
+                        if (!tmp)
                                goto sym_re_search_free;
-                        }
                        sym_match_arr = tmp;
                }
                sym_calc_value(sym);
-                tmp_sym_match = (struct sym_match*)malloc(sizeof(struct sym_match));
+                /* As regexec returned 0, we know we have a match, so
-                if (!tmp_sym_match)
-                        goto sym_re_search_free;
-                tmp_sym_match->sym = sym;
-                /* As regexec return 0, we know we have a match, so
                 * we can use match[0].rm_[se]o without further checks
                 */
-                tmp_sym_match->so = match[0].rm_so;
+                sym_match_arr[cnt].so = match[0].rm_so;
-                tmp_sym_match->eo = match[0].rm_eo;
+                sym_match_arr[cnt].eo = match[0].rm_eo;
-                sym_match_arr[cnt++] = tmp_sym_match;
+                sym_match_arr[cnt++].sym = sym;
        }
        if (sym_match_arr) {
-                qsort(sym_match_arr, cnt, sizeof(struct sym_match*), sym_rel_comp);
+                qsort(sym_match_arr, cnt, sizeof(struct sym_match), sym_rel_comp);
                sym_arr = malloc((cnt+1) * sizeof(struct symbol));
                if (!sym_arr)
                        goto sym_re_search_free;
                for (i = 0; i < cnt; i++)
-                        sym_arr[i] = sym_match_arr[i]->sym;
+                        sym_arr[i] = sym_match_arr[i].sym;
                sym_arr[cnt] = NULL;
        }
 sym_re_search_free:
-        if (sym_match_arr) {
+        /* sym_match_arr can be NULL if no match, but free(NULL) is OK */
-                for (i = 0; i < cnt; i++)
+        free(sym_match_arr);
-                        free(sym_match_arr[i]);
-                free(sym_match_arr);
-        }
        regfree(&re);
        return sym_arr;
@@ -1055,7 +1047,7 @@ sym_re_search_free:
 * When we check for recursive dependencies we use a stack to save
 * current state so we can print out relevant info to user.
 * The entries are located on the call stack so no need to free memory.
- * Note inser() remove() must always match to properly clear the stack.
+ * Note insert() remove() must always match to properly clear the stack.
 */
 static struct dep_stack {
        struct dep_stack *prev, *next;
diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l
index 6555a475453b..1a9f53e535ca 100644
--- a/scripts/kconfig/zconf.l
+++ b/scripts/kconfig/zconf.l
@@ -68,7 +68,6 @@ static void alloc_string(const char *str, int size)
 }
 %}
-ws      [ \n\t]
 n       [A-Za-z0-9_]
 %%
diff --git a/scripts/kconfig/zconf.tab.c_shipped b/scripts/kconfig/zconf.tab.c_shipped
index f636141e7bfd..25ae16ac75c8 100644
--- a/scripts/kconfig/zconf.tab.c_shipped
+++ b/scripts/kconfig/zconf.tab.c_shipped
@@ -1,9 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.4.3.  */
+/* A Bison parser, made by GNU Bison 2.5.  */
-/* Skeleton implementation for Bison's Yacc-like parsers in C
+/* Bison implementation for Yacc-like parsers in C
   
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+      Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
-   2009, 2010 Free Software Foundation, Inc.
   
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -45,7 +44,7 @@
 #define YYBISON 1
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.3"
+#define YYBISON_VERSION "2.5"
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -302,11 +301,11 @@ YYID (yyi)
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
     || defined __cplusplus || defined _MSC_VER)
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     ifndef _STDLIB_H
+#     ifndef EXIT_SUCCESS
-#      define _STDLIB_H 1
+#      define EXIT_SUCCESS 0
 #     endif
 #    endif
 #   endif
@@ -329,24 +328,24 @@ YYID (yyi)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
-#  if (defined __cplusplus && ! defined _STDLIB_H \
+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
       && ! ((defined YYMALLOC || defined malloc) \
             && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef _STDLIB_H
+#   ifndef EXIT_SUCCESS
-#    define _STDLIB_H 1
+#    define EXIT_SUCCESS 0
 #   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+#   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
     || defined __cplusplus || defined _MSC_VER)
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
-#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+#   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
     || defined __cplusplus || defined _MSC_VER)
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
@@ -375,23 +374,7 @@ union yyalloc
     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
      + YYSTACK_GAP_MAXIMUM)
-/* Copy COUNT objects from FROM to TO.  The source and destination do
+# define YYCOPY_NEEDED 1
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)              \
-      do                                        \
-        {                                       \
-          YYSIZE_T yyi;                         \
-          for (yyi = 0; yyi < (Count); yyi++)   \
-            (To)[yyi] = (From)[yyi];            \
-        }                                       \
-      while (YYID (0))
-#  endif
-# endif
 /* Relocate STACK from its old location to the new one.  The
   local variables YYSIZE and YYSTACKSIZE give the old and new number of
@@ -411,6 +394,26 @@ union yyalloc
 #endif
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)              \
+      do                                        \
+        {                                       \
+          YYSIZE_T yyi;                         \
+          for (yyi = 0; yyi < (Count); yyi++)   \
+            (To)[yyi] = (From)[yyi];            \
+        }                                       \
+      while (YYID (0))
+#  endif
+# endif
+#endif /* !YYCOPY_NEEDED */
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  11
 /* YYLAST -- Last index in YYTABLE.  */
@@ -529,18 +532,18 @@ static const yytype_int8 yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   104,   104,   104,   106,   106,   108,   110,   111,   112,
+       0,   103,   103,   103,   105,   105,   107,   109,   110,   111,
-     113,   114,   115,   119,   123,   123,   123,   123,   123,   123,
+     112,   113,   114,   118,   122,   122,   122,   122,   122,   122,
-     123,   123,   127,   128,   129,   130,   131,   132,   136,   137,
+     122,   122,   126,   127,   128,   129,   130,   131,   135,   136,
-     143,   151,   157,   165,   175,   177,   178,   179,   180,   181,
+     142,   150,   156,   164,   174,   176,   177,   178,   179,   180,
-     182,   185,   193,   199,   209,   215,   221,   224,   226,   237,
+     181,   184,   192,   198,   208,   214,   220,   223,   225,   236,
-     238,   243,   252,   257,   265,   268,   270,   271,   272,   273,
+     237,   242,   251,   256,   264,   267,   269,   270,   271,   272,
-     274,   277,   283,   294,   300,   310,   312,   317,   325,   333,
+     273,   276,   282,   293,   299,   309,   311,   316,   324,   332,
-     336,   338,   339,   340,   345,   352,   359,   364,   372,   375,
+     335,   337,   338,   339,   344,   351,   358,   363,   371,   374,
-     377,   378,   379,   382,   390,   397,   404,   410,   417,   419,
+     376,   377,   378,   381,   389,   396,   403,   409,   416,   418,
-     420,   421,   424,   432,   434,   435,   438,   445,   447,   452,
+     419,   420,   423,   431,   433,   434,   437,   444,   446,   451,
-     453,   456,   457,   458,   462,   463,   466,   467,   470,   471,
+     452,   455,   456,   457,   461,   462,   465,   466,   469,   470,
-     472,   473,   474,   475,   476,   479,   480,   483,   484
+     471,   472,   473,   474,   475,   478,   479,   482,   483
 };
 #endif
@@ -615,8 +618,8 @@ static const yytype_uint8 yyr2[] =
       3,     3,     2,     3,     3,     1,     1,     0,     1
 };
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+   Performed when YYTABLE doesn't specify something else to do.  Zero
   means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
@@ -691,8 +694,7 @@ static const yytype_int16 yypgoto[] =
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
   positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If zero, do what YYDEFACT says.
+   number is the opposite.  If YYTABLE_NINF, syntax error.  */
-   If YYTABLE_NINF, syntax error.  */
 #define YYTABLE_NINF -86
 static const yytype_int16 yytable[] =
 {
@@ -728,6 +730,12 @@ static const yytype_int16 yytable[] =
     184
 };
+#define yypact_value_is_default(yystate) \
+  ((yystate) == (-90))
+#define yytable_value_is_error(yytable_value) \
+  YYID (0)
 static const yytype_int16 yycheck[] =
 {
       1,    67,    68,    10,    93,    94,    76,     3,    76,    14,
@@ -821,7 +829,6 @@ do								\
    {                                                           \
      yychar = (Token);                                         \
      yylval = (Value);                                         \
-      yytoken = YYTRANSLATE (yychar);                           \
      YYPOPSTACK (1);                                           \
      goto yybackup;                                            \
    }                                                           \
@@ -863,19 +870,10 @@ while (YYID (0))
 #endif
-/* YY_LOCATION_PRINT -- Print the location on the stream.
+/* This macro is provided for backward compatibility. */
-   This macro was not mandated originally: define only if we know
-   we won't break user code: when these are the locations we know.  */
 #ifndef YY_LOCATION_PRINT
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-#  define YY_LOCATION_PRINT(File, Loc)                  \
-     fprintf (File, "%d.%d-%d.%d",                      \
-              (Loc).first_line, (Loc).first_column,     \
-              (Loc).last_line,  (Loc).last_column)
-# else
-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
 #endif
@@ -1067,7 +1065,6 @@ int yydebug;
 # define YYMAXDEPTH 10000
 #endif
 #if YYERROR_VERBOSE
@@ -1170,115 +1167,142 @@ yytnamerr (char *yyres, const char *yystr)
 }
 # endif
-/* Copy into YYRESULT an error message about the unexpected token
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
-   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   about the unexpected token YYTOKEN for the state stack whose top is
-   including the terminating null byte.  If YYRESULT is null, do not
+   YYSSP.
-   copy anything; just return the number of bytes that would be
-   copied.  As a special case, return 0 if an ordinary "syntax error"
-   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
-   size calculation.  */
-static YYSIZE_T
-yysyntax_error (char *yyresult, int yystate, int yychar)
-{
-  int yyn = yypact[yystate];
-  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
-    return 0;
+   not large enough to hold the message.  In that case, also set
-  else
+   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
+   required number of bytes is too large to store.  */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+                yytype_int16 *yyssp, int yytoken)
+{
+  YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
+  YYSIZE_T yysize = yysize0;
+  YYSIZE_T yysize1;
+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = 0;
+  /* Arguments of yyformat. */
+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
+  int yycount = 0;
+  /* There are many possibilities here to consider:
+     - Assume YYFAIL is not used.  It's too flawed to consider.  See
+       <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
+       for details.  YYERROR is fine as it does not invoke this
+       function.
+     - If this state is a consistent state with a default action, then
+       the only way this function was invoked is if the default action
+       is an error action.  In that case, don't check for expected
+       tokens because there are none.
+     - The only way there can be no lookahead present (in yychar) is if
+       this state is a consistent state with a default action.  Thus,
+       detecting the absence of a lookahead is sufficient to determine
+       that there is no unexpected or expected token to report.  In that
+       case, just report a simple "syntax error".
+     - Don't assume there isn't a lookahead just because this state is a
+       consistent state with a default action.  There might have been a
+       previous inconsistent state, consistent state with a non-default
+       action, or user semantic action that manipulated yychar.
+     - Of course, the expected token list depends on states to have
+       correct lookahead information, and it depends on the parser not
+       to perform extra reductions after fetching a lookahead from the
+       scanner and before detecting a syntax error.  Thus, state merging
+       (from LALR or IELR) and default reductions corrupt the expected
+       token list.  However, the list is correct for canonical LR with
+       one exception: it will still contain any token that will not be
+       accepted due to an error action in a later state.
+  */
+  if (yytoken != YYEMPTY)
    {
-      int yytype = YYTRANSLATE (yychar);
+      int yyn = yypact[*yyssp];
-      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      yyarg[yycount++] = yytname[yytoken];
-      YYSIZE_T yysize = yysize0;
+      if (!yypact_value_is_default (yyn))
-      YYSIZE_T yysize1;
+        {
-      int yysize_overflow = 0;
+          /* Start YYX at -YYN if negative to avoid negative indexes in
-      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+             YYCHECK.  In other words, skip the first -YYN actions for
-      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+             this state because they are default actions.  */
-      int yyx;
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+          /* Stay within bounds of both yycheck and yytname.  */
-# if 0
+          int yychecklim = YYLAST - yyn + 1;
-      /* This is so xgettext sees the translatable formats that are
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-         constructed on the fly.  */
+          int yyx;
-      YY_("syntax error, unexpected %s");
-      YY_("syntax error, unexpected %s, expecting %s");
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-      YY_("syntax error, unexpected %s, expecting %s or %s");
+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+                && !yytable_value_is_error (yytable[yyx + yyn]))
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+              {
-# endif
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-      char *yyfmt;
+                  {
-      char const *yyf;
+                    yycount = 1;
-      static char const yyunexpected[] = "syntax error, unexpected %s";
+                    yysize = yysize0;
-      static char const yyexpecting[] = ", expecting %s";
+                    break;
-      static char const yyor[] = " or %s";
+                  }
-      char yyformat[sizeof yyunexpected
+                yyarg[yycount++] = yytname[yyx];
-                    + sizeof yyexpecting - 1
+                yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-                    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+                if (! (yysize <= yysize1
-                       * (sizeof yyor - 1))];
+                       && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-      char const *yyprefix = yyexpecting;
+                  return 2;
+                yysize = yysize1;
-      /* Start YYX at -YYN if negative to avoid negative indexes in
+              }
-         YYCHECK.  */
+        }
-      int yyxbegin = yyn < 0 ? -yyn : 0;
+    }
-      /* Stay within bounds of both yycheck and yytname.  */
-      int yychecklim = YYLAST - yyn + 1;
-      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-      int yycount = 1;
-      yyarg[0] = yytname[yytype];
-      yyfmt = yystpcpy (yyformat, yyunexpected);
-      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-        if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-          {
-            if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-              {
-                yycount = 1;
-                yysize = yysize0;
-                yyformat[sizeof yyunexpected - 1] = '\0';
-                break;
-              }
-            yyarg[yycount++] = yytname[yyx];
-            yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-            yysize_overflow |= (yysize1 < yysize);
-            yysize = yysize1;
-            yyfmt = yystpcpy (yyfmt, yyprefix);
-            yyprefix = yyor;
-          }
-      yyf = YY_(yyformat);
+  switch (yycount)
-      yysize1 = yysize + yystrlen (yyf);
+    {
-      yysize_overflow |= (yysize1 < yysize);
+# define YYCASE_(N, S)                      \
-      yysize = yysize1;
+      case N:                               \
+        yyformat = S;                       \
+      break
+      YYCASE_(0, YY_("syntax error"));
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+    }
-      if (yysize_overflow)
+  yysize1 = yysize + yystrlen (yyformat);
-        return YYSIZE_MAXIMUM;
+  if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+    return 2;
+  yysize = yysize1;
-      if (yyresult)
+  if (*yymsg_alloc < yysize)
-        {
+    {
-          /* Avoid sprintf, as that infringes on the user's name space.
+      *yymsg_alloc = 2 * yysize;
-             Don't have undefined behavior even if the translation
+      if (! (yysize <= *yymsg_alloc
-             produced a string with the wrong number of "%s"s.  */
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
-          char *yyp = yyresult;
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-          int yyi = 0;
+      return 1;
-          while ((*yyp = *yyf) != '\0')
-            {
-              if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-                {
-                  yyp += yytnamerr (yyp, yyarg[yyi++]);
-                  yyf += 2;
-                }
-              else
-                {
-                  yyp++;
-                  yyf++;
-                }
-            }
-        }
-      return yysize;
    }
+  /* Avoid sprintf, as that infringes on the user's name space.
+     Don't have undefined behavior even if the translation
+     produced a string with the wrong number of "%s"s.  */
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+        {
+          yyp += yytnamerr (yyp, yyarg[yyi++]);
+          yyformat += 2;
+        }
+      else
+        {
+          yyp++;
+          yyformat++;
+        }
+  }
+  return 0;
 }
 #endif /* YYERROR_VERBOSE */
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
@@ -1341,6 +1365,7 @@ yydestruct (yymsg, yytype, yyvaluep)
    }
 }
 /* Prevent warnings from -Wmissing-prototypes.  */
 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
@@ -1367,10 +1392,9 @@ YYSTYPE yylval;
 int yynerrs;
+/*----------.
-/*-------------------------.
+| yyparse.  |
-| yyparse or yypush_parse.  |
+`----------*/
-`-------------------------*/
 #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \
@@ -1394,8 +1418,6 @@ yyparse ()
 #endif
 #endif
 {
    int yystate;
    /* Number of tokens to shift before error messages enabled.  */
    int yyerrstatus;
@@ -1550,7 +1572,7 @@ yybackup:
  /* First try to decide what to do without reference to lookahead token.  */
  yyn = yypact[yystate];
-  if (yyn == YYPACT_NINF)
+  if (yypact_value_is_default (yyn))
    goto yydefault;
  /* Not known => get a lookahead token if don't already have one.  */
@@ -1581,8 +1603,8 @@ yybackup:
  yyn = yytable[yyn];
  if (yyn <= 0)
    {
-      if (yyn == 0 || yyn == YYTABLE_NINF)
+      if (yytable_value_is_error (yyn))
-        goto yyerrlab;
+        goto yyerrlab;
      yyn = -yyn;
      goto yyreduce;
    }
@@ -1637,34 +1659,34 @@ yyreduce:
    {
        case 10:
-    { zconf_error("unexpected end statement"); ;}
+    { zconf_error("unexpected end statement"); }
    break;
  case 11:
-    { zconf_error("unknown statement \"%s\"", (yyvsp[(2) - (4)].string)); ;}
+    { zconf_error("unknown statement \"%s\"", (yyvsp[(2) - (4)].string)); }
    break;
  case 12:
    {
        zconf_error("unexpected option \"%s\"", kconf_id_strings + (yyvsp[(2) - (4)].id)->name);
-;}
+}
    break;
  case 13:
-    { zconf_error("invalid statement"); ;}
+    { zconf_error("invalid statement"); }
    break;
  case 28:
-    { zconf_error("unknown option \"%s\"", (yyvsp[(1) - (3)].string)); ;}
+    { zconf_error("unknown option \"%s\"", (yyvsp[(1) - (3)].string)); }
    break;
  case 29:
-    { zconf_error("invalid option"); ;}
+    { zconf_error("invalid option"); }
    break;
  case 30:
@@ -1674,7 +1696,7 @@ yyreduce:
        sym->flags |= SYMBOL_OPTIONAL;
        menu_add_entry(sym);
        printd(DEBUG_PARSE, "%s:%d:config %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string));
-;}
+}
    break;
  case 31:
@@ -1682,7 +1704,7 @@ yyreduce:
    {
        menu_end_entry();
        printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno());
-;}
+}
    break;
  case 32:
@@ -1692,7 +1714,7 @@ yyreduce:
        sym->flags |= SYMBOL_OPTIONAL;
        menu_add_entry(sym);
        printd(DEBUG_PARSE, "%s:%d:menuconfig %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string));
-;}
+}
    break;
  case 33:
@@ -1704,7 +1726,7 @@ yyreduce:
                zconfprint("warning: menuconfig statement without prompt");
        menu_end_entry();
        printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno());
-;}
+}
    break;
  case 41:
@@ -1714,7 +1736,7 @@ yyreduce:
        printd(DEBUG_PARSE, "%s:%d:type(%u)\n",
                zconf_curname(), zconf_lineno(),
                (yyvsp[(1) - (3)].id)->stype);
-;}
+}
    break;
  case 42:
@@ -1722,7 +1744,7 @@ yyreduce:
    {
        menu_add_prompt(P_PROMPT, (yyvsp[(2) - (4)].string), (yyvsp[(3) - (4)].expr));
        printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
-;}
+}
    break;
  case 43:
@@ -1734,7 +1756,7 @@ yyreduce:
        printd(DEBUG_PARSE, "%s:%d:default(%u)\n",
                zconf_curname(), zconf_lineno(),
                (yyvsp[(1) - (4)].id)->stype);
-;}
+}
    break;
  case 44:
@@ -1742,7 +1764,7 @@ yyreduce:
    {
        menu_add_symbol(P_SELECT, sym_lookup((yyvsp[(2) - (4)].string), 0), (yyvsp[(3) - (4)].expr));
        printd(DEBUG_PARSE, "%s:%d:select\n", zconf_curname(), zconf_lineno());
-;}
+}
    break;
  case 45:
@@ -1750,7 +1772,7 @@ yyreduce:
    {
        menu_add_expr(P_RANGE, expr_alloc_comp(E_RANGE,(yyvsp[(2) - (5)].symbol), (yyvsp[(3) - (5)].symbol)), (yyvsp[(4) - (5)].expr));
        printd(DEBUG_PARSE, "%s:%d:range\n", zconf_curname(), zconf_lineno());
-;}
+}
    break;
  case 48:
@@ -1762,17 +1784,17 @@ yyreduce:
        else
                zconfprint("warning: ignoring unknown option %s", (yyvsp[(2) - (3)].string));
        free((yyvsp[(2) - (3)].string));
-;}
+}
    break;
  case 49:
-    { (yyval.string) = NULL; ;}
+    { (yyval.string) = NULL; }
    break;
  case 50:
-    { (yyval.string) = (yyvsp[(2) - (2)].string); ;}
+    { (yyval.string) = (yyvsp[(2) - (2)].string); }
    break;
  case 51:
@@ -1783,14 +1805,14 @@ yyreduce:
        menu_add_entry(sym);
        menu_add_expr(P_CHOICE, NULL, NULL);
        printd(DEBUG_PARSE, "%s:%d:choice\n", zconf_curname(), zconf_lineno());
-;}
+}
    break;
  case 52:
    {
        (yyval.menu) = menu_add_menu();
-;}
+}
    break;
  case 53:
@@ -1800,7 +1822,7 @@ yyreduce:
                menu_end_menu();
                printd(DEBUG_PARSE, "%s:%d:endchoice\n", zconf_curname(), zconf_lineno());
        }
-;}
+}
    break;
  case 61:
@@ -1808,7 +1830,7 @@ yyreduce:
    {
        menu_add_prompt(P_PROMPT, (yyvsp[(2) - (4)].string), (yyvsp[(3) - (4)].expr));
        printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
-;}
+}
    break;
  case 62:
@@ -1821,7 +1843,7 @@ yyreduce:
                        (yyvsp[(1) - (3)].id)->stype);
        } else
                YYERROR;
-;}
+}
    break;
  case 63:
@@ -1829,7 +1851,7 @@ yyreduce:
    {
        current_entry->sym->flags |= SYMBOL_OPTIONAL;
        printd(DEBUG_PARSE, "%s:%d:optional\n", zconf_curname(), zconf_lineno());
-;}
+}
    break;
  case 64:
@@ -1841,7 +1863,7 @@ yyreduce:
                        zconf_curname(), zconf_lineno());
        } else
                YYERROR;
-;}
+}
    break;
  case 67:
@@ -1851,7 +1873,7 @@ yyreduce:
        menu_add_entry(NULL);
        menu_add_dep((yyvsp[(2) - (3)].expr));
        (yyval.menu) = menu_add_menu();
-;}
+}
    break;
  case 68:
@@ -1861,14 +1883,14 @@ yyreduce:
                menu_end_menu();
                printd(DEBUG_PARSE, "%s:%d:endif\n", zconf_curname(), zconf_lineno());
        }
-;}
+}
    break;
  case 74:
    {
        menu_add_prompt(P_MENU, (yyvsp[(2) - (3)].string), NULL);
-;}
+}
    break;
  case 75:
@@ -1877,14 +1899,14 @@ yyreduce:
        menu_add_entry(NULL);
        menu_add_prompt(P_MENU, (yyvsp[(2) - (3)].string), NULL);
        printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno());
-;}
+}
    break;
  case 76:
    {
        (yyval.menu) = menu_add_menu();
-;}
+}
    break;
  case 77:
@@ -1894,7 +1916,7 @@ yyreduce:
                menu_end_menu();
                printd(DEBUG_PARSE, "%s:%d:endmenu\n", zconf_curname(), zconf_lineno());
        }
-;}
+}
    break;
  case 83:
@@ -1902,7 +1924,7 @@ yyreduce:
    {
        printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string));
        zconf_nextfile((yyvsp[(2) - (3)].string));
-;}
+}
    break;
  case 84:
@@ -1911,14 +1933,14 @@ yyreduce:
        menu_add_entry(NULL);
        menu_add_prompt(P_COMMENT, (yyvsp[(2) - (3)].string), NULL);
        printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno());
-;}
+}
    break;
  case 85:
    {
        menu_end_entry();
-;}
+}
    break;
  case 86:
@@ -1926,14 +1948,14 @@ yyreduce:
    {
        printd(DEBUG_PARSE, "%s:%d:help\n", zconf_curname(), zconf_lineno());
        zconf_starthelp();
-;}
+}
    break;
  case 87:
    {
        current_entry->help = (yyvsp[(2) - (2)].string);
-;}
+}
    break;
  case 92:
@@ -1941,102 +1963,113 @@ yyreduce:
    {
        menu_add_dep((yyvsp[(3) - (4)].expr));
        printd(DEBUG_PARSE, "%s:%d:depends on\n", zconf_curname(), zconf_lineno());
-;}
+}
    break;
  case 96:
    {
        menu_add_visibility((yyvsp[(2) - (2)].expr));
-;}
+}
    break;
  case 98:
    {
        menu_add_prompt(P_PROMPT, (yyvsp[(1) - (2)].string), (yyvsp[(2) - (2)].expr));
-;}
+}
    break;
  case 101:
-    { (yyval.id) = (yyvsp[(1) - (2)].id); ;}
+    { (yyval.id) = (yyvsp[(1) - (2)].id); }
    break;
  case 102:
-    { (yyval.id) = (yyvsp[(1) - (2)].id); ;}
+    { (yyval.id) = (yyvsp[(1) - (2)].id); }
    break;
  case 103:
-    { (yyval.id) = (yyvsp[(1) - (2)].id); ;}
+    { (yyval.id) = (yyvsp[(1) - (2)].id); }
    break;
  case 106:
-    { (yyval.expr) = NULL; ;}
+    { (yyval.expr) = NULL; }
    break;
  case 107:
-    { (yyval.expr) = (yyvsp[(2) - (2)].expr); ;}
+    { (yyval.expr) = (yyvsp[(2) - (2)].expr); }
    break;
  case 108:
-    { (yyval.expr) = expr_alloc_symbol((yyvsp[(1) - (1)].symbol)); ;}
+    { (yyval.expr) = expr_alloc_symbol((yyvsp[(1) - (1)].symbol)); }
    break;
  case 109:
-    { (yyval.expr) = expr_alloc_comp(E_EQUAL, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); ;}
+    { (yyval.expr) = expr_alloc_comp(E_EQUAL, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); }
    break;
  case 110:
-    { (yyval.expr) = expr_alloc_comp(E_UNEQUAL, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); ;}
+    { (yyval.expr) = expr_alloc_comp(E_UNEQUAL, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); }
    break;
  case 111:
-    { (yyval.expr) = (yyvsp[(2) - (3)].expr); ;}
+    { (yyval.expr) = (yyvsp[(2) - (3)].expr); }
    break;
  case 112:
-    { (yyval.expr) = expr_alloc_one(E_NOT, (yyvsp[(2) - (2)].expr)); ;}
+    { (yyval.expr) = expr_alloc_one(E_NOT, (yyvsp[(2) - (2)].expr)); }
    break;
  case 113:
-    { (yyval.expr) = expr_alloc_two(E_OR, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); ;}
+    { (yyval.expr) = expr_alloc_two(E_OR, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); }
    break;
  case 114:
-    { (yyval.expr) = expr_alloc_two(E_AND, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); ;}
+    { (yyval.expr) = expr_alloc_two(E_AND, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); }
    break;
  case 115:
-    { (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), 0); free((yyvsp[(1) - (1)].string)); ;}
+    { (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), 0); free((yyvsp[(1) - (1)].string)); }
    break;
  case 116:
-    { (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), SYMBOL_CONST); free((yyvsp[(1) - (1)].string)); ;}
+    { (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), SYMBOL_CONST); free((yyvsp[(1) - (1)].string)); }
    break;
  case 117:
-    { (yyval.string) = NULL; ;}
+    { (yyval.string) = NULL; }
    break;
      default: break;
    }
+  /* User semantic actions sometimes alter yychar, and that requires
+     that yytoken be updated with the new translation.  We take the
+     approach of translating immediately before every use of yytoken.
+     One alternative is translating here after every semantic action,
+     but that translation would be missed if the semantic action invokes
+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
+     incorrect destructor might then be invoked immediately.  In the
+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
+     to an incorrect destructor call or verbose syntax error message
+     before the lookahead is translated.  */
  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
  YYPOPSTACK (yylen);
@@ -2064,6 +2097,10 @@ yyreduce:
 | yyerrlab -- here on detecting error |
 `------------------------------------*/
 yyerrlab:
+  /* Make sure we have latest lookahead translation.  See comments at
+     user semantic actions for why this is necessary.  */
+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
  /* If not already recovering from an error, report this error.  */
  if (!yyerrstatus)
    {
@@ -2071,37 +2108,36 @@ yyerrlab:
 #if ! YYERROR_VERBOSE
      yyerror (YY_("syntax error"));
 #else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+                                        yyssp, yytoken)
      {
-        YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+        char const *yymsgp = YY_("syntax error");
-        if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+        int yysyntax_error_status;
-          {
+        yysyntax_error_status = YYSYNTAX_ERROR;
-            YYSIZE_T yyalloc = 2 * yysize;
+        if (yysyntax_error_status == 0)
-            if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+          yymsgp = yymsg;
-              yyalloc = YYSTACK_ALLOC_MAXIMUM;
+        else if (yysyntax_error_status == 1)
-            if (yymsg != yymsgbuf)
+          {
-              YYSTACK_FREE (yymsg);
+            if (yymsg != yymsgbuf)
-            yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+              YYSTACK_FREE (yymsg);
-            if (yymsg)
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
-              yymsg_alloc = yyalloc;
+            if (!yymsg)
-            else
+              {
-              {
+                yymsg = yymsgbuf;
-                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
-                yymsg_alloc = sizeof yymsgbuf;
+                yysyntax_error_status = 2;
-              }
+              }
-          }
+            else
+              {
-        if (0 < yysize && yysize <= yymsg_alloc)
+                yysyntax_error_status = YYSYNTAX_ERROR;
-          {
+                yymsgp = yymsg;
-            (void) yysyntax_error (yymsg, yystate, yychar);
+              }
-            yyerror (yymsg);
+          }
-          }
+        yyerror (yymsgp);
-        else
+        if (yysyntax_error_status == 2)
-          {
+          goto yyexhaustedlab;
-            yyerror (YY_("syntax error"));
-            if (yysize != 0)
-              goto yyexhaustedlab;
-          }
      }
+# undef YYSYNTAX_ERROR
 #endif
    }
@@ -2160,7 +2196,7 @@ yyerrlab1:
  for (;;)
    {
      yyn = yypact[yystate];
-      if (yyn != YYPACT_NINF)
+      if (!yypact_value_is_default (yyn))
        {
          yyn += YYTERROR;
          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
@@ -2219,8 +2255,13 @@ yyexhaustedlab:
 yyreturn:
  if (yychar != YYEMPTY)
-     yydestruct ("Cleanup: discarding lookahead",
+    {
-                 yytoken, &yylval);
+      /* Make sure we have latest lookahead translation.  See comments at
+         user semantic actions for why this is necessary.  */
+      yytoken = YYTRANSLATE (yychar);
+      yydestruct ("Cleanup: discarding lookahead",
+                  yytoken, &yylval);
+    }
  /* Do not reclaim the symbols of the rule which action triggered
     this YYABORT or YYACCEPT.  */
  YYPOPSTACK (yylen);
@@ -2256,9 +2297,6 @@ void conf_parse(const char *name)
        sym_init();
        _menu_init();
-        modules_sym = sym_lookup(NULL, 0);
-        modules_sym->type = S_BOOLEAN;
-        modules_sym->flags |= SYMBOL_AUTO;
        rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL);
        if (getenv("ZCONF_DEBUG"))
@@ -2266,12 +2304,8 @@ void conf_parse(const char *name)
        zconfparse();
        if (zconfnerrs)
                exit(1);
-        if (!modules_sym->prop) {
+        if (!modules_sym)
-                struct property *prop;
+                modules_sym = sym_find( "n" );
-                prop = prop_alloc(P_DEFAULT, modules_sym);
-                prop->expr = expr_alloc_symbol(sym_lookup("MODULES", 0));
-        }
        rootmenu.prompt->text = _(rootmenu.prompt->text);
        rootmenu.prompt->text = sym_expand_string_value(rootmenu.prompt->text);
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y
index 864da07ba4aa..0653886fac48 100644
--- a/scripts/kconfig/zconf.y
+++ b/scripts/kconfig/zconf.y
@@ -493,9 +493,6 @@ void conf_parse(const char *name)
        sym_init();
        _menu_init();
-        modules_sym = sym_lookup(NULL, 0);
-        modules_sym->type = S_BOOLEAN;
-        modules_sym->flags |= SYMBOL_AUTO;
        rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL);
        if (getenv("ZCONF_DEBUG"))
@@ -503,12 +500,8 @@ void conf_parse(const char *name)
        zconfparse();
        if (zconfnerrs)
                exit(1);
-        if (!modules_sym->prop) {
+        if (!modules_sym)
-                struct property *prop;
+                modules_sym = sym_find( "n" );
-                prop = prop_alloc(P_DEFAULT, modules_sym);
-                prop->expr = expr_alloc_symbol(sym_lookup("MODULES", 0));
-        }
        rootmenu.prompt->text = _(rootmenu.prompt->text);
        rootmenu.prompt->text = sym_expand_string_value(rootmenu.prompt->text);
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 4305b2f2ec5e..da058da413e7 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -257,6 +257,7 @@ my $man_date = ('January', 'February', 'March', 'April', 'May', 'June',
                'July', 'August', 'September', 'October',
                'November', 'December')[(localtime)[4]] .
  " " . ((localtime)[5]+1900);
+my $show_not_found = 0;
 # Essentially these are globals.
 # They probably want to be tidied up, made more localised or something.
@@ -369,6 +370,8 @@ while ($ARGV[0] =~ m/^-(.*)/) {
        usage();
    } elsif ($cmd eq '-no-doc-sections') {
            $no_doc_sections = 1;
+    } elsif ($cmd eq '-show-not-found') {
+        $show_not_found = 1;
    }
 }
@@ -2125,8 +2128,7 @@ sub dump_function($$) {
        create_parameterlist($args, ',', $file);
    } else {
-        print STDERR "Error(${file}:$.): cannot understand prototype: '$prototype'\n";
+        print STDERR "Warning(${file}:$.): cannot understand function prototype: '$prototype'\n";
-        ++$errors;
        return;
    }
@@ -2536,6 +2538,9 @@ sub process_file($) {
    }
    if ($initial_section_counter == $section_counter) {
        print STDERR "Warning(${file}): no structured comments found\n";
+        if (($function_only == 1) && ($show_not_found == 1)) {
+            print STDERR "    Was looking for '$_'.\n" for keys %function_table;
+        }
        if ($output_mode eq "xml") {
            # The template wants at least one RefEntry here; make one.
            print "<refentry>\n";
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index 014994936b1c..32b10f53d0b4 100644
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -82,6 +82,8 @@ kallsyms()
                kallsymopt="${kallsymopt} --all-symbols"
        fi
+        kallsymopt="${kallsymopt} --page-offset=$CONFIG_PAGE_OFFSET"
        local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL}               \
                      ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}"
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 8247979e8f64..17855761e6b7 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -17,6 +17,7 @@
 #include <string.h>
 #include <limits.h>
 #include <stdbool.h>
+#include <errno.h>
 #include "modpost.h"
 #include "../../include/generated/autoconf.h"
 #include "../../include/linux/license.h"
@@ -37,6 +38,8 @@ static int warn_unresolved = 0;
 /* How a symbol is exported */
 static int sec_mismatch_count = 0;
 static int sec_mismatch_verbose = 1;
+/* ignore missing files */
+static int ignore_missing_files;
 enum export {
        export_plain,      export_unused,     export_gpl,
@@ -161,7 +164,7 @@ struct symbol {
        unsigned int vmlinux:1;    /* 1 if symbol is defined in vmlinux */
        unsigned int kernel:1;     /* 1 if symbol is from kernel
                                    *  (only for external modules) **/
-        unsigned int preloaded:1;  /* 1 if symbol from Module.symvers */
+        unsigned int preloaded:1;  /* 1 if symbol from Module.symvers, or crc */
        enum export  export;       /* Type of export */
        char name[0];
 };
@@ -329,8 +332,11 @@ static void sym_update_crc(const char *name, struct module *mod,
 {
        struct symbol *s = find_symbol(name);
-        if (!s)
+        if (!s) {
                s = new_symbol(name, mod, export);
+                /* Don't complain when we find it later. */
+                s->preloaded = 1;
+        }
        s->crc = crc;
        s->crc_valid = 1;
 }
@@ -407,6 +413,11 @@ static int parse_elf(struct elf_info *info, const char *filename)
        hdr = grab_file(filename, &info->size);
        if (!hdr) {
+                if (ignore_missing_files) {
+                        fprintf(stderr, "%s: %s (ignored)\n", filename,
+                                strerror(errno));
+                        return 0;
+                }
                perror(filename);
                exit(1);
        }
@@ -599,18 +610,17 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
        else
                export = export_from_sec(info, get_secindex(info, sym));
+        /* CRC'd symbol */
+        if (strncmp(symname, CRC_PFX, strlen(CRC_PFX)) == 0) {
+                crc = (unsigned int) sym->st_value;
+                sym_update_crc(symname + strlen(CRC_PFX), mod, crc,
+                                export);
+        }
        switch (sym->st_shndx) {
        case SHN_COMMON:
                warn("\"%s\" [%s] is COMMON symbol\n", symname, mod->name);
                break;
-        case SHN_ABS:
-                /* CRC'd symbol */
-                if (strncmp(symname, CRC_PFX, strlen(CRC_PFX)) == 0) {
-                        crc = (unsigned int) sym->st_value;
-                        sym_update_crc(symname + strlen(CRC_PFX), mod, crc,
-                                        export);
-                }
-                break;
        case SHN_UNDEF:
                /* undefined symbol */
                if (ELF_ST_BIND(sym->st_info) != STB_GLOBAL &&
@@ -1853,7 +1863,7 @@ static void add_header(struct buffer *b, struct module *mod)
        buf_printf(b, "\n");
        buf_printf(b, "MODULE_INFO(vermagic, VERMAGIC_STRING);\n");
        buf_printf(b, "\n");
-        buf_printf(b, "struct module __this_module\n");
+        buf_printf(b, "__visible struct module __this_module\n");
        buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n");
        buf_printf(b, "\t.name = KBUILD_MODNAME,\n");
        if (mod->has_init)
@@ -2119,7 +2129,7 @@ int main(int argc, char **argv)
        struct ext_sym_list *extsym_iter;
        struct ext_sym_list *extsym_start = NULL;
-        while ((opt = getopt(argc, argv, "i:I:e:msST:o:awM:K:")) != -1) {
+        while ((opt = getopt(argc, argv, "i:I:e:mnsST:o:awM:K:")) != -1) {
                switch (opt) {
                case 'i':
                        kernel_read = optarg;
@@ -2139,6 +2149,9 @@ int main(int argc, char **argv)
                case 'm':
                        modversions = 1;
                        break;
+                case 'n':
+                        ignore_missing_files = 1;
+                        break;
                case 'o':
                        dump_write = optarg;
                        break;
diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c
index 9dfcd6d988da..deb2994b04c4 100644
--- a/scripts/mod/sumversion.c
+++ b/scripts/mod/sumversion.c
@@ -416,7 +416,7 @@ void get_src_version(const char *modname, char sum[], unsigned sumlen)
                basename = strrchr(modname, '/') + 1;
        else
                basename = modname;
-        sprintf(filelist, "%s/%.*s.mod", modverdir,
+        snprintf(filelist, sizeof(filelist), "%s/%.*s.mod", modverdir,
                (int) strlen(basename) - 2, basename);
        file = grab_file(filelist, &len);
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index a4f31c900fa6..c5d473393816 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -115,7 +115,9 @@ git --git-dir=$(srctree)/.git archive --prefix=$(perf-tar)/         \
        -o $(perf-tar).tar;                                         \
 mkdir -p $(perf-tar);                                               \
 git --git-dir=$(srctree)/.git rev-parse HEAD > $(perf-tar)/HEAD;    \
-tar rf $(perf-tar).tar $(perf-tar)/HEAD;                            \
+(cd $(srctree)/tools/perf;                                          \
+util/PERF-VERSION-GEN ../../$(perf-tar)/ 2>/dev/null);              \
+tar rf $(perf-tar).tar $(perf-tar)/HEAD $(perf-tar)/PERF-VERSION-FILE; \
 rm -r $(perf-tar);                                                  \
 $(if $(findstring tar-src,$@),,                                     \
 $(if $(findstring bz2,$@),bzip2,                                    \
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index acb86507828a..90e521fde35f 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -41,9 +41,9 @@ create_package() {
        parisc*)
                debarch=hppa ;;
        mips*)
-                debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y .config && echo el) ;;
+                debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y $KCONFIG_CONFIG && echo el) ;;
        arm*)
-                debarch=arm$(grep -q CONFIG_AEABI=y .config && echo el) ;;
+                debarch=arm$(grep -q CONFIG_AEABI=y $KCONFIG_CONFIG && echo el) ;;
        *)
                echo "" >&2
                echo "** ** **  WARNING  ** ** **" >&2
@@ -78,17 +78,35 @@ tmpdir="$objtree/debian/tmp"
 fwdir="$objtree/debian/fwtmp"
 kernel_headers_dir="$objtree/debian/hdrtmp"
 libc_headers_dir="$objtree/debian/headertmp"
+dbg_dir="$objtree/debian/dbgtmp"
 packagename=linux-image-$version
-fwpackagename=linux-firmware-image
+fwpackagename=linux-firmware-image-$version
 kernel_headers_packagename=linux-headers-$version
 libc_headers_packagename=linux-libc-dev
+dbg_packagename=$packagename-dbg
 if [ "$ARCH" = "um" ] ; then
        packagename=user-mode-linux-$version
 fi
+# Not all arches have the same installed path in debian
+# XXX: have each arch Makefile export a variable of the canonical image install
+# path instead
+case $ARCH in
+um)
+        installed_image_path="usr/bin/linux-$version"
+        ;;
+parisc|mips|powerpc)
+        installed_image_path="boot/vmlinux-$version"
+        ;;
+*)
+        installed_image_path="boot/vmlinuz-$version"
+esac
+BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)"
 # Setup the directory structure
-rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir"
+rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir"
 mkdir -m 755 -p "$tmpdir/DEBIAN"
 mkdir -p  "$tmpdir/lib" "$tmpdir/boot" "$tmpdir/usr/share/doc/$packagename"
 mkdir -m 755 -p "$fwdir/DEBIAN"
@@ -101,26 +119,29 @@ mkdir -p "$kernel_headers_dir/lib/modules/$version/"
 if [ "$ARCH" = "um" ] ; then
        mkdir -p "$tmpdir/usr/lib/uml/modules/$version" "$tmpdir/usr/bin"
 fi
+if [ -n "$BUILD_DEBUG" ] ; then
+        mkdir -p "$dbg_dir/usr/share/doc/$dbg_packagename"
+        mkdir -m 755 -p "$dbg_dir/DEBIAN"
+fi
 # Build and install the kernel
 if [ "$ARCH" = "um" ] ; then
        $MAKE linux
        cp System.map "$tmpdir/usr/lib/uml/modules/$version/System.map"
-        cp .config "$tmpdir/usr/share/doc/$packagename/config"
+        cp $KCONFIG_CONFIG "$tmpdir/usr/share/doc/$packagename/config"
        gzip "$tmpdir/usr/share/doc/$packagename/config"
-        cp $KBUILD_IMAGE "$tmpdir/usr/bin/linux-$version"
 else 
        cp System.map "$tmpdir/boot/System.map-$version"
-        cp .config "$tmpdir/boot/config-$version"
+        cp $KCONFIG_CONFIG "$tmpdir/boot/config-$version"
-        # Not all arches include the boot path in KBUILD_IMAGE
+fi
-        if [ -e $KBUILD_IMAGE ]; then
+# Not all arches include the boot path in KBUILD_IMAGE
-                cp $KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version"
+if [ -e $KBUILD_IMAGE ]; then
-        else
+        cp $KBUILD_IMAGE "$tmpdir/$installed_image_path"
-                cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version"
+else
-        fi
+        cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/$installed_image_path"
 fi
-if grep -q '^CONFIG_MODULES=y' .config ; then
+if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
        INSTALL_MOD_PATH="$tmpdir" $MAKE KBUILD_SRC= modules_install
        rm -f "$tmpdir/lib/modules/$version/build"
        rm -f "$tmpdir/lib/modules/$version/source"
@@ -128,6 +149,20 @@ if grep -q '^CONFIG_MODULES=y' .config ; then
                mv "$tmpdir/lib/modules/$version"/* "$tmpdir/usr/lib/uml/modules/$version/"
                rmdir "$tmpdir/lib/modules/$version"
        fi
+        if [ -n "$BUILD_DEBUG" ] ; then
+                (
+                        cd $tmpdir
+                        for module in $(find lib/modules/ -name *.ko); do
+                                mkdir -p $(dirname $dbg_dir/usr/lib/debug/$module)
+                                # only keep debug symbols in the debug file
+                                objcopy --only-keep-debug $module $dbg_dir/usr/lib/debug/$module
+                                # strip original module from debug symbols
+                                objcopy --strip-debug $module
+                                # then add a link to those
+                                objcopy --add-gnu-debuglink=$dbg_dir/usr/lib/debug/$module $module
+                        done
+                )
+        fi
 fi
 if [ "$ARCH" != "um" ]; then
@@ -149,7 +184,7 @@ set -e
 # Pass maintainer script parameters to hook scripts
 export DEB_MAINT_PARAMS="\$*"
-test -d $debhookdir/$script.d && run-parts --arg="$version" $debhookdir/$script.d
+test -d $debhookdir/$script.d && run-parts --arg="$version" --arg="/$installed_image_path" $debhookdir/$script.d
 exit 0
 EOF
        chmod 755 "$tmpdir/DEBIAN/$script"
@@ -245,11 +280,12 @@ fi
 # Build header package
 (cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")
 (cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")
-(cd $objtree; find arch/$SRCARCH/include .config Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
+(cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
 destdir=$kernel_headers_dir/usr/src/linux-headers-$version
 mkdir -p "$destdir"
 (cd $srctree; tar -c -f - -T "$objtree/debian/hdrsrcfiles") | (cd $destdir; tar -xf -)
 (cd $objtree; tar -c -f - -T "$objtree/debian/hdrobjfiles") | (cd $destdir; tar -xf -)
+(cd $objtree; cp $KCONFIG_CONFIG $destdir/.config) # copy .config manually to be where it's expected to be
 ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build"
 rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
 arch=$(dpkg --print-architecture)
@@ -299,4 +335,30 @@ fi
 create_package "$packagename" "$tmpdir"
+if [ -n "$BUILD_DEBUG" ] ; then
+        # Build debug package
+        # Different tools want the image in different locations
+        # perf
+        mkdir -p $dbg_dir/usr/lib/debug/lib/modules/$version/
+        cp vmlinux $dbg_dir/usr/lib/debug/lib/modules/$version/
+        # systemtap
+        mkdir -p $dbg_dir/usr/lib/debug/boot/
+        ln -s ../lib/modules/$version/vmlinux $dbg_dir/usr/lib/debug/boot/vmlinux-$version
+        # kdump-tools
+        ln -s lib/modules/$version/vmlinux $dbg_dir/usr/lib/debug/vmlinux-$version
+        cat <<EOF >> debian/control
+Package: $dbg_packagename
+Section: debug
+Provides: linux-debug, linux-debug-$version
+Architecture: any
+Description: Linux kernel debugging symbols for $version
+ This package will come in handy if you need to debug the kernel. It provides
+ all the necessary debug symbols for the kernel and its modules.
+EOF
+        create_package "$dbg_packagename" "$dbg_dir"
+fi
 exit 0
diff --git a/scripts/package/buildtar b/scripts/package/buildtar
index cdd9bb909bcd..aa22f9447ddc 100644
--- a/scripts/package/buildtar
+++ b/scripts/package/buildtar
@@ -87,6 +87,27 @@ case "${ARCH}" in
                [ -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"
                ;;
+        mips)
+                if [ -f "${objtree}/arch/mips/boot/compressed/vmlinux.bin" ]; then
+                        cp -v -- "${objtree}/arch/mips/boot/compressed/vmlinux.bin" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
+                elif [ -f "${objtree}/arch/mips/boot/compressed/vmlinux.ecoff" ]; then
+                        cp -v -- "${objtree}/arch/mips/boot/compressed/vmlinux.ecoff" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
+                elif [ -f "${objtree}/arch/mips/boot/compressed/vmlinux.srec" ]; then
+                        cp -v -- "${objtree}/arch/mips/boot/compressed/vmlinux.srec" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
+                elif [ -f "${objtree}/vmlinux.32" ]; then
+                        cp -v -- "${objtree}/vmlinux.32" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"
+                elif [ -f "${objtree}/vmlinux.64" ]; then
+                        cp -v -- "${objtree}/vmlinux.64" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"
+                elif [ -f "${objtree}/arch/mips/boot/vmlinux.bin" ]; then
+                        cp -v -- "${objtree}/arch/mips/boot/vmlinux.bin" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"
+                elif [ -f "${objtree}/arch/mips/boot/vmlinux.ecoff" ]; then
+                        cp -v -- "${objtree}/arch/mips/boot/vmlinux.ecoff" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"
+                elif [ -f "${objtree}/arch/mips/boot/vmlinux.srec" ]; then
+                        cp -v -- "${objtree}/arch/mips/boot/vmlinux.srec" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"
+                elif [ -f "${objtree}/vmlinux" ]; then
+                        cp -v -- "${objtree}/vmlinux" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"
+                fi
+                ;;
        *)
                [ -f "${KBUILD_IMAGE}" ] && cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinux-kbuild-${KERNELRELEASE}"
                echo "" >&2
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index fdd3fbf4d4a4..13957602f7ca 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
-#       Output a simple RPM spec file that uses no fancy features requiring
+#       Output a simple RPM spec file.
-#       RPM v4. This is intended to work with any RPM distro.
+#       This version assumes a minimum of RPM 4.0.3.
 #
 #       The only gothic bit here is redefining install_post to avoid
 #       stripping the symbols from files in the kernel which we want
@@ -59,6 +59,14 @@ echo "header files define structures and constants that are needed for"
 echo "building most standard programs and are also needed for rebuilding the"
 echo "glibc package."
 echo ""
+echo "%package devel"
+echo "Summary: Development package for building kernel modules to match the $__KERNELRELEASE kernel"
+echo "Group: System Environment/Kernel"
+echo "AutoReqProv: no"
+echo "%description -n kernel-devel"
+echo "This package provides kernel headers and makefiles sufficient to build modules"
+echo "against the $__KERNELRELEASE kernel package."
+echo ""
 if ! $PREBUILT; then
 echo "%prep"
@@ -77,13 +85,14 @@ echo "%install"
 echo 'KBUILD_IMAGE=$(make image_name)'
 echo "%ifarch ia64"
 echo 'mkdir -p $RPM_BUILD_ROOT/boot/efi $RPM_BUILD_ROOT/lib/modules'
-echo 'mkdir -p $RPM_BUILD_ROOT/lib/firmware'
 echo "%else"
 echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM_BUILD_ROOT/lib/modules'
-echo 'mkdir -p $RPM_BUILD_ROOT/lib/firmware'
 echo "%endif"
+echo 'mkdir -p $RPM_BUILD_ROOT'"/lib/firmware/$KERNELRELEASE"
-echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{?_smp_mflags} KBUILD_SRC= modules_install'
+echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{?_smp_mflags} KBUILD_SRC= mod-fw= modules_install'
+echo 'INSTALL_FW_PATH=$RPM_BUILD_ROOT'"/lib/firmware/$KERNELRELEASE"
+echo 'make INSTALL_FW_PATH=$INSTALL_FW_PATH' firmware_install
 echo "%ifarch ia64"
 echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/efi/vmlinuz-$KERNELRELEASE"
 echo 'ln -s '"efi/vmlinuz-$KERNELRELEASE" '$RPM_BUILD_ROOT'"/boot/"
@@ -108,18 +117,43 @@ echo 'mv vmlinux.bz2 $RPM_BUILD_ROOT'"/boot/vmlinux-$KERNELRELEASE.bz2"
 echo 'mv vmlinux.orig vmlinux'
 echo "%endif"
+echo 'rm -f $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE/{build,source}"
+echo "mkdir -p "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE"
+echo "EXCLUDES=\"$RCS_TAR_IGNORE --exclude .tmp_versions --exclude=*vmlinux* --exclude=*.o --exclude=*.ko --exclude=*.cmd --exclude=Documentation --exclude=firmware --exclude .config.old --exclude .missing-syscalls.d\""
+echo "tar "'$EXCLUDES'" -cf- . | (cd "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE;tar xvf -)"
+echo 'cd $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE"
+echo "ln -sf /usr/src/kernels/$KERNELRELEASE build"
+echo "ln -sf /usr/src/kernels/$KERNELRELEASE source"
 echo ""
 echo "%clean"
 echo 'rm -rf $RPM_BUILD_ROOT'
 echo ""
+echo "%post"
+echo "if [ -x /sbin/installkernel -a -r /boot/vmlinuz-$KERNELRELEASE -a -r /boot/System.map-$KERNELRELEASE ]; then"
+echo "cp /boot/vmlinuz-$KERNELRELEASE /boot/vmlinuz-$KERNELRELEASE-rpm"
+echo "cp /boot/System.map-$KERNELRELEASE /boot/System.map-$KERNELRELEASE-rpm"
+echo "rm -f /boot/vmlinuz-$KERNELRELEASE /boot/System.map-$KERNELRELEASE"
+echo "/sbin/installkernel $KERNELRELEASE /boot/vmlinuz-$KERNELRELEASE-rpm /boot/System.map-$KERNELRELEASE-rpm"
+echo "rm -f /boot/vmlinuz-$KERNELRELEASE-rpm /boot/System.map-$KERNELRELEASE-rpm"
+echo "fi"
+echo ""
 echo "%files"
 echo '%defattr (-, root, root)'
 echo "%dir /lib/modules"
 echo "/lib/modules/$KERNELRELEASE"
-echo "/lib/firmware"
+echo "%exclude /lib/modules/$KERNELRELEASE/build"
+echo "%exclude /lib/modules/$KERNELRELEASE/source"
+echo "/lib/firmware/$KERNELRELEASE"
 echo "/boot/*"
 echo ""
 echo "%files headers"
 echo '%defattr (-, root, root)'
 echo "/usr/include"
 echo ""
+echo "%files devel"
+echo '%defattr (-, root, root)'
+echo "/usr/src/kernels/$KERNELRELEASE"
+echo "/lib/modules/$KERNELRELEASE/build"
+echo "/lib/modules/$KERNELRELEASE/source"
+echo ""
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index a674fd5507c1..d0da66396f62 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -214,13 +214,13 @@ $local_regex = "^[0-9a-fA-F]+\\s+t\\s+(\\S+)";
 $weak_regex = "^[0-9a-fA-F]+\\s+([wW])\\s+(\\S+)";
 $section_regex = "Disassembly of section\\s+(\\S+):";
 $function_regex = "^([0-9a-fA-F]+)\\s+<(.*?)>:";
-$mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\smcount\$";
+$mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s(mcount|__fentry__)\$";
 $section_type = '@progbits';
 $mcount_adjust = 0;
 $type = ".long";
 if ($arch eq "x86_64") {
-    $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\smcount([+-]0x[0-9a-zA-Z]+)?\$";
+    $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s(mcount|__fentry__)([+-]0x[0-9a-zA-Z]+)?\$";
    $type = ".quad";
    $alignment = 8;
    $mcount_adjust = -1;
diff --git a/scripts/show_delta b/scripts/show_delta
index 17df3051747a..e25732b5d701 100755
--- a/scripts/show_delta
+++ b/scripts/show_delta
@@ -13,7 +13,7 @@ import sys
 import string
 def usage():
-        print """usage: show_delta [<options>] <filename>
+        print ("""usage: show_delta [<options>] <filename>
 This program parses the output from a set of printk message lines which
 have time data prefixed because the CONFIG_PRINTK_TIME option is set, or
@@ -35,7 +35,7 @@ ex: $ dmesg >timefile
 will show times relative to the line in the kernel output
 starting with "NET4".
-"""
+""")
        sys.exit(1)
 # returns a tuple containing the seconds and text for each message line
@@ -94,11 +94,11 @@ def main():
        try:
                lines = open(filein,"r").readlines()
        except:
-                print "Problem opening file: %s" % filein
+                print ("Problem opening file: %s" % filein)
                sys.exit(1)
        if base_str:
-                print 'base= "%s"' % base_str
+                print ('base= "%s"' % base_str)
                # assume a numeric base.  If that fails, try searching
                # for a matching line.
                try:
@@ -117,13 +117,13 @@ def main():
                                        # stop at first match
                                        break
                        if not found:
-                                print 'Couldn\'t find line matching base pattern "%s"' % base_str
+                                print ('Couldn\'t find line matching base pattern "%s"' % base_str)
                                sys.exit(1)
        else:
                base_time = 0.0
        for line in lines:
-                print convert_line(line, base_time),
+                print (convert_line(line, base_time),)
 main()
diff --git a/scripts/sortextable.c b/scripts/sortextable.c
index f9ce1160419b..5f7a8b663cb9 100644
--- a/scripts/sortextable.c
+++ b/scripts/sortextable.c
@@ -64,14 +64,6 @@ fail_file(void)
        longjmp(jmpenv, SJ_FAIL);
 }
-static void __attribute__((noreturn))
-succeed_file(void)
-{
-        cleanup();
-        longjmp(jmpenv, SJ_SUCCEED);
-}
 /*
 * Get the whole file as a programming convenience in order to avoid
 * malloc+lseek+read+free of many pieces.  If successful, then mmap
@@ -160,6 +152,30 @@ static void (*w2)(uint16_t, uint16_t *);
 typedef void (*table_sort_t)(char *, int);
+/*
+ * Move reserved section indices SHN_LORESERVE..SHN_HIRESERVE out of
+ * the way to -256..-1, to avoid conflicting with real section
+ * indices.
+ */
+#define SPECIAL(i) ((i) - (SHN_HIRESERVE + 1))
+static inline int is_shndx_special(unsigned int i)
+{
+        return i != SHN_XINDEX && i >= SHN_LORESERVE && i <= SHN_HIRESERVE;
+}
+/* Accessor for sym->st_shndx, hides ugliness of "64k sections" */
+static inline unsigned int get_secindex(unsigned int shndx,
+                                        unsigned int sym_offs,
+                                        const Elf32_Word *symtab_shndx_start)
+{
+        if (is_shndx_special(shndx))
+                return SPECIAL(shndx);
+        if (shndx != SHN_XINDEX)
+                return shndx;
+        return r(&symtab_shndx_start[sym_offs]);
+}
 /* 32 bit and 64 bit are very similar */
 #include "sortextable.h"
 #define SORTEXTABLE_64
diff --git a/scripts/sortextable.h b/scripts/sortextable.h
index f5eb43d42926..8fac3fd697a6 100644
--- a/scripts/sortextable.h
+++ b/scripts/sortextable.h
@@ -98,6 +98,8 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort)
        Elf_Shdr *symtab_sec = NULL;
        Elf_Shdr *extab_sec = NULL;
        Elf_Sym *sym;
+        const Elf_Sym *symtab;
+        Elf32_Word *symtab_shndx_start = NULL;
        Elf_Sym *sort_needed_sym;
        Elf_Shdr *sort_needed_sec;
        Elf_Rel *relocs = NULL;
@@ -109,11 +111,22 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort)
        int extab_index = 0;
        int i;
        int idx;
+        unsigned int num_sections;
+        unsigned int secindex_strings;
        shdr = (Elf_Shdr *)((char *)ehdr + _r(&ehdr->e_shoff));
-        shstrtab_sec = shdr + r2(&ehdr->e_shstrndx);
+        num_sections = r2(&ehdr->e_shnum);
+        if (num_sections == SHN_UNDEF)
+                num_sections = _r(&shdr[0].sh_size);
+        secindex_strings = r2(&ehdr->e_shstrndx);
+        if (secindex_strings == SHN_XINDEX)
+                secindex_strings = r(&shdr[0].sh_link);
+        shstrtab_sec = shdr + secindex_strings;
        secstrtab = (const char *)ehdr + _r(&shstrtab_sec->sh_offset);
-        for (i = 0; i < r2(&ehdr->e_shnum); i++) {
+        for (i = 0; i < num_sections; i++) {
                idx = r(&shdr[i].sh_name);
                if (strcmp(secstrtab + idx, "__ex_table") == 0) {
                        extab_sec = shdr + i;
@@ -129,6 +142,9 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort)
                        symtab_sec = shdr + i;
                if (strcmp(secstrtab + idx, ".strtab") == 0)
                        strtab_sec = shdr + i;
+                if (r(&shdr[i].sh_type) == SHT_SYMTAB_SHNDX)
+                        symtab_shndx_start = (Elf32_Word *)(
+                                (const char *)ehdr + _r(&shdr[i].sh_offset));
        }
        if (strtab_sec == NULL) {
                fprintf(stderr, "no .strtab in  file: %s\n", fname);
@@ -138,6 +154,8 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort)
                fprintf(stderr, "no .symtab in  file: %s\n", fname);
                fail_file();
        }
+        symtab = (const Elf_Sym *)((const char *)ehdr +
+                                   _r(&symtab_sec->sh_offset));
        if (extab_sec == NULL) {
                fprintf(stderr, "no __ex_table in  file: %s\n", fname);
                fail_file();
@@ -176,7 +194,9 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort)
                        fname);
                fail_file();
        }
-        sort_needed_sec = &shdr[r2(&sort_needed_sym->st_shndx)];
+        sort_needed_sec = &shdr[get_secindex(r2(&sym->st_shndx),
+                                             sort_needed_sym - symtab,
+                                             symtab_shndx_start)];
        sort_done_location = (void *)ehdr +
                _r(&sort_needed_sec->sh_offset) +
                _r(&sort_needed_sym->st_value) -
diff --git a/scripts/tags.sh b/scripts/tags.sh
index 74f02e4dddd2..58c455929091 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -149,15 +149,16 @@ dogtags()
 exuberant()
 {
        all_target_sources | xargs $1 -a                        \
-        -I __initdata,__exitdata,__initconst,__devinitdata      \
+        -I __initdata,__exitdata,__initconst,                   \
-        -I __devinitconst,__cpuinitdata,__initdata_memblock     \
+        -I __cpuinitdata,__initdata_memblock                    \
-        -I __refdata,__attribute                                \
+        -I __refdata,__attribute,__maybe_unused,__always_unused \
        -I __acquires,__releases,__deprecated                   \
        -I __read_mostly,__aligned,____cacheline_aligned        \
        -I ____cacheline_aligned_in_smp                         \
+        -I __cacheline_aligned,__cacheline_aligned_in_smp       \
        -I ____cacheline_internodealigned_in_smp                \
        -I __used,__packed,__packed2__,__must_check,__must_hold \
-        -I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL                      \
+        -I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL,ACPI_EXPORT_SYMBOL   \
        -I DEFINE_TRACE,EXPORT_TRACEPOINT_SYMBOL,EXPORT_TRACEPOINT_SYMBOL_GPL \
        -I static,const                                         \
        --extra=+f --c-kinds=+px                                \