20 files changed, 378 insertions, 125 deletions

diff --git a/scripts/Makefile b/scripts/Makefile
index 1d07860f6c42..890df5c6adfb 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -39,4 +39,4 @@ subdir-$(CONFIG_SECURITY_SELINUX) += selinux
 subdir-$(CONFIG_DTC)         += dtc
 
 # Let clean descend into subdirs
-subdir- += basic kconfig package selinux
+subdir- += basic kconfig package
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 003bc263105a..bf3e6778cd71 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -50,67 +50,6 @@ ifeq ($(KBUILD_NOPEDANTIC),)
         endif
 endif
 
-#
-# make W=... settings
-#
-# W=1 - warnings that may be relevant and does not occur too often
-# W=2 - warnings that occur quite often but may still be relevant
-# W=3 - the more obscure warnings, can most likely be ignored
-#
-# $(call cc-option, -W...) handles gcc -W.. options which
-# are not supported by all versions of the compiler
-ifdef KBUILD_ENABLE_EXTRA_GCC_CHECKS
-warning-  := $(empty)
-
-warning-1 := -Wextra -Wunused -Wno-unused-parameter
-warning-1 += -Wmissing-declarations
-warning-1 += -Wmissing-format-attribute
-warning-1 += $(call cc-option, -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)
-
-# Clang
-warning-1 += $(call cc-disable-warning, initializer-overrides)
-warning-1 += $(call cc-disable-warning, unused-value)
-warning-1 += $(call cc-disable-warning, format)
-warning-1 += $(call cc-disable-warning, unknown-warning-option)
-warning-1 += $(call cc-disable-warning, sign-compare)
-warning-1 += $(call cc-disable-warning, format-zero-length)
-warning-1 += $(call cc-disable-warning, uninitialized)
-warning-1 += $(call cc-option, -fcatch-undefined-behavior)
-
-warning-2 := -Waggregate-return
-warning-2 += -Wcast-align
-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
-warning-3 += -Wconversion
-warning-3 += -Wpacked
-warning-3 += -Wpadded
-warning-3 += -Wpointer-arith
-warning-3 += -Wredundant-decls
-warning-3 += -Wswitch-default
-warning-3 += $(call cc-option, -Wpacked-bitfield-compat)
-warning-3 += $(call cc-option, -Wvla)
-
-warning := $(warning-$(findstring 1, $(KBUILD_ENABLE_EXTRA_GCC_CHECKS)))
-warning += $(warning-$(findstring 2, $(KBUILD_ENABLE_EXTRA_GCC_CHECKS)))
-warning += $(warning-$(findstring 3, $(KBUILD_ENABLE_EXTRA_GCC_CHECKS)))
-
-ifeq ("$(strip $(warning))","")
-        $(error W=$(KBUILD_ENABLE_EXTRA_GCC_CHECKS) is unknown)
-endif
-
-KBUILD_CFLAGS += $(warning)
-endif
-
 include scripts/Makefile.lib
 
 ifdef host-progs
@@ -342,7 +281,7 @@ $(real-objs-m)      : modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)
 $(real-objs-m:.o=.s): modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)
 
 quiet_cmd_as_s_S = CPP $(quiet_modtag) $@
-cmd_as_s_S       = $(CPP) $(a_flags)   -o $@ $< 
+cmd_as_s_S       = $(CPP) $(a_flags)   -o $@ $<
 
 $(obj)/%.s: $(src)/%.S FORCE
         $(call if_changed_dep,as_s_S)
@@ -436,7 +375,7 @@ link_multi_deps =                     \
 $(filter $(addprefix $(obj)/,         \
 $($(subst $(obj)/,,$(@:.o=-objs)))    \
 $($(subst $(obj)/,,$(@:.o=-y)))), $^)
- 
+
 quiet_cmd_link_multi-y = LD      $@
 cmd_link_multi-y = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps) $(cmd_secanalysis)
 
