Merge branch 'next' into for-linus

27 files changed, 1064 insertions, 112 deletions

diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index d897278b1f97..6a3ee981931d 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -104,7 +104,7 @@ as-option = $(call try-run,\
 # Usage: cflags-y += $(call as-instr,instr,option1,option2)
 
 as-instr = $(call try-run,\
-        /bin/echo -e "$(1)" | $(CC) $(KBUILD_AFLAGS) -c -xassembler -o "$$TMP" -,$(2),$(3))
+        printf "%b\n" "$(1)" | $(CC) $(KBUILD_AFLAGS) -c -xassembler -o "$$TMP" -,$(2),$(3))
 
 # cc-option
 # Usage: cflags-y += $(call cc-option,-march=winchip-c6,-march=i586)
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index d2b366c16b64..ff1720d28d0c 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -69,6 +69,7 @@ warning-1 += -Wmissing-prototypes
 warning-1 += -Wold-style-definition
 warning-1 += $(call cc-option, -Wmissing-include-dirs)
 warning-1 += $(call cc-option, -Wunused-but-set-variable)
+warning-1 += $(call cc-disable-warning, missing-field-initializers)
 
 warning-2 := -Waggregate-return
 warning-2 += -Wcast-align
@@ -76,6 +77,7 @@ warning-2 += -Wdisabled-optimization
 warning-2 += -Wnested-externs
 warning-2 += -Wshadow
 warning-2 += $(call cc-option, -Wlogical-op)
+warning-2 += $(call cc-option, -Wmissing-field-initializers)
 
 warning-3 := -Wbad-function-cast
 warning-3 += -Wcast-qual
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 00c368c6e996..0be6f110cce7 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -304,6 +304,30 @@ cmd_lzo = (cat $(filter-out FORCE,$^) | \
         lzop -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
         (rm -f $@ ; false)
 
+# U-Boot mkimage
+# ---------------------------------------------------------------------------
+
+MKIMAGE := $(srctree)/scripts/mkuboot.sh
+
+# SRCARCH just happens to match slightly more than ARCH (on sparc), so reduces
+# the number of overrides in arch makefiles
+UIMAGE_ARCH ?= $(SRCARCH)
+UIMAGE_COMPRESSION ?= $(if $(2),$(2),none)
+UIMAGE_OPTS-y ?=
+UIMAGE_TYPE ?= kernel
+UIMAGE_LOADADDR ?= arch_must_set_this
+UIMAGE_ENTRYADDR ?= $(UIMAGE_LOADADDR)
+UIMAGE_NAME ?= 'Linux-$(KERNELRELEASE)'
+UIMAGE_IN ?= $<
+UIMAGE_OUT ?= $@
+
+quiet_cmd_uimage = UIMAGE  $(UIMAGE_OUT)
+      cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A $(UIMAGE_ARCH) -O linux \
+                        -C $(UIMAGE_COMPRESSION) $(UIMAGE_OPTS-y) \
+                        -T $(UIMAGE_TYPE) \
+                        -a $(UIMAGE_LOADADDR) -e $(UIMAGE_ENTRYADDR) \
+                        -n $(UIMAGE_NAME) -d $(UIMAGE_IN) $(UIMAGE_OUT)
+
 # XZ
 # ---------------------------------------------------------------------------
 # Use xzkern to compress the kernel image and xzmisc to compress other things.
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index a3b9782441f9..faea0ec612bf 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -323,17 +323,22 @@ sub build_types {
                   }x;
         $Type   = qr{
                         $NonptrType
-                        (?:[\s\*]+\s*const|[\s\*]+|(?:\s*\[\s*\])+)?
+                        (?:(?:\s|\*|\[\])+\s*const|(?:\s|\*|\[\])+|(?:\s*\[\s*\])+)?
                         (?:\s+$Inline|\s+$Modifier)*
                   }x;
         $Declare        = qr{(?:$Storage\s+)?$Type};
 }
 build_types();
 
-our $match_balanced_parentheses = qr/(\((?:[^\(\)]+|(-1))*\))/;
 
 our $Typecast   = qr{\s*(\(\s*$NonptrType\s*\)){0,1}\s*};
-our $LvalOrFunc = qr{($Lval)\s*($match_balanced_parentheses{0,1})\s*};
+
+# Using $balanced_parens, $LvalOrFunc, or $FuncArg
+# requires at least perl version v5.10.0
+# Any use must be runtime checked with $^V
+
+our $balanced_parens = qr/(\((?:[^\(\)]++|(?-1))*\))/;
+our $LvalOrFunc = qr{($Lval)\s*($balanced_parens{0,1})\s*};
 our $FuncArg = qr{$Typecast{0,1}($LvalOrFunc|$Constant)};
 
 sub deparenthesize {
@@ -1330,6 +1335,36 @@ sub check_absolute_file {
         }
 }
 
+sub pos_last_openparen {
+        my ($line) = @_;
+
+        my $pos = 0;
+
+        my $opens = $line =~ tr/\(/\(/;
+        my $closes = $line =~ tr/\)/\)/;
+
+        my $last_openparen = 0;
+
+        if (($opens == 0) || ($closes >= $opens)) {
+                return -1;
+        }
+
+        my $len = length($line);
+
+        for ($pos = 0; $pos < $len; $pos++) {
+                my $string = substr($line, $pos);
+                if ($string =~ /^($FuncArg|$balanced_parens)/) {
+                        $pos += length($1) - 1;
+                } elsif (substr($line, $pos, 1) eq '(') {
+                        $last_openparen = $pos;
+                } elsif (index($string, '(') == -1) {
+                        last;
+                }
+        }
+
+        return $last_openparen + 1;
+}
+
 sub process {
         my $filename = shift;
 
@@ -1737,6 +1772,21 @@ sub process {
                              "line over 80 characters\n" . $herecurr);
                 }
 