diff --git a/scripts/Makefile.extrawarn b/scripts/Makefile.extrawarn
new file mode 100644
index 000000000000..65643506c71c
--- /dev/null
+++ b/scripts/Makefile.extrawarn
@@ -0,0 +1,67 @@
+# ==========================================================================
+#
+# make W=... settings
+#
+# W=1 - warnings that may be relevant and does not occur too often
+# W=2 - warnings that occur quite often but may still be relevant
+# W=3 - the more obscure warnings, can most likely be ignored
+#
+# $(call cc-option, -W...) handles gcc -W.. options which
+# are not supported by all versions of the compiler
+# ==========================================================================
+
+ifeq ("$(origin W)", "command line")
+  export KBUILD_ENABLE_EXTRA_GCC_CHECKS := $(W)
+endif
+
+ifdef KBUILD_ENABLE_EXTRA_GCC_CHECKS
+warning-  := $(empty)
+
+warning-1 := -Wextra -Wunused -Wno-unused-parameter
+warning-1 += -Wmissing-declarations
+warning-1 += -Wmissing-format-attribute
+warning-1 += $(call cc-option, -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)
+
+# Clang
+warning-1 += $(call cc-disable-warning, initializer-overrides)
+warning-1 += $(call cc-disable-warning, unused-value)
+warning-1 += $(call cc-disable-warning, format)
+warning-1 += $(call cc-disable-warning, unknown-warning-option)
+warning-1 += $(call cc-disable-warning, sign-compare)
+warning-1 += $(call cc-disable-warning, format-zero-length)
+warning-1 += $(call cc-disable-warning, uninitialized)
+warning-1 += $(call cc-option, -fcatch-undefined-behavior)
+
+warning-2 := -Waggregate-return
+warning-2 += -Wcast-align
+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
+warning-3 += -Wconversion
+warning-3 += -Wpacked
+warning-3 += -Wpadded
+warning-3 += -Wpointer-arith
+warning-3 += -Wredundant-decls
+warning-3 += -Wswitch-default
+warning-3 += $(call cc-option, -Wpacked-bitfield-compat)
+warning-3 += $(call cc-option, -Wvla)
+
+warning := $(warning-$(findstring 1, $(KBUILD_ENABLE_EXTRA_GCC_CHECKS)))
+warning += $(warning-$(findstring 2, $(KBUILD_ENABLE_EXTRA_GCC_CHECKS)))
+warning += $(warning-$(findstring 3, $(KBUILD_ENABLE_EXTRA_GCC_CHECKS)))
+
+ifeq ("$(strip $(warning))","")
+        $(error W=$(KBUILD_ENABLE_EXTRA_GCC_CHECKS) is unknown)
+endif
+
+KBUILD_CFLAGS += $(warning)
+endif
diff --git a/scripts/Makefile.fwinst b/scripts/Makefile.fwinst
index 4d908d16c035..d8e335eed226 100644
--- a/scripts/Makefile.fwinst
+++ b/scripts/Makefile.fwinst
@@ -18,31 +18,29 @@ include $(srctree)/$(obj)/Makefile
 include scripts/Makefile.host
 
 mod-fw := $(fw-shipped-m)
-# If CONFIG_FIRMWARE_IN_KERNEL isn't set, then install the 
+# If CONFIG_FIRMWARE_IN_KERNEL isn't set, then install the
 # firmware for in-kernel drivers too.
 ifndef CONFIG_FIRMWARE_IN_KERNEL
 mod-fw += $(fw-shipped-y)
 endif
 
+ifneq ($(KBUILD_SRC),)
+# Create output directory if not already present
+_dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj))
+
+firmware-dirs := $(sort $(addprefix $(objtree)/$(obj)/,$(dir $(fw-external-y) $(fw-shipped-all))))
+# Create directories for firmware in subdirectories
+_dummy := $(foreach d,$(firmware-dirs), $(shell [ -d $(d) ] || mkdir -p $(d)))
+endif
+
 installed-mod-fw := $(addprefix $(INSTALL_FW_PATH)/,$(mod-fw))
 
 installed-fw := $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-all))
-installed-fw-dirs := $(sort $(dir $(installed-fw))) $(INSTALL_FW_PATH)/./
-
-# Workaround for make < 3.81, where .SECONDEXPANSION doesn't work.
-PHONY += $(INSTALL_FW_PATH)/$$(%) install-all-dirs
-$(INSTALL_FW_PATH)/$$(%): install-all-dirs
-        @true
-install-all-dirs: $(installed-fw-dirs)
-        @true
 
 quiet_cmd_install = INSTALL $(subst $(srctree)/,,$@)
-      cmd_install = $(INSTALL) -m0644 $< $@
-
-$(installed-fw-dirs):
-        $(call cmd,mkdir)
+      cmd_install = mkdir -p $(@D); $(INSTALL) -m0644 $< $@
 
-$(installed-fw): $(INSTALL_FW_PATH)/%: $(obj)/% | $(INSTALL_FW_PATH)/$$(dir %)
+$(installed-fw): $(INSTALL_FW_PATH)/%: $(obj)/%
         $(call cmd,install)
 
 PHONY +=  __fw_install __fw_modinst FORCE
diff --git a/scripts/Makefile.host b/scripts/Makefile.host
index b0ec4be67674..66893643fd7d 100644
--- a/scripts/Makefile.host
+++ b/scripts/Makefile.host
@@ -166,4 +166,4 @@ $(host-cshlib): $(obj)/%: $(host-cshobjs) FORCE
         $(call if_changed,host-cshlib)
 
 targets += $(host-csingle)  $(host-cmulti) $(host-cobjs)\
-           $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs) 
+           $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs)
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 6a5b0decb797..260bf8acfce9 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -27,7 +27,7 @@ lib-y := $(filter-out $(obj-y), $(sort $(lib-y) $(lib-m)))
 # ---------------------------------------------------------------------------
 # o if we encounter foo/ in $(obj-y), replace it by foo/built-in.o
 #   and add the directory to the list of dirs to descend into: $(subdir-y)
-# o if we encounter foo/ in $(obj-m), remove it from $(obj-m) 
+# o if we encounter foo/ in $(obj-m), remove it from $(obj-m)
 #   and add the directory to the list of dirs to descend into: $(subdir-m)
 
 # Determine modorder.
@@ -46,7 +46,7 @@ obj-m		:= $(filter-out %/, $(obj-m))
 
 subdir-ym       := $(sort $(subdir-y) $(subdir-m))
 
-# if $(foo-objs) exists, foo.o is a composite object 
+# if $(foo-objs) exists, foo.o is a composite object
 multi-used-y := $(sort $(foreach m,$(obj-y), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m))))
 multi-used-m := $(sort $(foreach m,$(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m))))
 multi-used   := $(multi-used-y) $(multi-used-m)
@@ -91,7 +91,7 @@ obj-dirs	:= $(addprefix $(obj)/,$(obj-dirs))
 
 # These flags are needed for modversions and compiling, so we define them here
 # already
-# $(modname_flags) #defines KBUILD_MODNAME as the name of the module it will 
+# $(modname_flags) #defines KBUILD_MODNAME as the name of the module it will
 # end up in (or would, if it gets compiled in)
 # Note: Files that end up in two or more modules are compiled without the
 #       KBUILD_MODNAME definition. The reason is that any made-up name would
@@ -212,7 +212,7 @@ $(obj)/%: $(src)/%_shipped
 
 # Commands useful for building a boot image
 # ===========================================================================
-# 
+#
 #       Use as following:
 #
 #       target: source(s) FORCE
@@ -226,7 +226,7 @@ $(obj)/%: $(src)/%_shipped
 
 quiet_cmd_ld = LD      $@
 cmd_ld = $(LD) $(LDFLAGS) $(ldflags-y) $(LDFLAGS_$(@F)) \
-               $(filter-out FORCE,$^) -o $@ 
+               $(filter-out FORCE,$^) -o $@
 
 # Objcopy
 # ---------------------------------------------------------------------------
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 34eb2160489d..010b18ef4ea0 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -24,6 +24,7 @@ my $emacs = 0;
 my $terse = 0;
 my $file = 0;
 my $check = 0;
+my $check_orig = 0;
 my $summary = 1;
 my $mailback = 0;
 my $summary_file = 0;