+# Check for user-visible strings broken across lines, which breaks the ability
+# to grep for the string.  Limited to strings used as parameters (those
+# following an open parenthesis), which almost completely eliminates false
+# positives, as well as warning only once per parameter rather than once per
+# line of the string.  Make an exception when the previous string ends in a
+# newline (multiple lines in one string constant) or \n\t (common in inline
+# assembly to indent the instruction on the following line).
+                if ($line =~ /^\+\s*"/ &&
+                    $prevline =~ /"\s*$/ &&
+                    $prevline =~ /\(/ &&
+                    $prevrawline !~ /\\n(?:\\t)*"\s*$/) {
+                        WARN("SPLIT_STRING",
+                             "quoted string split across lines\n" . $hereprev);
+                }
+
 # check for spaces before a quoted newline
                 if ($rawline =~ /^.*\".*\s\\n/) {
                         WARN("QUOTED_WHITESPACE_BEFORE_NEWLINE",
@@ -1783,6 +1833,42 @@ sub process {
                              "please, no space before tabs\n" . $herevet);
                 }
 
+# check for && or || at the start of a line
+                if ($rawline =~ /^\+\s*(&&|\|\|)/) {
+                        CHK("LOGICAL_CONTINUATIONS",
+                            "Logical continuations should be on the previous line\n" . $hereprev);
+                }
+
+# check multi-line statement indentation matches previous line
+                if ($^V && $^V ge 5.10.0 &&
+                    $prevline =~ /^\+(\t*)(if \(|$Ident\().*(\&\&|\|\||,)\s*$/) {
+                        $prevline =~ /^\+(\t*)(.*)$/;
+                        my $oldindent = $1;
+                        my $rest = $2;
+
+                        my $pos = pos_last_openparen($rest);
+                        if ($pos >= 0) {
+                                $line =~ /^\+([ \t]*)/;
+                                my $newindent = $1;
+
+                                my $goodtabindent = $oldindent .
+                                        "\t" x ($pos / 8) .
+                                        " "  x ($pos % 8);
+                                my $goodspaceindent = $oldindent . " "  x $pos;
+
+                                if ($newindent ne $goodtabindent &&
+                                    $newindent ne $goodspaceindent) {
+                                        CHK("PARENTHESIS_ALIGNMENT",
+                                            "Alignment should match open parenthesis\n" . $hereprev);
+                                }
+                        }
+                }
+
+                if ($line =~ /^\+.*\*[ \t]*\)[ \t]+/) {
+                        CHK("SPACING",
+                            "No space is necessary after a cast\n" . $hereprev);
+                }
+
 # check for spaces at the beginning of a line.
 # Exceptions:
 #  1) within comments
@@ -2325,7 +2411,7 @@ sub process {
                         my ($where, $prefix) = ($-[1], $1);
                         if ($prefix !~ /$Type\s+$/ &&
                             ($where != 0 || $prefix !~ /^.\s+$/) &&
-                            $prefix !~ /{\s+$/) {
+                            $prefix !~ /[{,]\s+$/) {
                                 ERROR("BRACKET_SPACE",
                                       "space prohibited before open square bracket '['\n" . $herecurr);
                         }
@@ -2828,6 +2914,12 @@ sub process {
                         {
                         }
 
+                        # Flatten any obvious string concatentation.
+                        while ($dstat =~ s/("X*")\s*$Ident/$1/ ||
+                               $dstat =~ s/$Ident\s*("X*")/$1/)
+                        {
+                        }
+
                         my $exceptions = qr{
                                 $Declare|
                                 module_param_named|
@@ -2844,7 +2936,8 @@ sub process {
                         if ($dstat ne '' &&
                             $dstat !~ /^(?:$Ident|-?$Constant),$/ &&                    # 10, // foo(),
                             $dstat !~ /^(?:$Ident|-?$Constant);$/ &&                    # foo();
-                            $dstat !~ /^(?:$Ident|-?$Constant)$/ &&                     # 10 // foo()
+                            $dstat !~ /^[!~-]?(?:$Ident|$Constant)$/ &&         # 10 // foo() // !foo // ~foo // -foo
+                            $dstat !~ /^'X'$/ &&                                        # character constants
                             $dstat !~ /$exceptions/ &&
                             $dstat !~ /^\.$Ident\s*=/ &&                                # .foo =
                             $dstat !~ /^do\s*$Constant\s*while\s*$Constant;?$/ &&       # do {...} while (...); // do {...} while (...)
@@ -2888,7 +2981,8 @@ sub process {
                         #print "chunks<$#chunks> linenr<$linenr> endln<$endln> level<$level>\n";
                         #print "APW: <<$chunks[1][0]>><<$chunks[1][1]>>\n";
                         if ($#chunks > 0 && $level == 0) {
-                                my $allowed = 0;
+                                my @allowed = ();
+                                my $allow = 0;
                                 my $seen = 0;
                                 my $herectx = $here . "\n";
                                 my $ln = $linenr - 1;
@@ -2899,6 +2993,7 @@ sub process {
                                         my ($whitespace) = ($cond =~ /^((?:\s*\n[+-])*\s*)/s);
                                         my $offset = statement_rawlines($whitespace) - 1;
 
+                                        $allowed[$allow] = 0;
                                         #print "COND<$cond> whitespace<$whitespace> offset<$offset>\n";
 
                                         # We have looked at and allowed this specific line.
@@ -2911,23 +3006,34 @@ sub process {
 
                                         $seen++ if ($block =~ /^\s*{/);
 
-                                        #print "cond<$cond> block<$block> allowed<$allowed>\n";
+                                        #print "cond<$cond> block<$block> allowed<$allowed[$allow]>\n";
                                         if (statement_lines($cond) > 1) {
                                                 #print "APW: ALLOWED: cond<$cond>\n";
-                                                $allowed = 1;
+                                                $allowed[$allow] = 1;
                                         }
                                         if ($block =~/\b(?:if|for|while)\b/) {
                                                 #print "APW: ALLOWED: block<$block>\n";
-                                                $allowed = 1;
+                                                $allowed[$allow] = 1;
                                         }
                                         if (statement_block_size($block) > 1) {
                                                 #print "APW: ALLOWED: lines block<$block>\n";
-                                                $allowed = 1;
+                                                $allowed[$allow] = 1;
                                         }
+                                        $allow++;
                                 }
-                                if ($seen && !$allowed) {
-                                        WARN("BRACES",
-                                             "braces {} are not necessary for any arm of this statement\n" . $herectx);
+                                if ($seen) {
+                                        my $sum_allowed = 0;
+                                        foreach (@allowed) {
+                                                $sum_allowed += $_;
+                                        }
+                                        if ($sum_allowed == 0) {
+                                                WARN("BRACES",
+                                                     "braces {} are not necessary for any arm of this statement\n" . $herectx);
+                                        } elsif ($sum_allowed != $allow &&
+                                                 $seen != $allow) {
+                                                CHK("BRACES",
+                                                    "braces {} should be used on all arms of this statement\n" . $herectx);
+                                        }
                                 }
                         }
                 }
@@ -3123,6 +3229,12 @@ sub process {
                              "__printf(string-index, first-to-check) is preferred over __attribute__((format(printf, string-index, first-to-check)))\n" . $herecurr);
                 }
 
+# Check for __attribute__ format(scanf, prefer __scanf
+                if ($line =~ /\b__attribute__\s*\(\s*\(\s*format\s*\(\s*scanf\b/) {
+                        WARN("PREFER_SCANF",
+                             "__scanf(string-index, first-to-check) is preferred over __attribute__((format(scanf, string-index, first-to-check)))\n" . $herecurr);
+                }
+
 # check for sizeof(&)
                 if ($line =~ /\bsizeof\s*\(\s*\&/) {
                         WARN("SIZEOF_ADDRESS",
@@ -3136,12 +3248,13 @@ sub process {
                 }
 
 # Check for misused memsets
-                if (defined $stat &&
+                if ($^V && $^V ge 5.10.0 &&
+                    defined $stat &&
                     $stat =~ /^\+(?:.*?)\bmemset\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*$FuncArg\s*\)/s) {
 
                         my $ms_addr = $2;
-                        my $ms_val = $8;
-                        my $ms_size = $14;
+                        my $ms_val = $7;
+                        my $ms_size = $12;
 
                         if ($ms_size =~ /^(0x|)0$/i) {
                                 ERROR("MEMSET",
@@ -3153,17 +3266,18 @@ sub process {
                 }
 
 # typecasts on min/max could be min_t/max_t
-                if (defined $stat &&
+                if ($^V && $^V ge 5.10.0 &&
+                    defined $stat &&
                     $stat =~ /^\+(?:.*?)\b(min|max)\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\)/) {
-                        if (defined $2 || defined $8) {
+                        if (defined $2 || defined $7) {
                                 my $call = $1;
                                 my $cast1 = deparenthesize($2);
                                 my $arg1 = $3;
-                                my $cast2 = deparenthesize($8);
-                                my $arg2 = $9;
+                                my $cast2 = deparenthesize($7);
+                                my $arg2 = $8;
                                 my $cast;
 
-                                if ($cast1 ne "" && $cast2 ne "") {
+                                if ($cast1 ne "" && $cast2 ne "" && $cast1 ne $cast2) {
                                         $cast = "$cast1 or $cast2";
                                 } elsif ($cast1 ne "") {
                                         $cast = $cast1;
@@ -3233,22 +3347,30 @@ sub process {
                              "__func__ should be used instead of gcc specific __FUNCTION__\n"  . $herecurr);
                 }
 
+# check for use of yield()
+                if ($line =~ /\byield\s*\(\s*\)/) {
+                        WARN("YIELD",
+                             "Using yield() is generally wrong. See yield() kernel-doc (sched/core.c)\n"  . $herecurr);
+                }
+
 # check for semaphores initialized locked
                 if ($line =~ /^.\s*sema_init.+,\W?0\W?\)/) {
                         WARN("CONSIDER_COMPLETION",
                              "consider using a completion\n" . $herecurr);
-
                 }
+
 # recommend kstrto* over simple_strto* and strict_strto*
                 if ($line =~ /\b((simple|strict)_(strto(l|ll|ul|ull)))\s*\(/) {
                         WARN("CONSIDER_KSTRTO",
                              "$1 is obsolete, use k$3 instead\n" . $herecurr);
                 }
+
 # check for __initcall(), use device_initcall() explicitly please
                 if ($line =~ /^.\s*__initcall\s*\(/) {
                         WARN("USE_DEVICE_INITCALL",
                              "please use device_initcall() instead of __initcall()\n" . $herecurr);
                 }
+
 # check for various ops structs, ensure they are const.
                 my $struct_ops = qr{acpi_dock_ops|
                                 address_space_operations|
@@ -3385,6 +3507,12 @@ sub process {
         }
 
         if ($quiet == 0) {
+
+                if ($^V lt 5.10.0) {
+                        print("NOTE: perl $^V is not modern enough to detect all possible issues.\n");
+                        print("An upgrade to at least perl v5.10.0 is suggested.\n\n");
+                }
+
                 # If there were whitespace errors which cleanpatch can fix
                 # then suggest that.
                 if ($rpt_cleaners) {
@@ -3394,13 +3522,12 @@ sub process {
                 }
         }
 
-        if (keys %ignore_type) {
+        if ($quiet == 0 && keys %ignore_type) {
             print "NOTE: Ignored message types:";
             foreach my $ignore (sort keys %ignore_type) {
                 print " $ignore";
             }
-            print "\n";
-            print "\n" if ($quiet == 0);
+            print "\n\n";
         }
 
         if ($clean == 1 && $quiet == 0) {
diff --git a/scripts/coccinelle/api/ptr_ret.cocci b/scripts/coccinelle/api/ptr_ret.cocci
new file mode 100644
index 000000000000..cbfd08c7d8c7
--- /dev/null
+++ b/scripts/coccinelle/api/ptr_ret.cocci
@@ -0,0 +1,70 @@
+///
+/// Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR
+///
+// Confidence: High
+// Copyright: (C) 2012 Julia Lawall, INRIA/LIP6.  GPLv2.
+// Copyright: (C) 2012 Gilles Muller, INRIA/LiP6.  GPLv2.
+// URL: http://coccinelle.lip6.fr/
+// Options: -no_includes -include_headers
+//
+// Keywords: ERR_PTR, PTR_ERR, PTR_RET
+// Version min: 2.6.39
+//
+
+virtual context
+virtual patch
+virtual org
+virtual report
+
+@depends on patch@
+expression ptr;
+@@
+
+- if (IS_ERR(ptr)) return PTR_ERR(ptr); else return 0;
++ return PTR_RET(ptr);
+
+@depends on patch@
+expression ptr;
+@@
+
+- if (IS_ERR(ptr)) return PTR_ERR(ptr); return 0;
++ return PTR_RET(ptr);
+
+@r1 depends on !patch@
+expression ptr;
+position p1;
+@@
+
+* if@p1 (IS_ERR(ptr)) return PTR_ERR(ptr); else return 0;
+
+@r2 depends on !patch@
+expression ptr;
+position p2;
+@@
+
+* if@p2 (IS_ERR(ptr)) return PTR_ERR(ptr); return 0;
+
+@script:python depends on org@
+p << r1.p1;
+@@
+
+coccilib.org.print_todo(p[0], "WARNING: PTR_RET can be used")
+
+
+@script:python depends on org@
+p << r2.p2;
+@@
+
+coccilib.org.print_todo(p[0], "WARNING: PTR_RET can be used")
+
+@script:python depends on report@
+p << r1.p1;
+@@
+
+coccilib.report.print_report(p[0], "WARNING: PTR_RET can be used")
+
+@script:python depends on report@
+p << r2.p2;
+@@
+
+coccilib.report.print_report(p[0], "WARNING: PTR_RET can be used")
diff --git a/scripts/coccinelle/api/simple_open.cocci b/scripts/coccinelle/api/simple_open.cocci
new file mode 100644
index 000000000000..05962f7be155
--- /dev/null
+++ b/scripts/coccinelle/api/simple_open.cocci
@@ -0,0 +1,70 @@
+/// This removes an open coded simple_open() function
+/// and replaces file operations references to the function
+/// with simple_open() instead.
+///
+// Confidence: High
+// Comments:
+// Options: -no_includes -include_headers
+
+virtual patch
+virtual report
+
+@ open depends on patch @
+identifier open_f != simple_open;
+identifier i, f;
+@@
+-int open_f(struct inode *i, struct file *f)
+-{
+(
+-if (i->i_private)
+-f->private_data = i->i_private;
+|
+-f->private_data = i->i_private;
+)
+-return 0;
+-}
+
+@ has_open depends on open @
+identifier fops;
+identifier open.open_f;
+@@
+struct file_operations fops = {
+...,
+-.open = open_f,
++.open = simple_open,
+...
+};
+
+@ openr depends on report @
+identifier open_f != simple_open;
+identifier i, f;
+position p;
+@@
+int open_f@p(struct inode *i, struct file *f)
+{
+(
+if (i->i_private)
+f->private_data = i->i_private;
+|
+f->private_data = i->i_private;
+)
+return 0;
+}
+
+@ has_openr depends on openr @
+identifier fops;
+identifier openr.open_f;
+position p;
+@@
+struct file_operations fops = {
+...,
+.open = open_f@p,
+...
+};
+
+@script:python@
+pf << openr.p;
+ps << has_openr.p;
+@@
+
+coccilib.report.print_report(pf[0],"WARNING opportunity for simple_open, see also structure on line %s"%(ps[0].line))
diff --git a/scripts/coccinelle/free/clk_put.cocci b/scripts/coccinelle/free/clk_put.cocci
new file mode 100644
index 000000000000..46747adfd20a
--- /dev/null
+++ b/scripts/coccinelle/free/clk_put.cocci
@@ -0,0 +1,67 @@
+/// Find missing clk_puts.
+///
+//# This only signals a missing clk_put when there is a clk_put later
+//# in the same function.
+//# False positives can be due to loops.
+//
+// Confidence: Moderate
+// Copyright: (C) 2012 Julia Lawall, INRIA/LIP6.  GPLv2.
+// Copyright: (C) 2012 Gilles Muller, INRIA/LiP6.  GPLv2.
+// URL: http://coccinelle.lip6.fr/
+// Comments:
+// Options:
+
+virtual context
+virtual org
+virtual report
+
+@clk@
+expression e;
+statement S,S1;
+int ret;
+position p1,p2,p3;
+@@
+
+e = clk_get@p1(...)
+... when != clk_put(e)
+if (<+...e...+>) S
+... when any
+    when != clk_put(e)
+    when != if (...) { ... clk_put(e); ... }
+(
+ if (ret == 0) S1
+|
+if (...)
+   { ...
+     return 0; }
+|
+if (...)
+   { ...
+     return <+...e...+>; }
+|
+*if@p2 (...)
+   { ... when != clk_put(e)
+         when forall
+     return@p3 ...; }
+)
+... when any
+clk_put(e);
+
+@script:python depends on org@
+p1 << clk.p1;
+p2 << clk.p2;
+p3 << clk.p3;
+@@
+
+cocci.print_main("clk_get",p1)
+cocci.print_secs("if",p2)
+cocci.print_secs("needed clk_put",p3)
+
+@script:python depends on report@
+p1 << clk.p1;
+p2 << clk.p2;
+p3 << clk.p3;
+@@
+
+msg = "ERROR: missing clk_put; clk_get on line %s and execution via conditional on line %s" % (p1[0].line,p2[0].line)
+coccilib.report.print_report(p3[0],msg)
diff --git a/scripts/coccinelle/free/iounmap.cocci b/scripts/coccinelle/free/iounmap.cocci
new file mode 100644
index 000000000000..5384f4ba1192
--- /dev/null
+++ b/scripts/coccinelle/free/iounmap.cocci
@@ -0,0 +1,67 @@
+/// Find missing iounmaps.
+///
+//# This only signals a missing iounmap when there is an iounmap later
+//# in the same function.
+//# False positives can be due to loops.
+//
+// Confidence: Moderate
+// Copyright: (C) 2012 Julia Lawall, INRIA/LIP6.  GPLv2.
+// Copyright: (C) 2012 Gilles Muller, INRIA/LiP6.  GPLv2.
+// URL: http://coccinelle.lip6.fr/
+// Comments:
+// Options:
+
+virtual context
+virtual org
+virtual report
+
+@iom@
+expression e;
+statement S,S1;
+int ret;
+position p1,p2,p3;
+@@
+
+e = \(ioremap@p1\|ioremap_nocache@p1\)(...)
+... when != iounmap(e)
+if (<+...e...+>) S
+... when any
+    when != iounmap(e)
+    when != if (...) { ... iounmap(e); ... }
+(
+ if (ret == 0) S1
+|
+if (...)
+   { ...
+     return 0; }
+|
+if (...)
+   { ...
+     return <+...e...+>; }
+|
+*if@p2 (...)
+   { ... when != iounmap(e)
+         when forall
+     return@p3 ...; }
+)
+... when any
+iounmap(e);
+
+@script:python depends on org@
+p1 << iom.p1;
+p2 << iom.p2;
+p3 << iom.p3;
+@@
+
+cocci.print_main("ioremap",p1)
+cocci.print_secs("if",p2)
+cocci.print_secs("needed iounmap",p3)
+
+@script:python depends on report@
+p1 << iom.p1;
+p2 << iom.p2;
+p3 << iom.p3;
+@@
+
+msg = "ERROR: missing iounmap; ioremap on line %s and execution via conditional on line %s" % (p1[0].line,p2[0].line)
+coccilib.report.print_report(p3[0],msg)
diff --git a/scripts/coccinelle/misc/boolinit.cocci b/scripts/coccinelle/misc/boolinit.cocci
new file mode 100644
index 000000000000..97ce41ce8135
--- /dev/null
+++ b/scripts/coccinelle/misc/boolinit.cocci
@@ -0,0 +1,178 @@
+/// Bool initializations should use true and false.  Bool tests don't need
+/// comparisons.  Based on contributions from Joe Perches, Rusty Russell
+/// and Bruce W Allan.
+///
+// Confidence: High
+// Copyright: (C) 2012 Julia Lawall, INRIA/LIP6.  GPLv2.
+// Copyright: (C) 2012 Gilles Muller, INRIA/LiP6.  GPLv2.
+// URL: http://coccinelle.lip6.fr/
+// Options: -include_headers
+
+virtual patch
+virtual context
+virtual org
+virtual report
+
+@depends on patch@
+bool t;
+symbol true;
+symbol false;
+@@
+
+(
+- t == true
++ t
+|
+- true == t
++ t
+|
+- t != true
++ !t
+|
+- true != t
++ !t
+|
+- t == false
++ !t
+|
+- false == t
++ !t
+|
+- t != false
++ t
+|
+- false != t
++ t
+)
+
+@depends on patch disable is_zero, isnt_zero@
+bool t;
+@@
+
+(
+- t == 1
++ t
+|
+- t != 1
++ !t
+|
+- t == 0
++ !t
+|
+- t != 0
++ t
+)
+
+@depends on patch@
+bool b;
+@@
+(
+ b =
+- 0
++ false
+|
+ b =
+- 1
++ true
+)
+
+// ---------------------------------------------------------------------
+
+@r1 depends on !patch@
+bool t;
+position p;
+@@
+
+(
+* t@p == true
+|
+* true == t@p
+|
+* t@p != true
+|
+* true != t@p
+|
+* t@p == false
+|
+* false == t@p
+|
+* t@p != false
+|
+* false != t@p
+)
+
+@r2 depends on !patch disable is_zero, isnt_zero@
+bool t;
+position p;
+@@
+
+(
+* t@p == 1
+|
+* t@p != 1
+|
+* t@p == 0
+|
+* t@p != 0
+)
+
+@r3 depends on !patch@
+bool b;
+position p1,p2;
+constant c;
+@@
+(
+*b@p1 = 0
+|
+*b@p1 = 1
+|
+*b@p2 = c
+)
+
+@script:python depends on org@
+p << r1.p;
+@@
+
+cocci.print_main("WARNING: Comparison to bool",p)
+
+@script:python depends on org@
+p << r2.p;
+@@
+
+cocci.print_main("WARNING: Comparison of bool to 0/1",p)
+
+@script:python depends on org@
+p1 << r3.p1;
+@@
+
+cocci.print_main("WARNING: Assignment of bool to 0/1",p1)
+
+@script:python depends on org@
+p2 << r3.p2;
+@@
+
+cocci.print_main("ERROR: Assignment of bool to non-0/1 constant",p2)
+
+@script:python depends on report@
+p << r1.p;
+@@
+
+coccilib.report.print_report(p[0],"WARNING: Comparison to bool")
+
+@script:python depends on report@
+p << r2.p;
+@@
+
+coccilib.report.print_report(p[0],"WARNING: Comparison of bool to 0/1")
+
+@script:python depends on report@
+p1 << r3.p1;
+@@
+
+coccilib.report.print_report(p1[0],"WARNING: Assignment of bool to 0/1")
+
+@script:python depends on report@
+p2 << r3.p2;
+@@
+
+coccilib.report.print_report(p2[0],"ERROR: Assignment of bool to non-0/1 constant")
diff --git a/scripts/coccinelle/misc/cstptr.cocci b/scripts/coccinelle/misc/cstptr.cocci
new file mode 100644
index 000000000000..d42564484528
--- /dev/null
+++ b/scripts/coccinelle/misc/cstptr.cocci
@@ -0,0 +1,41 @@
+/// PTR_ERR should be applied before its argument is reassigned, typically
+/// to NULL
+///
+// Confidence: High
+// Copyright: (C) 2012 Julia Lawall, INRIA/LIP6.  GPLv2.
+// Copyright: (C) 2012 Gilles Muller, INRIA/LiP6.  GPLv2.
+// URL: http://coccinelle.lip6.fr/
+// Comments:
+// Options: -no_includes -include_headers
+
+virtual org
+virtual report
+virtual context
+
+@r exists@
+expression e,e1;
+constant c;
+position p1,p2;
+@@
+
+*e@p1 = c
+... when != e = e1
+    when != &e
+    when != true IS_ERR(e)
+*PTR_ERR@p2(e)
+
+@script:python depends on org@
+p1 << r.p1;
+p2 << r.p2;
+@@
+
+cocci.print_main("PTR_ERR",p2)
+cocci.print_secs("assignment",p1)
+
+@script:python depends on report@
+p1 << r.p1;
+p2 << r.p2;
+@@
+
+msg = "ERROR: PTR_ERR applied after initialization to constant on line %s" % (p1[0].line)
+coccilib.report.print_report(p2[0],msg)
diff --git a/scripts/coccinelle/null/badzero.cocci b/scripts/coccinelle/null/badzero.cocci
new file mode 100644
index 000000000000..d79baf7220e7
--- /dev/null
+++ b/scripts/coccinelle/null/badzero.cocci
@@ -0,0 +1,237 @@
+/// Compare pointer-typed values to NULL rather than 0
+///
+//# This makes an effort to choose between !x and x == NULL.  !x is used
+//# if it has previously been used with the function used to initialize x.
+//# This relies on type information.  More type information can be obtained
+//# using the option -all_includes and the option -I to specify an
+//# include path.
+//
+// Confidence: High
+// Copyright: (C) 2012 Julia Lawall, INRIA/LIP6.  GPLv2.
+// Copyright: (C) 2012 Gilles Muller, INRIA/LiP6.  GPLv2.
+// URL: http://coccinelle.lip6.fr/
+// Comments:
+// Options:
+
+virtual patch
+virtual context
+virtual org
+virtual report
+
+@initialize:ocaml@
+let negtable = Hashtbl.create 101
+
+@depends on patch@
+expression *E;
+identifier f;
+@@
+
+(
+  (E = f(...)) ==
+- 0
++ NULL
+|
+  (E = f(...)) !=
+- 0
++ NULL
+|
+- 0
++ NULL
+  == (E = f(...))
+|
+- 0
++ NULL
+  != (E = f(...))
+)
+
+
+@t1 depends on !patch@
+expression *E;
+identifier f;
+position p;
+@@
+
+(
+  (E = f(...)) ==
+* 0@p
+|
+  (E = f(...)) !=
+* 0@p
+|
+* 0@p
+  == (E = f(...))
+|
+* 0@p
+  != (E = f(...))
+)
+
+@script:python depends on org@
+p << t1.p;
+@@
+
+coccilib.org.print_todo(p[0], "WARNING comparing pointer to 0")
+
+@script:python depends on report@
+p << t1.p;
+@@
+
+coccilib.report.print_report(p[0], "WARNING comparing pointer to 0")
+
+// Tests of returned values
+
+@s@
+identifier f;
+expression E,E1;
+@@
+
+ E = f(...)
+ ... when != E = E1
+ !E
+
+@script:ocaml depends on s@
+f << s.f;
+@@
+
+try let _ = Hashtbl.find negtable f in ()
+with Not_found -> Hashtbl.add negtable f ()
+
+@ r disable is_zero,isnt_zero exists @
+expression *E;
+identifier f;
+@@
+
+E = f(...)
+...
+(E == 0
+|E != 0
+|0 == E
+|0 != E
+)
+
+@script:ocaml@
+f << r.f;
+@@
+
+try let _ = Hashtbl.find negtable f in ()
+with Not_found -> include_match false
+
+// This rule may lead to inconsistent path problems, if E is defined in two
+// places
+@ depends on patch disable is_zero,isnt_zero @
+expression *E;
+expression E1;
+identifier r.f;
+@@
+
+E = f(...)
+<...
+(
+- E == 0
++ !E
+|
+- E != 0
++ E
+|
+- 0 == E
++ !E
+|
+- 0 != E
++ E
+)
+...>
+?E = E1
+
+@t2 depends on !patch disable is_zero,isnt_zero @
+expression *E;
+expression E1;
+identifier r.f;
+position p1;
+position p2;
+@@
+
+E = f(...)
+<...
+(
+* E == 0@p1
+|
+* E != 0@p2
+|
+* 0@p1 == E
+|
+* 0@p1 != E
+)
+...>
+?E = E1
+
+@script:python depends on org@
+p << t2.p1;
+@@
+
+coccilib.org.print_todo(p[0], "WARNING comparing pointer to 0, suggest !E")
+
+@script:python depends on org@
+p << t2.p2;
+@@
+
+coccilib.org.print_todo(p[0], "WARNING comparing pointer to 0")
+
+@script:python depends on report@
+p << t2.p1;
+@@
+
+coccilib.report.print_report(p[0], "WARNING comparing pointer to 0, suggest !E")
+
+@script:python depends on report@
+p << t2.p2;
+@@
+
+coccilib.report.print_report(p[0], "WARNING comparing pointer to 0")
+
+@ depends on patch disable is_zero,isnt_zero @
+expression *E;
+@@
+
+(
+  E ==
+- 0
++ NULL
+|
+  E !=
+- 0
++ NULL
+|
+- 0
++ NULL
+  == E
+|
+- 0
++ NULL
+  != E
+)
+
+@ t3 depends on !patch disable is_zero,isnt_zero @
+expression *E;
+position p;
+@@
+
+(
+* E == 0@p
+|
+* E != 0@p
+|
+* 0@p == E
+|
+* 0@p != E
+)
+
+@script:python depends on org@
+p << t3.p;
+@@
+
+coccilib.org.print_todo(p[0], "WARNING comparing pointer to 0")
+
+@script:python depends on report@
+p << t3.p;
+@@
+
+coccilib.report.print_report(p[0], "WARNING comparing pointer to 0")
diff --git a/scripts/dtc/dtc.c b/scripts/dtc/dtc.c
index 451c92d31b19..2ef5e2e3dd38 100644
--- a/scripts/dtc/dtc.c
+++ b/scripts/dtc/dtc.c
@@ -101,7 +101,7 @@ int main(int argc, char *argv[])
         const char *outform = "dts";
         const char *outname = "-";
         const char *depname = NULL;
-        int force = 0, check = 0, sort = 0;
+        int force = 0, sort = 0;
         const char *arg;
         int opt;
         FILE *outf = NULL;
@@ -143,9 +143,6 @@ int main(int argc, char *argv[])
                 case 'f':
                         force = 1;
                         break;
-                case 'c':
-                        check = 1;
-                        break;
                 case 'q':
                         quiet++;
                         break;
diff --git a/scripts/dtc/flattree.c b/scripts/dtc/flattree.c
index ead0332c87e1..28d0b2381df6 100644
--- a/scripts/dtc/flattree.c
+++ b/scripts/dtc/flattree.c
@@ -697,7 +697,6 @@ static struct reserve_info *flat_read_mem_reserve(struct inbuf *inb)
 {
         struct reserve_info *reservelist = NULL;
         struct reserve_info *new;
-        const char *p;
         struct fdt_reserve_entry re;
 
         /*
@@ -706,7 +705,6 @@ static struct reserve_info *flat_read_mem_reserve(struct inbuf *inb)
          *
          * First pass, count entries.
          */
-        p = inb->ptr;
         while (1) {
                 flat_read_chunk(inb, &re, sizeof(re));
                 re.address  = fdt64_to_cpu(re.address);
diff --git a/scripts/gcc-goto.sh b/scripts/gcc-goto.sh
index 98cffcb941ea..a2af2e88daf3 100644
--- a/scripts/gcc-goto.sh
+++ b/scripts/gcc-goto.sh
@@ -2,4 +2,20 @@
 # Test for gcc 'asm goto' support
 # Copyright (C) 2010, Jason Baron <jbaron@redhat.com>
 
-echo "int main(void) { entry: asm goto (\"\"::::entry); return 0; }" | $@ -x c - -c -o /dev/null >/dev/null 2>&1 && echo "y"
+cat << "END" | $@ -x c - -c -o /dev/null >/dev/null 2>&1 && echo "y"
+int main(void)
+{
+#ifdef __arm__
+        /*
+         * Not related to asm goto, but used by jump label
+         * and broken on some ARM GCC versions (see GCC Bug 48637).
+         */
+        static struct { int dummy; int state; } tp;
+        asm (".long %c0" :: "i" (&tp.state));
+#endif
+
+entry:
+        asm goto ("" :::: entry);
+        return 0;
+}
+END
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index f32a04c4c5bc..0948c6b5a321 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -931,7 +931,7 @@ sub get_maintainer_role {
     my $start = find_starting_index($index);
     my $end = find_ending_index($index);
 
-    my $role;
+    my $role = "unknown";
     my $subsystem = $typevalue[$start];
     if (length($subsystem) > 20) {
         $subsystem = substr($subsystem, 0, 17);
@@ -1027,8 +1027,13 @@ sub add_categories {
                     if ($email_list) {
                         if (!$hash_list_to{lc($list_address)}) {
                             $hash_list_to{lc($list_address)} = 1;
-                            push(@list_to, [$list_address,
-                                            "open list${list_role}"]);
+                            if ($list_additional =~ m/moderated/) {
+                                push(@list_to, [$list_address,
+                                                "moderated list${list_role}"]);
+                            } else {
+                                push(@list_to, [$list_address,
+                                                "open list${list_role}"]);
+                            }
                         }
                     }
                 }
diff --git a/scripts/headers_check.pl b/scripts/headers_check.pl
index 7957e7a5166a..64ac2380e4d5 100644
--- a/scripts/headers_check.pl
+++ b/scripts/headers_check.pl
@@ -19,6 +19,7 @@
 # 3) Check for leaked CONFIG_ symbols
 
 use strict;
+use File::Basename;
 
 my ($dir, $arch, @files) = @ARGV;
 
@@ -99,6 +100,39 @@ sub check_asm_types
 }
 
 my $linux_types;
+my %import_stack = ();
+sub check_include_typesh
+{
+        my $path = $_[0];
+        my $import_path;
+
+        my $fh;
+        my @file_paths = ($path, $dir . "/" .  $path, dirname($filename) . "/" . $path);
+        for my $possible ( @file_paths ) {
+            if (not $import_stack{$possible} and open($fh, '<', $possible)) {
+                $import_path = $possible;
+                $import_stack{$import_path} = 1;
+                last;
+            }
+        }
+        if (eof $fh) {
+            return;
+        }
+
+        my $line;
+        while ($line = <$fh>) {
+                if ($line =~ m/^\s*#\s*include\s+<linux\/types.h>/) {
+                        $linux_types = 1;
+                        last;
+                }
+                if (my $included = ($line =~ /^\s*#\s*include\s+[<"](\S+)[>"]/)[0]) {
+                        check_include_typesh($included);
+                }
+        }
+        close $fh;
+        delete $import_stack{$import_path};
+}
+
 sub check_sizetypes
 {
         if ($filename =~ /types.h|int-l64.h|int-ll64.h/o) {
@@ -113,6 +147,9 @@ sub check_sizetypes
                 $linux_types = 1;
                 return;
         }
+        if (my $included = ($line =~ /^\s*#\s*include\s+[<"](\S+)[>"]/)[0]) {
+                check_include_typesh($included);
+        }
         if ($line =~ m/__[us](8|16|32|64)\b/) {
                 printf STDERR "$filename:$lineno: " .
                               "found __[us]{8,16,32,64} type " .
@@ -122,4 +159,3 @@ sub check_sizetypes
                 #$ret = 1;
         }
 }
-
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 7c7a5a6cc3f5..52577f052bc1 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -344,10 +344,8 @@ setsym:
 
 int conf_read(const char *name)
 {
-        struct symbol *sym, *choice_sym;
-        struct property *prop;
-        struct expr *e;
-        int i, flags;
+        struct symbol *sym;
+        int i;
 
         sym_set_change_count(0);
 
@@ -357,7 +355,7 @@ int conf_read(const char *name)
         for_all_symbols(i, sym) {
                 sym_calc_value(sym);
                 if (sym_is_choice(sym) || (sym->flags & SYMBOL_AUTO))
-                        goto sym_ok;
+                        continue;
                 if (sym_has_value(sym) && (sym->flags & SYMBOL_WRITE)) {
                         /* check that calculated value agrees with saved value */
                         switch (sym->type) {
@@ -366,30 +364,18 @@ int conf_read(const char *name)
                                 if (sym->def[S_DEF_USER].tri != sym_get_tristate_value(sym))
                                         break;
                                 if (!sym_is_choice(sym))
-                                        goto sym_ok;
+                                        continue;
                                 /* fall through */
                         default:
                                 if (!strcmp(sym->curr.val, sym->def[S_DEF_USER].val))
-                                        goto sym_ok;
+                                        continue;
                                 break;
                         }
                 } else if (!sym_has_value(sym) && !(sym->flags & SYMBOL_WRITE))
                         /* no previous value and not saved */
-                        goto sym_ok;
+                        continue;
                 conf_unsaved++;
                 /* maybe print value in verbose mode... */
-        sym_ok:
-                if (!sym_is_choice(sym))
-                        continue;
-                /* The choice symbol only has a set value (and thus is not new)
-                 * if all its visible childs have values.
-                 */
-                prop = sym_get_choice_prop(sym);
-                flags = sym->flags;
-                expr_list_for_each_sym(prop->expr, e, choice_sym)
-                        if (choice_sym->visible != no)
-                                flags &= choice_sym->flags;
-                sym->flags &= flags | ~SYMBOL_DEF_USER;
         }
 
         for_all_symbols(i, sym) {
@@ -554,35 +540,6 @@ static struct conf_printer header_printer_cb =
 };
 
 /*
- * Generate the __enabled_CONFIG_* and __enabled_CONFIG_*_MODULE macros for
- * use by the IS_{ENABLED,BUILTIN,MODULE} macros. The _MODULE variant is
- * generated even for booleans so that the IS_ENABLED() macro works.
- */
-static void
-header_print__enabled_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg)
-{
-
-        switch (sym->type) {
-        case S_BOOLEAN:
-        case S_TRISTATE: {
-                fprintf(fp, "#define __enabled_" CONFIG_ "%s %d\n",
-                    sym->name, (*value == 'y'));
-                fprintf(fp, "#define __enabled_" CONFIG_ "%s_MODULE %d\n",
-                    sym->name, (*value == 'm'));
-                break;
-        }
-        default:
-                break;
-        }
-}
-
-static struct conf_printer header__enabled_printer_cb =
-{
-        .print_symbol = header_print__enabled_symbol,
-        .print_comment = header_print_comment,
-};
-
-/*
  * Tristate printer
  *
  * This printer is used when generating the `include/config/tristate.conf' file.
@@ -963,16 +920,11 @@ int conf_write_autoconf(void)
         conf_write_heading(out_h, &header_printer_cb, NULL);
 
         for_all_symbols(i, sym) {
-                if (!sym->name)
-                        continue;
-
                 sym_calc_value(sym);
-
-                conf_write_symbol(out_h, sym, &header__enabled_printer_cb, NULL);
-
-                if (!(sym->flags & SYMBOL_WRITE))
+                if (!(sym->flags & SYMBOL_WRITE) || !sym->name)
                         continue;
 
+                /* write symbol to auto.conf, tristate and header files */
                 conf_write_symbol(out, sym, &kconfig_printer_cb, (void *)1);
 
                 conf_write_symbol(tristate, sym, &tristate_printer_cb, (void *)1);
diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index ceadf0e150cf..974d5cb7e30a 100644..100755
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -31,10 +31,12 @@ usage() {
         echo "  -h    display this help text"
         echo "  -m    only merge the fragments, do not execute the make command"
         echo "  -n    use allnoconfig instead of alldefconfig"
+        echo "  -r    list redundant entries when merging fragments"
 }
 
 MAKE=true
 ALLTARGET=alldefconfig
+WARNREDUN=false
 
 while true; do
         case $1 in
@@ -52,18 +54,27 @@ while true; do
                 usage
                 exit
                 ;;
+        "-r")
+                WARNREDUN=true
+                shift
+                continue
+                ;;
         *)
                 break
                 ;;
         esac
 done
 
-
+INITFILE=$1
+shift;
 
 MERGE_LIST=$*
 SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(CONFIG_[a-zA-Z0-9_]*\)[= ].*/\2/p"
 TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX)
 
+echo "Using $INITFILE as base"
+cat $INITFILE > $TMP_FILE
+
 # Merge files, printing warnings on overrided values
 for MERGE_FILE in $MERGE_LIST ; do
         echo "Merging $MERGE_FILE"
@@ -79,6 +90,8 @@ for MERGE_FILE in $MERGE_LIST ; do
                         echo Previous  value: $PREV_VAL
                         echo New value:       $NEW_VAL
                         echo
+                        elif [ "$WARNREDUN" = "true" ]; then
+                        echo Value of $CFG is redundant by fragment $MERGE_FILE:
                         fi
                         sed -i "/$CFG[ =]/d" $TMP_FILE
                 fi
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 071f00c3046e..22a3c400fc41 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -262,11 +262,18 @@ static struct symbol *sym_calc_choice(struct symbol *sym)
         struct symbol *def_sym;
         struct property *prop;
         struct expr *e;
+        int flags;
 
         /* first calculate all choice values' visibilities */
+        flags = sym->flags;
         prop = sym_get_choice_prop(sym);
-        expr_list_for_each_sym(prop->expr, e, def_sym)
+        expr_list_for_each_sym(prop->expr, e, def_sym) {
                 sym_calc_visibility(def_sym);
+                if (def_sym->visible != no)
+                        flags &= def_sym->flags;
+        }
+
+        sym->flags &= flags | ~SYMBOL_DEF_USER;
 
         /* is the user choice visible? */
         def_sym = sym->def[S_DEF_USER].val;
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index b89efe6e4c85..8e730ccc3f2b 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -1029,6 +1029,31 @@ static int do_amba_entry(const char *filename,
 }
 ADD_TO_DEVTABLE("amba", struct amba_id, do_amba_entry);
 
+/* LOOKS like x86cpu:vendor:VVVV:family:FFFF:model:MMMM:feature:*,FEAT,*
+ * All fields are numbers. It would be nicer to use strings for vendor
+ * and feature, but getting those out of the build system here is too
+ * complicated.
+ */
+
+static int do_x86cpu_entry(const char *filename, struct x86_cpu_id *id,
+                           char *alias)
+{
+        id->feature = TO_NATIVE(id->feature);
+        id->family = TO_NATIVE(id->family);
+        id->model = TO_NATIVE(id->model);
+        id->vendor = TO_NATIVE(id->vendor);
+
+        strcpy(alias, "x86cpu:");
+        ADD(alias, "vendor:",  id->vendor != X86_VENDOR_ANY, id->vendor);
+        ADD(alias, ":family:", id->family != X86_FAMILY_ANY, id->family);
+        ADD(alias, ":model:",  id->model  != X86_MODEL_ANY,  id->model);
+        strcat(alias, ":feature:*");
+        if (id->feature != X86_FEATURE_ANY)
+                sprintf(alias + strlen(alias), "%04X*", id->feature);
+        return 1;
+}
+ADD_TO_DEVTABLE("x86cpu", struct x86_cpu_id, do_x86cpu_entry);
+
 /* Does namelen bytes of name exactly match the symbol? */
 static bool sym_is(const char *name, unsigned namelen, const char *symbol)
 {
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 9adb667dd31a..c4e7d1510f9d 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -132,8 +132,10 @@ static struct module *new_module(char *modname)
         /* strip trailing .o */
         s = strrchr(p, '.');
         if (s != NULL)
-                if (strcmp(s, ".o") == 0)
+                if (strcmp(s, ".o") == 0) {
                         *s = '\0';
+                        mod->is_dot_o = 1;
+                }
 
         /* add to list */
         mod->name = p;
@@ -587,7 +589,8 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
         unsigned int crc;
         enum export export;
 
-        if (!is_vmlinux(mod->name) && strncmp(symname, "__ksymtab", 9) == 0)
+        if ((!is_vmlinux(mod->name) || mod->is_dot_o) &&
+            strncmp(symname, "__ksymtab", 9) == 0)
                 export = export_from_secname(info, get_secindex(info, sym));
         else
                 export = export_from_sec(info, get_secindex(info, sym));
@@ -849,7 +852,7 @@ static void check_section(const char *modname, struct elf_info *elf,
 
 #define ALL_INIT_DATA_SECTIONS \
         ".init.setup$", ".init.rodata$", \
-        ".devinit.rodata$", ".cpuinit.rodata$", ".meminit.rodata$" \
+        ".devinit.rodata$", ".cpuinit.rodata$", ".meminit.rodata$", \
         ".init.data$", ".devinit.data$", ".cpuinit.data$", ".meminit.data$"
 #define ALL_EXIT_DATA_SECTIONS \
         ".exit.data$", ".devexit.data$", ".cpuexit.data$", ".memexit.data$"
diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
index 2031119080dc..51207e4d5f8b 100644
--- a/scripts/mod/modpost.h
+++ b/scripts/mod/modpost.h
@@ -113,6 +113,7 @@ struct module {
         int has_cleanup;
         struct buffer dev_table_buf;
         char         srcversion[25];
+        int is_dot_o;
 };
 
 struct elf_info {
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 3c6c0b14c807..eee5f8ed2493 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -97,6 +97,7 @@ mkdir -m 755 -p "$libc_headers_dir/DEBIAN"
 mkdir -p "$libc_headers_dir/usr/share/doc/$libc_headers_packagename"
 mkdir -m 755 -p "$kernel_headers_dir/DEBIAN"
 mkdir -p "$kernel_headers_dir/usr/share/doc/$kernel_headers_packagename"
+mkdir -p "$kernel_headers_dir/lib/modules/$version/"
 if [ "$ARCH" = "um" ] ; then
         mkdir -p "$tmpdir/usr/lib/uml/modules/$version" "$tmpdir/usr/bin"
 fi
@@ -120,15 +121,19 @@ else
 fi
 
 if grep -q '^CONFIG_MODULES=y' .config ; then
-        INSTALL_MOD_PATH="$tmpdir" make KBUILD_SRC= modules_install
+        INSTALL_MOD_PATH="$tmpdir" $MAKE KBUILD_SRC= modules_install
+        rm -f "$tmpdir/lib/modules/$version/build"
+        rm -f "$tmpdir/lib/modules/$version/source"
         if [ "$ARCH" = "um" ] ; then
                 mv "$tmpdir/lib/modules/$version"/* "$tmpdir/usr/lib/uml/modules/$version/"
                 rmdir "$tmpdir/lib/modules/$version"
         fi
 fi
 
-make headers_check
-make headers_install INSTALL_HDR_PATH="$libc_headers_dir/usr"
+if [ "$ARCH" != "um" ]; then
+        $MAKE headers_check KBUILD_SRC=
+        $MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr"
+fi
 
 # Install the maintainer scripts
 # Note: hook scripts under /etc/kernel are also executed by official Debian
@@ -245,6 +250,7 @@ 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 -)
+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)
 
@@ -259,8 +265,6 @@ Description: Linux kernel headers for $KERNELRELEASE on $arch
  This is useful for people who need to build external modules
 EOF
 
-create_package "$kernel_headers_packagename" "$kernel_headers_dir"
-
 # Do we have firmware? Move it out of the way and build it into a package.
 if [ -e "$tmpdir/lib/firmware" ]; then
         mv "$tmpdir/lib/firmware" "$fwdir/lib/"
@@ -287,7 +291,11 @@ Description: Linux support headers for userspace development
  are used by the installed headers for GNU glibc and other system libraries.
 EOF
 
-create_package "$libc_headers_packagename" "$libc_headers_dir"
+if [ "$ARCH" != "um" ]; then
+        create_package "$kernel_headers_packagename" "$kernel_headers_dir"
+        create_package "$libc_headers_packagename" "$libc_headers_dir"
+fi
+
 create_package "$packagename" "$tmpdir"
 
 exit 0
diff --git a/scripts/patch-kernel b/scripts/patch-kernel
index 20fb25c23382..d000ea3a41fd 100755
--- a/scripts/patch-kernel
+++ b/scripts/patch-kernel
@@ -116,6 +116,10 @@ findFile () {
                 ext=".bz2"
                 name="bzip2"
                 uncomp="bunzip2 -dc"
+  elif [ -r ${filebase}.xz ]; then
+                ext=".xz"
+                name="xz"
+                uncomp="xz -dc"
   elif [ -r ${filebase}.zip ]; then
                 ext=".zip"
                 name="zip"
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 4d403844e137..bd6dca8a0ab2 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -75,8 +75,7 @@ scm_version()
                 [ -w . ] && git update-index --refresh --unmerged > /dev/null
 
                 # Check for uncommitted changes
-                if git diff-index --name-only HEAD | grep -v "^scripts/package" \
-                    | read dummy; then
+                if git diff-index --name-only HEAD | grep -qv "^scripts/package"; then
                         printf '%s' -dirty
                 fi
 
diff --git a/scripts/tags.sh b/scripts/tags.sh
index 833813a99e7c..cf7b12fee573 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -116,7 +116,7 @@ docscope()
 
 dogtags()
 {
-        all_sources | gtags -f -
+        all_sources | gtags -i -f -
 }
 
 exuberant()
@@ -166,9 +166,6 @@ exuberant()
         all_defconfigs | xargs -r $1 -a                         \
         --langdef=dotconfig --language-force=dotconfig          \
         --regex-dotconfig='/^#?[[:blank:]]*(CONFIG_[[:alnum:]_]+)/\1/'
-
-        # Remove structure forward declarations.
-        LANG=C sed -i -e '/^\([a-zA-Z_][a-zA-Z0-9_]*\)\t.*\t\/\^struct \1;.*\$\/;"\tx$/d' tags
 }
 
 emacs()
@@ -233,6 +230,7 @@ if [ "${ARCH}" = "um" ]; then
         fi
 fi
 
+remove_structs=
 case "$1" in
         "cscope")
                 docscope
@@ -245,10 +243,17 @@ case "$1" in
         "tags")
                 rm -f tags
                 xtags ctags
+                remove_structs=y
                 ;;
 
         "TAGS")
                 rm -f TAGS
                 xtags etags
+                remove_structs=y
                 ;;
 esac
+
+# Remove structure forward declarations.
+if [ -n "$remove_structs" ]; then
+    LANG=C sed -i -e '/^\([a-zA-Z_][a-zA-Z0-9_]*\)\t.*\t\/\^struct \1;.*\$\/;"\tx$/d' $1
+fi
diff --git a/scripts/xz_wrap.sh b/scripts/xz_wrap.sh
index 17a5798c29da..7a2d372f4885 100644
--- a/scripts/xz_wrap.sh
+++ b/scripts/xz_wrap.sh
@@ -12,8 +12,8 @@
 BCJ=
 LZMA2OPTS=
 
-case $ARCH in
-        x86|x86_64)     BCJ=--x86 ;;
+case $SRCARCH in
+        x86)            BCJ=--x86 ;;
         powerpc)        BCJ=--powerpc ;;
         ia64)           BCJ=--ia64; LZMA2OPTS=pb=4 ;;
         arm)            BCJ=--arm ;;