@@ -146,6 +147,7 @@ GetOptions(
 help(0) if ($help);
 
 $fix = 1 if ($fix_inplace);
+$check_orig = $check;
 
 my $exit = 0;
 
@@ -397,6 +399,11 @@ foreach my $entry (@mode_permission_funcs) {
         $mode_perms_search .= $entry->[0];
 }
 
+our $declaration_macros = qr{(?x:
+        (?:$Storage\s+)?(?:DECLARE|DEFINE)_[A-Z]+\s*\(|
+        (?:$Storage\s+)?LIST_HEAD\s*\(
+)};
+
 our $allowed_asm_includes = qr{(?x:
         irq|
         memory
@@ -1808,11 +1815,13 @@ sub process {
                 $here = "#$linenr: " if (!$file);
                 $here = "#$realline: " if ($file);
 
+                my $found_file = 0;
                 # extract the filename as it passes
                 if ($line =~ /^diff --git.*?(\S+)$/) {
                         $realfile = $1;
                         $realfile =~ s@^([^/]*)/@@ if (!$file);
                         $in_commit_log = 0;
+                        $found_file = 1;
                 } elsif ($line =~ /^\+\+\+\s+(\S+)/) {
                         $realfile = $1;
                         $realfile =~ s@^([^/]*)/@@ if (!$file);
@@ -1829,6 +1838,15 @@ sub process {
                                 ERROR("MODIFIED_INCLUDE_ASM",
                                       "do not modify files in include/asm, change architecture specific files in include/asm-<architecture>\n" . "$here$rawline\n");
                         }
+                        $found_file = 1;
+                }
+
+                if ($found_file) {
+                        if ($realfile =~ m@^(drivers/net/|net/)@) {
+                                $check = 1;
+                        } else {
+                                $check = $check_orig;
+                        }
                         next;
                 }
 
@@ -1926,6 +1944,12 @@ sub process {
                         }
                 }
 
+# Check for old stable address
+                if ($line =~ /^\s*cc:\s*.*<?\bstable\@kernel\.org\b>?.*$/i) {
+                        ERROR("STABLE_ADDRESS",
+                              "The 'stable' address should be 'stable\@vger.kernel.org'\n" . $herecurr);
+                }
+
 # Check for unwanted Gerrit info
                 if ($in_commit_log && $line =~ /^\s*change-id:/i) {
                         ERROR("GERRIT_CHANGE_ID",
@@ -2093,8 +2117,10 @@ sub process {
 
                         foreach my $compat (@compats) {
                                 my $compat2 = $compat;
-                                $compat2 =~ s/\,[a-z]*\-/\,<\.\*>\-/;
-                                `grep -Erq "$compat|$compat2" $dt_path`;
+                                $compat2 =~ s/\,[a-zA-Z0-9]*\-/\,<\.\*>\-/;
+                                my $compat3 = $compat;
+                                $compat3 =~ s/\,([a-z]*)[0-9]*\-/\,$1<\.\*>\-/;
+                                `grep -Erq "$compat|$compat2|$compat3" $dt_path`;
                                 if ( $? >> 8 ) {
                                         WARN("UNDOCUMENTED_DT_STRING",
                                              "DT compatible string \"$compat\" appears un-documented -- check $dt_path\n" . $herecurr);
@@ -2266,18 +2292,37 @@ sub process {
                 }
 
 # check for missing blank lines after declarations
-                if ($realfile =~ m@^(drivers/net/|net/)@ &&
-                    $prevline =~ /^\+\s+$Declare\s+$Ident/ &&
-                    !($prevline =~ /(?:$Compare|$Assignment|$Operators)\s*$/ ||
-                      $prevline =~ /(?:\{\s*|\\)$/) &&          #extended lines
-                    $sline =~ /^\+\s+/ &&                       #Not at char 1
-                    !($sline =~ /^\+\s+$Declare/ ||
-                      $sline =~ /^\+\s+$Ident\s+$Ident/ ||      #eg: typedef foo
+                if ($sline =~ /^\+\s+\S/ &&                     #Not at char 1
+                        # actual declarations
+                    ($prevline =~ /^\+\s+$Declare\s*$Ident\s*[=,;:\[]/ ||
+                        # foo bar; where foo is some local typedef or #define
+                     $prevline =~ /^\+\s+$Ident(?:\s+|\s*\*\s*)$Ident\s*[=,;\[]/ ||
+                        # known declaration macros
+                     $prevline =~ /^\+\s+$declaration_macros/) &&
+                        # for "else if" which can look like "$Ident $Ident"
+                    !($prevline =~ /^\+\s+$c90_Keywords\b/ ||
+                        # other possible extensions of declaration lines
+                      $prevline =~ /(?:$Compare|$Assignment|$Operators)\s*$/ ||
+                        # not starting a section or a macro "\" extended line
+                      $prevline =~ /(?:\{\s*|\\)$/) &&
+                        # looks like a declaration
+                    !($sline =~ /^\+\s+$Declare\s*$Ident\s*[=,;:\[]/ ||
+                        # foo bar; where foo is some local typedef or #define
+                      $sline =~ /^\+\s+$Ident(?:\s+|\s*\*\s*)$Ident\s*[=,;\[]/ ||
+                        # known declaration macros
+                      $sline =~ /^\+\s+$declaration_macros/ ||
+                        # start of struct or union or enum
                       $sline =~ /^\+\s+(?:union|struct|enum|typedef)\b/ ||
-                      $sline =~ /^\+\s+(?:$|[\{\}\.\#\"\?\:\(])/ ||
-                      $sline =~ /^\+\s+\(?\s*(?:$Compare|$Assignment|$Operators)/)) {
+                        # start or end of block or continuation of declaration
+                      $sline =~ /^\+\s+(?:$|[\{\}\.\#\"\?\:\(\[])/ ||
+                        # bitfield continuation
+                      $sline =~ /^\+\s+$Ident\s*:\s*\d+\s*[,;]/ ||
+                        # other possible extensions of declaration lines
+                      $sline =~ /^\+\s+\(?\s*(?:$Compare|$Assignment|$Operators)/) &&
+                        # indentation of previous and current line are the same
+                    (($prevline =~ /\+(\s+)\S/) && $sline =~ /^\+$1\S/)) {
                         WARN("SPACING",
-                             "networking uses a blank line after declarations\n" . $hereprev);
+                             "Missing a blank line after declarations\n" . $hereprev);
                 }
 
 # check for spaces at the beginning of a line.
@@ -3431,6 +3476,13 @@ sub process {
                         }
                 }
 
+# unnecessary return in a void function? (a single leading tab, then return;)
+                if ($sline =~ /^\+\treturn\s*;\s*$/ &&
+                    $prevline =~ /^\+/) {
+                        WARN("RETURN_VOID",
+                             "void function return statements are not generally useful\n" . $herecurr);
+                }
+
 # if statements using unnecessary parentheses - ie: if ((foo == bar))
                 if ($^V && $^V ge 5.10.0 &&
                     $line =~ /\bif\s*((?:\(\s*){2,})/) {
@@ -3782,6 +3834,17 @@ sub process {
                                         WARN("DO_WHILE_MACRO_WITH_TRAILING_SEMICOLON",
                                              "do {} while (0) macros should not be semicolon terminated\n" . "$herectx");
                                 }
+                        } elsif ($dstat =~ /^\+\s*#\s*define\s+$Ident.*;\s*$/) {
+                                $ctx =~ s/\n*$//;
+                                my $cnt = statement_rawlines($ctx);
+                                my $herectx = $here . "\n";
+
+                                for (my $n = 0; $n < $cnt; $n++) {
+                                        $herectx .= raw_line($linenr, $n) . "\n";
+                                }
+
+                                WARN("TRAILING_SEMICOLON",
+                                     "macros should not use a trailing semicolon\n" . "$herectx");
                         }
                 }
 
@@ -4264,6 +4327,27 @@ sub process {
                              "unchecked sscanf return value\n" . "$here\n$stat_real\n");
                 }
 
+# check for simple sscanf that should be kstrto<foo>
+                if ($^V && $^V ge 5.10.0 &&
+                    defined $stat &&
+                    $line =~ /\bsscanf\b/) {
+                        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);
+                        }
+                        if ($stat_real =~ /\bsscanf\b\s*\(\s*$FuncArg\s*,\s*("[^"]+")/) {
+                                my $format = $6;
+                                my $count = $format =~ tr@%@%@;
+                                if ($count == 1 &&
+                                    $format =~ /^"\%(?i:ll[udxi]|[udxi]ll|ll|[hl]h?[udxi]|[udxi][hl]h?|[hl]h?|[udxi])"$/) {
+                                        WARN("SSCANF_TO_KSTRTO",
+                                             "Prefer kstrto<type> to single variable sscanf\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) {
@@ -4328,6 +4412,30 @@ sub process {
                             "Prefer $3(sizeof(*$1)...) over $3($4...)\n" . $herecurr);
                 }
 
+# check for k[mz]alloc with multiplies that could be kmalloc_array/kcalloc
+                if ($^V && $^V ge 5.10.0 &&
+                    $line =~ /\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*(k[mz]alloc)\s*\(\s*($FuncArg)\s*\*\s*($FuncArg)/) {
+                        my $oldfunc = $3;
+                        my $a1 = $4;
+                        my $a2 = $10;
+                        my $newfunc = "kmalloc_array";
+                        $newfunc = "kcalloc" if ($oldfunc eq "kzalloc");
+                        if ($a1 =~ /^sizeof\s*\S/ || $a2 =~ /^sizeof\s*\S/) {
+                                if (WARN("ALLOC_WITH_MULTIPLY",
+                                         "Prefer $newfunc over $oldfunc with multiply\n" . $herecurr) &&
+                                    $fix) {
+                                        my $r1 = $a1;
+                                        my $r2 = $a2;
+                                        if ($a1 =~ /^sizeof\s*\S/) {
+                                                $r1 = $a2;
+                                                $r2 = $a1;
+                                        }
+                                        $fixed[$linenr - 1] =~ s/\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*(k[mz]alloc)\s*\(\s*($FuncArg)\s*\*\s*($FuncArg)/$1 . ' = ' . "$newfunc(" . trim($r1) . ', ' . trim($r2)/e;
+
+                                }
+                        }
+                }
+
 # check for krealloc arg reuse
                 if ($^V && $^V ge 5.10.0 &&
                     $line =~ /\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*krealloc\s*\(\s*\1\s*,/) {
@@ -4443,10 +4551,10 @@ sub process {
                              "$1 is obsolete, use k$3 instead\n" . $herecurr);
                 }
 
-# check for __initcall(), use device_initcall() explicitly please
+# check for __initcall(), use device_initcall() explicitly or more appropriate function please
                 if ($line =~ /^.\s*__initcall\s*\(/) {
                         WARN("USE_DEVICE_INITCALL",
-                             "please use device_initcall() instead of __initcall()\n" . $herecurr);
+                             "please use device_initcall() or more appropriate function instead of __initcall() (see include/linux/init.h)\n" . $herecurr);
                 }
 
 # check for various ops structs, ensure they are const.
diff --git a/scripts/checksyscalls.sh b/scripts/checksyscalls.sh
index fd8fa9aa7c4e..5b3add31f9f1 100755
--- a/scripts/checksyscalls.sh
+++ b/scripts/checksyscalls.sh
@@ -25,7 +25,7 @@ cat << EOF
 #define __IGNORE_rmdir          /* unlinkat */
 #define __IGNORE_lchown         /* fchownat */
 #define __IGNORE_access         /* faccessat */
-#define __IGNORE_rename         /* renameat */
+#define __IGNORE_rename         /* renameat2 */
 #define __IGNORE_readlink       /* readlinkat */
 #define __IGNORE_symlink        /* symlinkat */
 #define __IGNORE_utimes         /* futimesat */
@@ -37,6 +37,9 @@ cat << EOF
 #define __IGNORE_lstat64        /* fstatat64 */
 #endif
 
+/* Missing flags argument */
+#define __IGNORE_renameat       /* renameat2 */
+
 /* CLOEXEC flag */
 #define __IGNORE_pipe           /* pipe2 */
 #define __IGNORE_dup2           /* dup3 */
diff --git a/scripts/conmakehash.c b/scripts/conmakehash.c
index 263a44d57fa9..61bbda54cf13 100644
--- a/scripts/conmakehash.c
+++ b/scripts/conmakehash.c
@@ -104,7 +104,7 @@ int main(int argc, char *argv[])
         }
     }
 
-  /* For now we assume the default font is always 256 characters. */    
+  /* For now we assume the default font is always 256 characters. */
   fontlen = 256;
 
   /* Initialize table */
@@ -236,15 +236,15 @@ int main(int argc, char *argv[])
     }
 
   /* Okay, we hit EOF, now output hash table */
-  
+
   fclose(ctbl);
-  
+
 
   /* Compute total size of Unicode list */
   nuni = 0;
   for ( i = 0 ; i < fontlen ; i++ )
     nuni += unicount[i];
-  
+
   printf("\
 /*\n\
  * Do not edit this file; it was automatically generated by\n\
@@ -268,9 +268,9 @@ u8 dfont_unicount[%d] = \n\
       else
         printf(", ");
     }
-  
+
   printf("\nu16 dfont_unitable[%d] = \n{\n\t", nuni);
-  
+
   fp0 = 0;
   nent = 0;
   for ( i = 0 ; i < nuni ; i++ )
diff --git a/scripts/decode_stacktrace.sh b/scripts/decode_stacktrace.sh
new file mode 100755
index 000000000000..515c4c00e957
--- /dev/null
+++ b/scripts/decode_stacktrace.sh
@@ -0,0 +1,126 @@
+#!/bin/bash
+# (c) 2014, Sasha Levin <sasha.levin@oracle.com>
+#set -x
+
+if [[ $# != 2 ]]; then
+        echo "Usage:"
+        echo "  $0 [vmlinux] [base path]"
+        exit 1
+fi
+
+vmlinux=$1
+basepath=$2
+declare -A cache
+
+parse_symbol() {
+        # The structure of symbol at this point is:
+        #   [name]+[offset]/[total length]
+        #
+        # For example:
+        #   do_basic_setup+0x9c/0xbf
+
+
+        # Strip the symbol name so that we could look it up
+        local name=${symbol%+*}
+
+        # Use 'nm vmlinux' to figure out the base address of said symbol.
+        # It's actually faster to call it every time than to load it
+        # all into bash.
+        if [[ "${cache[$name]+isset}" == "isset" ]]; then
+                local base_addr=${cache[$name]}
+        else
+                local base_addr=$(nm "$vmlinux" | grep -i ' t ' | awk "/ $name\$/ {print \$1}" | head -n1)
+                cache["$name"]="$base_addr"
+        fi
+        # Let's start doing the math to get the exact address into the
+        # symbol. First, strip out the symbol total length.
+        local expr=${symbol%/*}
+
+        # Now, replace the symbol name with the base address we found
+        # before.
+        expr=${expr/$name/0x$base_addr}
+
+        # Evaluate it to find the actual address
+        expr=$((expr))
+        local address=$(printf "%x\n" "$expr")
+
+        # Pass it to addr2line to get filename and line number
+        # Could get more than one result
+        if [[ "${cache[$address]+isset}" == "isset" ]]; then
+                local code=${cache[$address]}
+        else
+                local code=$(addr2line -i -e "$vmlinux" "$address")
+                cache[$address]=$code
+        fi
+
+        # addr2line doesn't return a proper error code if it fails, so
+        # we detect it using the value it prints so that we could preserve
+        # the offset/size into the function and bail out
+        if [[ $code == "??:0" ]]; then
+                return
+        fi
+
+        # Strip out the base of the path
+        code=${code//$basepath/""}
+
+        # In the case of inlines, move everything to same line
+        code=${code//$'\n'/' '}
+
+        # Replace old address with pretty line numbers
+        symbol="$name ($code)"
+}
+
+decode_code() {
+        local scripts=`dirname "${BASH_SOURCE[0]}"`
+
+        echo "$1" | $scripts/decodecode
+}
+
+handle_line() {
+        local words
+
+        # Tokenize
+        read -a words <<<"$1"
+
+        # Remove hex numbers. Do it ourselves until it happens in the
+        # kernel
+
+        # We need to know the index of the last element before we
+        # remove elements because arrays are sparse
+        local last=$(( ${#words[@]} - 1 ))
+
+        for i in "${!words[@]}"; do
+                # Remove the address
+                if [[ ${words[$i]} =~ \[\<([^]]+)\>\] ]]; then
+                        unset words[$i]
+                fi
+
+                # Format timestamps with tabs
+                if [[ ${words[$i]} == \[ && ${words[$i+1]} == *\] ]]; then
+                        unset words[$i]
+                        words[$i+1]=$(printf "[%13s\n" "${words[$i+1]}")
+                fi
+        done
+
+        # The symbol is the last element, process it
+        symbol=${words[$last]}
+        unset words[$last]
+        parse_symbol # modifies $symbol
+
+        # Add up the line number to the symbol
+        echo "${words[@]}" "$symbol"
+}
+
+while read line; do
+        # Let's see if we have an address in the line
+        if [[ $line =~ \[\<([^]]+)\>\]  ]]; then
+                # Translate address to line numbers
+                handle_line "$line"
+        # Is it a code line?
+        elif [[ $line == *Code:* ]]; then
+                decode_code "$line"
+        else
+                # Nothing special in this line, show it as is
+                echo "$line"
+        fi
+done
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index e57478aa66f7..9c4d2412fb72 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -33,11 +33,11 @@ oldconfig: $(obj)/conf
         $< --$@ $(Kconfig)
 
 silentoldconfig: $(obj)/conf
-        $(Q)mkdir -p include/generated
+        $(Q)mkdir -p include/config include/generated
         $< --$@ $(Kconfig)
 
 localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
-        $(Q)mkdir -p include/generated
+        $(Q)mkdir -p include/config include/generated
         $(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config
         $(Q)if [ -f .config ]; then                                     \
                         cmp -s .tmp.config .config ||                   \
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index 31331723e810..9cb8522d8d22 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -589,7 +589,7 @@ while ($repeat) {
 
     # Now we need to see if we have to check selects;
     loop_select;
-}           
+}
 
 my %setconfigs;
 
diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
index cfb8440cc0b2..6fdc97ef6023 100755
--- a/scripts/mkcompile_h
+++ b/scripts/mkcompile_h
@@ -68,7 +68,7 @@ UTS_TRUNCATE="cut -b -$UTS_LEN"
 
 ( echo /\* This file is auto generated, version $VERSION \*/
   if [ -n "$CONFIG_FLAGS" ] ; then echo "/* $CONFIG_FLAGS */"; fi
-  
+
   echo \#define UTS_MACHINE \"$ARCH\"
 
   echo \#define UTS_VERSION \"`echo $UTS_VERSION | $UTS_TRUNCATE`\"
@@ -84,7 +84,7 @@ UTS_TRUNCATE="cut -b -$UTS_LEN"
 # recompilations.
 # We don't consider the file changed if only the date/time changed.
 # A kernel config change will increase the generation number, thus
-# causing compile.h to be updated (including date/time) due to the 
+# causing compile.h to be updated (including date/time) due to the
 # changed comment in the
 # first line.
 
diff --git a/scripts/mkmakefile b/scripts/mkmakefile
index 0cc044260744..84af27bf0f99 100644
--- a/scripts/mkmakefile
+++ b/scripts/mkmakefile
@@ -42,18 +42,11 @@ MAKEARGS += O=\$(if \$(patsubst /%,,\$(makedir)),\$(CURDIR)/)\$(patsubst %/,%,\$
 
 MAKEFLAGS += --no-print-directory
 
-.PHONY: all \$(MAKECMDGOALS)
+.PHONY: __sub-make \$(MAKECMDGOALS)
 
-all     := \$(filter-out all Makefile,\$(MAKECMDGOALS))
+__sub-make:
+        \$(Q)\$(MAKE) \$(MAKEARGS) \$(MAKECMDGOALS)
 
-all:
-        \$(Q)\$(MAKE) \$(MAKEARGS) \$(all)
-
-Makefile:;
-
-\$(all): all
-        @:
-
-%/: all
+\$(filter-out __sub-make, \$(MAKECMDGOALS)): __sub-make
         @:
 EOF
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index cd766877871e..9d9c5b905b35 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -316,7 +316,7 @@ static struct symbol *sym_add_exported(const char *name, struct module *mod,
                              s->module->name,
                              is_vmlinux(s->module->name) ?"":".ko");
                 } else {
-                        /* In case Modules.symvers was out of date */
+                        /* In case Module.symvers was out of date */
                         s->module = mod;
                 }
         }
@@ -2113,8 +2113,10 @@ static void read_dump(const char *fname, unsigned int kernel)
                 s->preloaded = 1;
                 sym_update_crc(symname, mod, crc, export_no(export));
         }
+        release_file(file, size);
         return;
 fail:
+        release_file(file, size);
         fatal("parse error in symbol dump file\n");
 }
 
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index c8e04b33b064..b5f08f727868 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -132,7 +132,7 @@ if [ "$ARCH" = "um" ] ; then
         cp System.map "$tmpdir/usr/lib/uml/modules/$version/System.map"
         cp $KCONFIG_CONFIG "$tmpdir/usr/share/doc/$packagename/config"
         gzip "$tmpdir/usr/share/doc/$packagename/config"
-else 
+else
         cp System.map "$tmpdir/boot/System.map-$version"
         cp $KCONFIG_CONFIG "$tmpdir/boot/config-$version"
 fi
diff --git a/scripts/patch-kernel b/scripts/patch-kernel
index d000ea3a41fd..49b4241e814a 100755
--- a/scripts/patch-kernel
+++ b/scripts/patch-kernel
@@ -27,7 +27,7 @@
 #       Nick Holloway <Nick.Holloway@alfie.demon.co.uk>, 2nd January 1995.
 #
 # Added support for handling multiple types of compression. What includes
-# gzip, bzip, bzip2, zip, compress, and plaintext. 
+# gzip, bzip, bzip2, zip, compress, and plaintext.
 #
 #       Adam Sulmicki <adam@cfar.umd.edu>, 1st January 1997.
 #
@@ -159,7 +159,7 @@ applyPatch () {
   fi
   # Remove backup files
   find $sourcedir/ '(' -name '*.orig' -o -name '.*.orig' ')' -exec rm -f {} \;
- 
+
   return 0;
 }
 
diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c
index c0853063fcbc..650ecc83d7d7 100644
--- a/scripts/recordmcount.c
+++ b/scripts/recordmcount.c
@@ -40,6 +40,11 @@
 #define R_METAG_NONE                     3
 #endif
 
+#ifndef EM_AARCH64
+#define EM_AARCH64      183
+#define R_AARCH64_ABS64 257
+#endif
+
 static int fd_map;      /* File descriptor for file being modified. */
 static int mmap_failed; /* Boolean flag. */
 static void *ehdr_curr; /* current ElfXX_Ehdr *  for resource cleanup */
@@ -347,6 +352,8 @@ do_file(char const *const fname)
         case EM_ARM:     reltype = R_ARM_ABS32;
                          altmcount = "__gnu_mcount_nc";
                          break;
+        case EM_AARCH64:
+                         reltype = R_AARCH64_ABS64; gpfx = '_'; break;
         case EM_IA_64:   reltype = R_IA64_IMM64;   gpfx = '_'; break;
         case EM_METAG:   reltype = R_METAG_ADDR32;
                          altmcount = "_mcount_wrapper";
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index 91280b82da08..397b6b84e8c5 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -279,6 +279,11 @@ if ($arch eq "x86_64") {
     $mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*R_ARM_(CALL|PC24|THM_CALL)" .
                         "\\s+(__gnu_mcount_nc|mcount)\$";
 
+} elsif ($arch eq "arm64") {
+    $alignment = 3;
+    $section_type = '%progbits';
+    $mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*R_AARCH64_CALL26\\s+_mcount\$";
+    $type = ".quad";
 } elsif ($arch eq "ia64") {
     $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s_mcount\$";
     $type = "data8";
diff --git a/scripts/sortextable.c b/scripts/sortextable.c
index cc49062acdee..1052d4834a44 100644
--- a/scripts/sortextable.c
+++ b/scripts/sortextable.c
@@ -35,6 +35,10 @@
 #define EM_ARCOMPACT    93
 #endif
 
+#ifndef EM_XTENSA
+#define EM_XTENSA       94
+#endif
+
 #ifndef EM_AARCH64
 #define EM_AARCH64      183
 #endif
@@ -281,6 +285,7 @@ do_file(char const *const fname)
         case EM_AARCH64:
         case EM_MICROBLAZE:
         case EM_MIPS:
+        case EM_XTENSA:
                 break;
         }  /* end switch */