73 files changed, 1523 insertions, 331 deletions
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index 30816037036e..7484b9d8272f 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -24,6 +24,10 @@ depfile = $(subst $(comma),_,$(dot-target).d)
 basetarget = $(basename $(notdir $@))
 ###
+# real prerequisites without phony targets
+real-prereqs = $(filter-out $(PHONY), $^)
+###
 # Escape single quote for use in echo statements
 escsq = $(subst $(squote),'\$(squote)',$1)
@@ -67,14 +71,10 @@ endef
 # cc-cross-prefix
 # Usage: CROSS_COMPILE := $(call cc-cross-prefix, m68k-linux-gnu- m68k-linux-)
-# Return first prefix where a prefix$(CC) is found in PATH.
+# Return first <prefix> where a <prefix>gcc is found in PATH.
-# If no $(CC) found in PATH with listed prefixes return nothing
+# If no gcc found in PATH with listed prefixes return nothing
-cc-cross-prefix =  \
+cc-cross-prefix = $(firstword $(foreach c, $(filter-out -%, $(1)), \
-        $(word 1, $(foreach c,$(1),                                   \
+                                        $(if $(shell which $(c)gcc), $(c))))
-                $(shell set -e;                                       \
-                if (which $(strip $(c))$(CC)) > /dev/null 2>&1 ; then \
-                        echo $(c);                                    \
-                fi)))
 # output directory for tests below
 TMPOUT := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/)
@@ -134,12 +134,9 @@ cc-option-yn = $(call try-run,\
 cc-disable-warning = $(call try-run,\
        $(CC) -Werror $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) -W$(strip $(1)) -c -x c /dev/null -o "$$TMP",-Wno-$(strip $(1)))
-# cc-version
-cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC))
 # cc-ifversion
 # Usage:  EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)
-cc-ifversion = $(shell [ $(cc-version) $(1) $(2) ] && echo $(3) || echo $(4))
+cc-ifversion = $(shell [ $(CONFIG_GCC_VERSION)0 $(1) $(2)000 ] && echo $(3) || echo $(4))
 # cc-ldoption
 # Usage: ldflags += $(call cc-ldoption, -Wl$(comma)--hash-style=both)
diff --git a/scripts/Kconfig.include b/scripts/Kconfig.include
index dad5583451af..87ff1dcc6bd5 100644
--- a/scripts/Kconfig.include
+++ b/scripts/Kconfig.include
@@ -27,4 +27,4 @@ cc-option = $(success,$(CC) -Werror $(1) -E -x c /dev/null -o /dev/null)
 ld-option = $(success,$(LD) -v $(1))
 # gcc version including patch level
-gcc-version := $(shell,$(srctree)/scripts/gcc-version.sh -p $(CC) | sed 's/^0*//')
+gcc-version := $(shell,$(srctree)/scripts/gcc-version.sh $(CC))
diff --git a/scripts/Makefile b/scripts/Makefile
index feb1f71381d7..9d442ee050bd 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -39,7 +39,6 @@ build_unifdef: $(obj)/unifdef
 subdir-$(CONFIG_GCC_PLUGINS) += gcc-plugins
 subdir-$(CONFIG_MODVERSIONS) += genksyms
 subdir-$(CONFIG_SECURITY_SELINUX) += selinux
-subdir-$(CONFIG_GDB_SCRIPTS) += gdb
 # Let clean descend into subdirs
-subdir- += basic dtc kconfig mod package
+subdir- += basic dtc gdb kconfig mod package
diff --git a/scripts/Makefile.asm-generic b/scripts/Makefile.asm-generic
index a62d2823f6cf..82ad63dcd62b 100644
--- a/scripts/Makefile.asm-generic
+++ b/scripts/Makefile.asm-generic
@@ -12,8 +12,19 @@ all:
 src := $(subst /generated,,$(obj))
 -include $(src)/Kbuild
+# $(generic)/Kbuild lists mandatory-y. Exclude um since it is a special case.
+ifneq ($(SRCARCH),um)
+include $(generic)/Kbuild
+endif
 include scripts/Kbuild.include
+redundant := $(filter $(mandatory-y) $(generated-y), $(generic-y))
+redundant += $(foreach f, $(generic-y), $(if $(wildcard $(srctree)/$(src)/$(f)),$(f)))
+redundant := $(sort $(redundant))
+$(if $(redundant),\
+        $(warning redundant generic-y found in $(src)/Kbuild: $(redundant)))
 # If arch does not implement mandatory headers, fallback to asm-generic ones.
 mandatory-y := $(filter-out $(generated-y), $(mandatory-y))
 generic-y   += $(foreach f, $(mandatory-y), $(if $(wildcard $(srctree)/$(src)/$(f)),,$(f)))
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index fd03d60f6c5a..2554a15ecf2b 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -63,7 +63,9 @@ ifneq ($(strip $(real-obj-y) $(need-builtin)),)
 builtin-target := $(obj)/built-in.a
 endif
+ifdef CONFIG_MODULES
 modorder-target := $(obj)/modules.order
+endif
 # We keep a list of all modules in $(MODVERDIR)
@@ -104,7 +106,7 @@ modkern_cflags =                                          \
 quiet_modtag = $(if $(part-of-module),[M],   )
 quiet_cmd_cc_s_c = CC $(quiet_modtag)  $@
-cmd_cc_s_c       = $(CC) $(c_flags) $(DISABLE_LTO) -fverbose-asm -S -o $@ $<
+      cmd_cc_s_c = $(CC) $(filter-out $(DEBUG_CFLAGS), $(c_flags)) $(DISABLE_LTO) -fverbose-asm -S -o $@ $<
 $(obj)/%.s: $(src)/%.c FORCE
        $(call if_changed_dep,cc_s_c)
@@ -118,7 +120,7 @@ $(obj)/%.i: $(src)/%.c FORCE
 # These mirror gensymtypes_S and co below, keep them in synch.
 cmd_gensymtypes_c =                                                         \
    $(CPP) -D__GENKSYMS__ $(c_flags) $< |                                   \
-    $(GENKSYMS) $(if $(1), -T $(2))                                         \
+    scripts/genksyms/genksyms $(if $(1), -T $(2))                           \
     $(patsubst y,-R,$(CONFIG_MODULE_REL_CRCS))                             \
     $(if $(KBUILD_PRESERVE),-p)                                            \
     -r $(firstword $(wildcard $(2:.symtypes=.symref) /dev/null))
@@ -312,13 +314,13 @@ $(real-obj-m:.o=.s): modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)
 #
 # These mirror gensymtypes_c and co above, keep them in synch.
 cmd_gensymtypes_S =                                                         \
-    (echo "\#include <linux/kernel.h>" ;                                    \
+   { echo "\#include <linux/kernel.h>" ;                                    \
     echo "\#include <asm/asm-prototypes.h>" ;                              \
    $(CPP) $(a_flags) $< |                                                  \
     grep "\<___EXPORT_SYMBOL\>" |                                          \
-     sed 's/.*___EXPORT_SYMBOL[[:space:]]*\([a-zA-Z0-9_]*\)[[:space:]]*,.*/EXPORT_SYMBOL(\1);/' ) | \
+     sed 's/.*___EXPORT_SYMBOL[[:space:]]*\([a-zA-Z0-9_]*\)[[:space:]]*,.*/EXPORT_SYMBOL(\1);/' ; } | \
    $(CPP) -D__GENKSYMS__ $(c_flags) -xc - |                                \
-    $(GENKSYMS) $(if $(1), -T $(2))                                         \
+    scripts/genksyms/genksyms $(if $(1), -T $(2))                           \
     $(patsubst y,-R,$(CONFIG_MODULE_REL_CRCS))                             \
     $(if $(KBUILD_PRESERVE),-p)                                            \
     -r $(firstword $(wildcard $(2:.symtypes=.symref) /dev/null))
@@ -394,17 +396,12 @@ $(obj)/%.asn1.c $(obj)/%.asn1.h: $(src)/%.asn1 $(objtree)/scripts/asn1_compiler
 $(sort $(subdir-obj-y)): $(subdir-ym) ;
 #
-# Rule to compile a set of .o files into one .o file
+# Rule to compile a set of .o files into one .a file (without symbol table)
 #
 ifdef builtin-target
-# built-in.a archives are made with no symbol table or index which
-# makes them small and fast, but unable to be used by the linker.
-# scripts/link-vmlinux.sh builds an aggregate built-in.a with a symbol
-# table and index.
 quiet_cmd_ar_builtin = AR      $@
-      cmd_ar_builtin = rm -f $@; \
+      cmd_ar_builtin = rm -f $@; $(AR) rcSTP$(KBUILD_ARFLAGS) $@ $(real-prereqs)
-                     $(AR) rcSTP$(KBUILD_ARFLAGS) $@ $(filter $(real-obj-y), $^)
 $(builtin-target): $(real-obj-y) FORCE
        $(call if_changed,ar_builtin)
@@ -426,16 +423,12 @@ $(modorder-target): $(subdir-ym) FORCE
        $(Q)(cat /dev/null; $(modorder-cmds)) > $@
 #
-# Rule to compile a set of .o files into one .a file
+# Rule to compile a set of .o files into one .a file (with symbol table)
 #
 ifdef lib-target
-quiet_cmd_link_l_target = AR      $@
-# lib target archives do get a symbol table and index
-cmd_link_l_target = rm -f $@; $(AR) rcsTP$(KBUILD_ARFLAGS) $@ $(lib-y)
 $(lib-target): $(lib-y) FORCE
-        $(call if_changed,link_l_target)
+        $(call if_changed,ar)
 targets += $(lib-target)
@@ -457,6 +450,10 @@ targets += $(obj)/lib-ksyms.o
 endif
+# NOTE:
+# Do not replace $(filter %.o,^) with $(real-prereqs). When a single object
+# module is turned into a multi object module, $^ will contain header file
+# dependencies recorded in the .*.cmd file.
 quiet_cmd_link_multi-m = LD [M]  $@
 cmd_link_multi-m = $(LD) $(ld_flags) -r -o $@ $(filter %.o,$^) $(cmd_secanalysis)
diff --git a/scripts/Makefile.gcc-plugins b/scripts/Makefile.gcc-plugins
index 35042d96cf5d..5f7df50cfe7a 100644
--- a/scripts/Makefile.gcc-plugins
+++ b/scripts/Makefile.gcc-plugins
@@ -15,6 +15,8 @@ gcc-plugin-$(CONFIG_GCC_PLUGIN_SANCOV)		+= sancov_plugin.so
 gcc-plugin-$(CONFIG_GCC_PLUGIN_STRUCTLEAK)      += structleak_plugin.so
 gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE)       \
                += -fplugin-arg-structleak_plugin-verbose
+gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF)         \
+                += -fplugin-arg-structleak_plugin-byref
 gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL)     \
                += -fplugin-arg-structleak_plugin-byref-all
 gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK)               \
diff --git a/scripts/Makefile.host b/scripts/Makefile.host
index 0393f75db4d4..a115259b57e7 100644
--- a/scripts/Makefile.host
+++ b/scripts/Makefile.host
@@ -67,13 +67,15 @@ _hostc_flags   = $(KBUILD_HOSTCFLAGS)   $(HOST_EXTRACFLAGS)   \
 _hostcxx_flags = $(KBUILD_HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) \
                 $(HOSTCXXFLAGS_$(basetarget).o)
-ifeq ($(KBUILD_SRC),)
 __hostc_flags   = $(_hostc_flags)
 __hostcxx_flags = $(_hostcxx_flags)
-else
+ifeq ($(KBUILD_EXTMOD),)
+ifneq ($(KBUILD_SRC),)
 __hostc_flags   = -I$(obj) $(call flags,_hostc_flags)
 __hostcxx_flags = -I$(obj) $(call flags,_hostcxx_flags)
 endif
+endif
 hostc_flags    = -Wp,-MD,$(depfile) $(__hostc_flags)
 hostcxx_flags  = -Wp,-MD,$(depfile) $(__hostcxx_flags)
diff --git a/scripts/Makefile.kasan b/scripts/Makefile.kasan
index 6deabedc67fc..6410bd22fe38 100644
--- a/scripts/Makefile.kasan
+++ b/scripts/Makefile.kasan
@@ -27,14 +27,9 @@ else
         $(call cc-param,asan-globals=1) \
         $(call cc-param,asan-instrumentation-with-call-threshold=$(call_threshold)) \
         $(call cc-param,asan-stack=$(CONFIG_KASAN_STACK)) \
-         $(call cc-param,asan-use-after-scope=1) \
         $(call cc-param,asan-instrument-allocas=1)
 endif
-ifdef CONFIG_KASAN_EXTRA
-CFLAGS_KASAN += $(call cc-option, -fsanitize-address-use-after-scope)
-endif
 endif # CONFIG_KASAN_GENERIC
 ifdef CONFIG_KASAN_SW_TAGS
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 12b88d09c3a4..8a1f64f17740 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -137,14 +137,14 @@ _c_flags += $(if $(patsubst n%,, \
        $(CFLAGS_KCOV))
 endif
-# If building the kernel in a separate objtree expand all occurrences
-# of -Idir to -I$(srctree)/dir except for absolute paths (starting with '/').
-ifeq ($(KBUILD_SRC),)
 __c_flags       = $(_c_flags)
 __a_flags       = $(_a_flags)
 __cpp_flags     = $(_cpp_flags)
-else
+# If building the kernel in a separate objtree expand all occurrences
+# of -Idir to -I$(srctree)/dir except for absolute paths (starting with '/').
+ifeq ($(KBUILD_EXTMOD),)
+ifneq ($(KBUILD_SRC),)
 # -I$(obj) locates generated .h files
 # $(call addtree,-I$(obj)) locates .h files in srctree, from generated .c files
@@ -155,6 +155,7 @@ __c_flags	= $(if $(obj),$(call addtree,-I$(src)) -I$(obj)) \
 __a_flags       = $(call flags,_a_flags)
 __cpp_flags     = $(call flags,_cpp_flags)
 endif
+endif
 c_flags        = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE)     \
                 -include $(srctree)/include/linux/compiler_types.h       \
@@ -230,7 +231,13 @@ $(obj)/%: $(src)/%_shipped
 # ---------------------------------------------------------------------------
 quiet_cmd_ld = LD      $@
-cmd_ld = $(LD) $(ld_flags) $(filter-out FORCE,$^) -o $@
+      cmd_ld = $(LD) $(ld_flags) $(real-prereqs) -o $@
+# Archive
+# ---------------------------------------------------------------------------
+quiet_cmd_ar = AR      $@
+      cmd_ar = rm -f $@; $(AR) rcsTP$(KBUILD_ARFLAGS) $@ $(real-prereqs)
 # Objcopy
 # ---------------------------------------------------------------------------
@@ -242,7 +249,7 @@ cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@
 # ---------------------------------------------------------------------------
 quiet_cmd_gzip = GZIP    $@
-      cmd_gzip = cat $(filter-out FORCE,$^) | gzip -n -f -9 > $@
+      cmd_gzip = cat $(real-prereqs) | gzip -n -f -9 > $@
 # DTC
 # ---------------------------------------------------------------------------
@@ -270,7 +277,7 @@ DTC_FLAGS += $(DTC_FLAGS_$(basetarget))
 # Generate an assembly file to wrap the output of the device tree compiler
 quiet_cmd_dt_S_dtb= DTB     $@
 cmd_dt_S_dtb=                                           \
-(                                                       \
+{                                                       \
        echo '\#include <asm-generic/vmlinux.lds.h>';   \
        echo '.section .dtb.init.rodata,"a"';           \
        echo '.balign STRUCT_ALIGNMENT';                \
@@ -280,7 +287,7 @@ cmd_dt_S_dtb=						\
        echo '__dtb_$(subst -,_,$(*F))_end:';           \
        echo '.global __dtb_$(subst -,_,$(*F))_end';    \
        echo '.balign STRUCT_ALIGNMENT';                \
-) > $@
+} > $@
 $(obj)/%.dtb.S: $(obj)/%.dtb FORCE
        $(call if_changed,dt_S_dtb)
@@ -320,7 +327,7 @@ dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
 # append the size as a 32-bit littleendian number as gzip does.
 size_append = printf $(shell                                            \
 dec_size=0;                                                             \
-for F in $1; do                                                         \
+for F in $(real-prereqs); do                                    \
        fsize=$$($(CONFIG_SHELL) $(srctree)/scripts/file-size.sh $$F);  \
        dec_size=$$(expr $$dec_size + $$fsize);                         \
 done;                                                                   \
@@ -334,23 +341,20 @@ printf "%08x\n" $$dec_size |						\
 )
 quiet_cmd_bzip2 = BZIP2   $@
-cmd_bzip2 = (cat $(filter-out FORCE,$^) | \
+      cmd_bzip2 = { cat $(real-prereqs) | bzip2 -9 && $(size_append); } > $@
-        bzip2 -9 && $(call size_append, $(filter-out FORCE,$^))) > $@
 # Lzma
 # ---------------------------------------------------------------------------
 quiet_cmd_lzma = LZMA    $@
-cmd_lzma = (cat $(filter-out FORCE,$^) | \
+      cmd_lzma = { cat $(real-prereqs) | lzma -9 && $(size_append); } > $@
-        lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@
 quiet_cmd_lzo = LZO     $@
-cmd_lzo = (cat $(filter-out FORCE,$^) | \
+      cmd_lzo = { cat $(real-prereqs) | lzop -9 && $(size_append); } > $@
-        lzop -9 && $(call size_append, $(filter-out FORCE,$^))) > $@
 quiet_cmd_lz4 = LZ4     $@
-cmd_lz4 = (cat $(filter-out FORCE,$^) | \
+      cmd_lz4 = { cat $(real-prereqs) | lz4c -l -c1 stdin stdout && \
-        lz4c -l -c1 stdin stdout && $(call size_append, $(filter-out FORCE,$^))) > $@
+                  $(size_append); } > $@
 # U-Boot mkimage
 # ---------------------------------------------------------------------------
@@ -392,13 +396,11 @@ quiet_cmd_uimage = UIMAGE  $@
 # big dictionary would increase the memory usage too much in the multi-call
 # decompression mode. A BCJ filter isn't used either.
 quiet_cmd_xzkern = XZKERN  $@
-cmd_xzkern = (cat $(filter-out FORCE,$^) | \
+      cmd_xzkern = { cat $(real-prereqs) | sh $(srctree)/scripts/xz_wrap.sh && \
-        sh $(srctree)/scripts/xz_wrap.sh && \
+                     $(size_append); } > $@
-        $(call size_append, $(filter-out FORCE,$^))) > $@
 quiet_cmd_xzmisc = XZMISC  $@
-cmd_xzmisc = (cat $(filter-out FORCE,$^) | \
+      cmd_xzmisc = cat $(real-prereqs) | xz --check=crc32 --lzma2=dict=1MiB > $@
-        xz --check=crc32 --lzma2=dict=1MiB) > $@
 # ASM offsets
 # ---------------------------------------------------------------------------
diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst
index ff5ca9817a85..0dae402661f3 100644
--- a/scripts/Makefile.modinst
+++ b/scripts/Makefile.modinst
@@ -23,7 +23,7 @@ quiet_cmd_modules_install = INSTALL $@
    mkdir -p $(2) ; \
    cp $@ $(2) ; \
    $(mod_strip_cmd) $(2)/$(notdir $@) ; \
-    $(mod_sign_cmd) $(2)/$(notdir $@) $(patsubst %,|| true,$(KBUILD_EXTMOD)) && \
+    $(mod_sign_cmd) $(2)/$(notdir $@) $(patsubst %,|| true,$(KBUILD_EXTMOD)) ; \
    $(mod_compress_cmd) $(2)/$(notdir $@)
 # Modules built outside the kernel source tree go into extra by default
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index 7d4af0d0accb..6b7f354f189a 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -77,7 +77,6 @@ modpost = scripts/mod/modpost                    \
 $(if $(KBUILD_EXTMOD),-I $(modulesymfile))      \
 $(if $(KBUILD_EXTRA_SYMBOLS), $(patsubst %, -e %,$(KBUILD_EXTRA_SYMBOLS))) \
 $(if $(KBUILD_EXTMOD),-o $(modulesymfile))      \
- $(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S)      \
 $(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E)  \
 $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w)
@@ -122,7 +121,7 @@ quiet_cmd_ld_ko_o = LD [M]  $@
      cmd_ld_ko_o =                                                     \
        $(LD) -r $(KBUILD_LDFLAGS)                                      \
                 $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE)             \
-                 -o $@ $(filter-out FORCE,$^) ;                         \
+                 -o $@ $(real-prereqs) ;                                \
        $(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true)
 $(modules): %.ko :%.o %.mod.o FORCE
diff --git a/scripts/adjust_autoksyms.sh b/scripts/adjust_autoksyms.sh
index 6e6d63957da3..84bf6b500815 100755
--- a/scripts/adjust_autoksyms.sh
+++ b/scripts/adjust_autoksyms.sh
@@ -39,14 +39,7 @@ case "$KBUILD_VERBOSE" in
 esac
 # We need access to CONFIG_ symbols
-case "${KCONFIG_CONFIG}" in
+. include/config/auto.conf
-*/*)
-        . "${KCONFIG_CONFIG}"
-        ;;
-*)
-        # Force using a file from the current directory
-        . "./${KCONFIG_CONFIG}"
-esac
 # Generate a new ksym list file with symbols needed by the current
 # set of modules.
diff --git a/scripts/atomic/atomic-tbl.sh b/scripts/atomic/atomic-tbl.sh
new file mode 100755
index 000000000000..81d5c32039dd
--- /dev/null
+++ b/scripts/atomic/atomic-tbl.sh
@@ -0,0 +1,186 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+# helpers for dealing with atomics.tbl
+#meta_in(meta, match)
+meta_in()
+{
+        case "$1" in
+        [$2]) return 0;;
+        esac
+        return 1
+}
+#meta_has_ret(meta)
+meta_has_ret()
+{
+        meta_in "$1" "bBiIfFlR"
+}
+#meta_has_acquire(meta)
+meta_has_acquire()
+{
+        meta_in "$1" "BFIlR"
+}
+#meta_has_release(meta)
+meta_has_release()
+{
+        meta_in "$1" "BFIRs"
+}
+#meta_has_relaxed(meta)
+meta_has_relaxed()
+{
+        meta_in "$1" "BFIR"
+}
+#find_fallback_template(pfx, name, sfx, order)
+find_fallback_template()
+{
+        local pfx="$1"; shift
+        local name="$1"; shift
+        local sfx="$1"; shift
+        local order="$1"; shift
+        local base=""
+        local file=""
+        # We may have fallbacks for a specific case (e.g. read_acquire()), or
+        # an entire class, e.g. *inc*().
+        #
+        # Start at the most specific, and fall back to the most general. Once
+        # we find a specific fallback, don't bother looking for more.
+        for base in "${pfx}${name}${sfx}${order}" "${name}"; do
+                file="${ATOMICDIR}/fallbacks/${base}"
+                if [ -f "${file}" ]; then
+                        printf "${file}"
+                        break
+                fi
+        done
+}
+#gen_ret_type(meta, int)
+gen_ret_type() {
+        local meta="$1"; shift
+        local int="$1"; shift
+        case "${meta}" in
+        [sv]) printf "void";;
+        [bB]) printf "bool";;
+        [aiIfFlR]) printf "${int}";;
+        esac
+}
+#gen_ret_stmt(meta)
+gen_ret_stmt()
+{
+        if meta_has_ret "${meta}"; then
+                printf "return ";
+        fi
+}
+# gen_param_name(arg)
+gen_param_name()
+{
+        # strip off the leading 'c' for 'cv'
+        local name="${1#c}"
+        printf "${name#*:}"
+}
+# gen_param_type(arg, int, atomic)
+gen_param_type()
+{
+        local type="${1%%:*}"; shift
+        local int="$1"; shift
+        local atomic="$1"; shift
+        case "${type}" in
+        i) type="${int} ";;
+        p) type="${int} *";;
+        v) type="${atomic}_t *";;
+        cv) type="const ${atomic}_t *";;
+        esac
+        printf "${type}"
+}
+#gen_param(arg, int, atomic)
+gen_param()
+{
+        local arg="$1"; shift
+        local int="$1"; shift
+        local atomic="$1"; shift
+        local name="$(gen_param_name "${arg}")"
+        local type="$(gen_param_type "${arg}" "${int}" "${atomic}")"
+        printf "${type}${name}"
+}
+#gen_params(int, atomic, arg...)
+gen_params()
+{
+        local int="$1"; shift
+        local atomic="$1"; shift
+        while [ "$#" -gt 0 ]; do
+                gen_param "$1" "${int}" "${atomic}"
+                [ "$#" -gt 1 ] && printf ", "
+                shift;
+        done
+}
+#gen_args(arg...)
+gen_args()
+{
+        while [ "$#" -gt 0 ]; do
+                printf "$(gen_param_name "$1")"
+                [ "$#" -gt 1 ] && printf ", "
+                shift;
+        done
+}
+#gen_proto_order_variants(meta, pfx, name, sfx, ...)
+gen_proto_order_variants()
+{
+        local meta="$1"; shift
+        local pfx="$1"; shift
+        local name="$1"; shift
+        local sfx="$1"; shift
+        gen_proto_order_variant "${meta}" "${pfx}" "${name}" "${sfx}" "" "$@"
+        if meta_has_acquire "${meta}"; then
+                gen_proto_order_variant "${meta}" "${pfx}" "${name}" "${sfx}" "_acquire" "$@"
+        fi
+        if meta_has_release "${meta}"; then
+                gen_proto_order_variant "${meta}" "${pfx}" "${name}" "${sfx}" "_release" "$@"
+        fi
+        if meta_has_relaxed "${meta}"; then
+                gen_proto_order_variant "${meta}" "${pfx}" "${name}" "${sfx}" "_relaxed" "$@"
+        fi
+}
+#gen_proto_variants(meta, name, ...)
+gen_proto_variants()
+{
+        local meta="$1"; shift
+        local name="$1"; shift
+        local pfx=""
+        local sfx=""
+        meta_in "${meta}" "fF" && pfx="fetch_"
+        meta_in "${meta}" "R" && sfx="_return"
+        gen_proto_order_variants "${meta}" "${pfx}" "${name}" "${sfx}" "$@"
+}
+#gen_proto(meta, ...)
+gen_proto() {
+        local meta="$1"; shift
+        for m in $(echo "${meta}" | grep -o .); do
+                gen_proto_variants "${m}" "$@"
+        done
+}
diff --git a/scripts/atomic/atomics.tbl b/scripts/atomic/atomics.tbl
new file mode 100755
index 000000000000..fbee2f6190d9
--- /dev/null
+++ b/scripts/atomic/atomics.tbl
@@ -0,0 +1,41 @@
+# name  meta    args...
+#
+# Where meta contains a string of variants to generate.
+# Upper-case implies _{acquire,release,relaxed} variants.
+# Valid meta values are:
+# * B/b - bool: returns bool
+# * v   - void: returns void
+# * I/i - int: returns base type
+# * R   - return: returns base type (has _return variants)
+# * F/f - fetch: returns base type (has fetch_ variants)
+# * l   - load: returns base type (has _acquire order variant)
+# * s   - store: returns void (has _release order variant)
+#
+# Where args contains list of type[:name], where type is:
+# * cv  - const pointer to atomic base type (atomic_t/atomic64_t/atomic_long_t)
+# * v   - pointer to atomic base type (atomic_t/atomic64_t/atomic_long_t)
+# * i   - base type (int/s64/long)
+# * p   - pointer to base type (int/s64/long)
+#
+read                    l       cv
+set                     s       v       i
+add                     vRF     i       v
+sub                     vRF     i       v
+inc                     vRF     v
+dec                     vRF     v
+and                     vF      i       v
+andnot                  vF      i       v
+or                      vF      i       v
+xor                     vF      i       v
+xchg                    I       v       i
+cmpxchg                 I       v       i:old   i:new
+try_cmpxchg             B       v       p:old   i:new
+sub_and_test            b       i       v
+dec_and_test            b       v
+inc_and_test            b       v
+add_negative            b       i       v
+add_unless              fb      v       i:a     i:u
+inc_not_zero            b       v
+inc_unless_negative     b       v
+dec_unless_positive     b       v
+dec_if_positive         i       v
diff --git a/scripts/atomic/check-atomics.sh b/scripts/atomic/check-atomics.sh
new file mode 100755
index 000000000000..cfa0c2f71c84
--- /dev/null
+++ b/scripts/atomic/check-atomics.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+#
+# Check if atomic headers are up-to-date
+ATOMICDIR=$(dirname $0)
+ATOMICTBL=${ATOMICDIR}/atomics.tbl
+LINUXDIR=${ATOMICDIR}/../..
+echo '' | sha1sum - > /dev/null 2>&1
+if [ $? -ne 0 ]; then
+        printf "sha1sum not available, skipping atomic header checks.\n"
+        exit 0
+fi
+cat <<EOF |
+asm-generic/atomic-instrumented.h
+asm-generic/atomic-long.h
+linux/atomic-fallback.h
+EOF
+while read header; do
+        OLDSUM="$(tail -n 1 ${LINUXDIR}/include/${header})"
+        OLDSUM="${OLDSUM#// }"
+        NEWSUM="$(head -n -1 ${LINUXDIR}/include/${header} | sha1sum)"
+        NEWSUM="${NEWSUM%% *}"
+        if [ "${OLDSUM}" != "${NEWSUM}" ]; then
+                printf "warning: generated include/${header} has been modified.\n"
+        fi
+done
+exit 0
diff --git a/scripts/atomic/fallbacks/acquire b/scripts/atomic/fallbacks/acquire
new file mode 100755
index 000000000000..e38871e64db6
--- /dev/null
+++ b/scripts/atomic/fallbacks/acquire
@@ -0,0 +1,9 @@
+cat <<EOF
+static inline ${ret}
+${atomic}_${pfx}${name}${sfx}_acquire(${params})
+{
+        ${ret} ret = ${atomic}_${pfx}${name}${sfx}_relaxed(${args});
+        __atomic_acquire_fence();
+        return ret;
+}
+EOF
diff --git a/scripts/atomic/fallbacks/add_negative b/scripts/atomic/fallbacks/add_negative
new file mode 100755
index 000000000000..e6f4815637de
--- /dev/null
+++ b/scripts/atomic/fallbacks/add_negative
@@ -0,0 +1,16 @@
+cat <<EOF
+/**
+ * ${atomic}_add_negative - add and test if negative
+ * @i: integer value to add
+ * @v: pointer of type ${atomic}_t
+ *
+ * Atomically adds @i to @v and returns true
+ * if the result is negative, or false when
+ * result is greater than or equal to zero.
+ */
+static inline bool
+${atomic}_add_negative(${int} i, ${atomic}_t *v)
+{
+        return ${atomic}_add_return(i, v) < 0;
+}
+EOF
diff --git a/scripts/atomic/fallbacks/add_unless b/scripts/atomic/fallbacks/add_unless
new file mode 100755
index 000000000000..792533885fbf
--- /dev/null
+++ b/scripts/atomic/fallbacks/add_unless
@@ -0,0 +1,16 @@
+cat << EOF
+/**
+ * ${atomic}_add_unless - add unless the number is already a given value
+ * @v: pointer of type ${atomic}_t
+ * @a: the amount to add to v...
+ * @u: ...unless v is equal to u.
+ *
+ * Atomically adds @a to @v, if @v was not already @u.
+ * Returns true if the addition was done.
+ */
+static inline bool
+${atomic}_add_unless(${atomic}_t *v, ${int} a, ${int} u)
+{
+        return ${atomic}_fetch_add_unless(v, a, u) != u;
+}
+EOF
diff --git a/scripts/atomic/fallbacks/andnot b/scripts/atomic/fallbacks/andnot
new file mode 100755
index 000000000000..9f3a3216b5e3
--- /dev/null
+++ b/scripts/atomic/fallbacks/andnot
@@ -0,0 +1,7 @@
+cat <<EOF
+static inline ${ret}
+${atomic}_${pfx}andnot${sfx}${order}(${int} i, ${atomic}_t *v)
+{
+        ${retstmt}${atomic}_${pfx}and${sfx}${order}(~i, v);
+}
+EOF
diff --git a/scripts/atomic/fallbacks/dec b/scripts/atomic/fallbacks/dec
new file mode 100755
index 000000000000..10bbc82be31d
--- /dev/null
+++ b/scripts/atomic/fallbacks/dec
@@ -0,0 +1,7 @@
+cat <<EOF
+static inline ${ret}
+${atomic}_${pfx}dec${sfx}${order}(${atomic}_t *v)
+{
+        ${retstmt}${atomic}_${pfx}sub${sfx}${order}(1, v);
+}
+EOF
diff --git a/scripts/atomic/fallbacks/dec_and_test b/scripts/atomic/fallbacks/dec_and_test
new file mode 100755
index 000000000000..0ce7103b3df2
--- /dev/null
+++ b/scripts/atomic/fallbacks/dec_and_test
@@ -0,0 +1,15 @@
+cat <<EOF
+/**
+ * ${atomic}_dec_and_test - decrement and test
+ * @v: pointer of type ${atomic}_t
+ *
+ * Atomically decrements @v by 1 and
+ * returns true if the result is 0, or false for all other
+ * cases.
+ */
+static inline bool
+${atomic}_dec_and_test(${atomic}_t *v)
+{
+        return ${atomic}_dec_return(v) == 0;
+}
+EOF
diff --git a/scripts/atomic/fallbacks/dec_if_positive b/scripts/atomic/fallbacks/dec_if_positive
new file mode 100755
index 000000000000..c52eacec43c8
--- /dev/null
+++ b/scripts/atomic/fallbacks/dec_if_positive
@@ -0,0 +1,15 @@
+cat <<EOF
+static inline ${ret}
+${atomic}_dec_if_positive(${atomic}_t *v)
+{
+        ${int} dec, c = ${atomic}_read(v);
+        do {
+                dec = c - 1;
+                if (unlikely(dec < 0))
+                        break;
+        } while (!${atomic}_try_cmpxchg(v, &c, dec));
+        return dec;
+}
+EOF
diff --git a/scripts/atomic/fallbacks/dec_unless_positive b/scripts/atomic/fallbacks/dec_unless_positive
new file mode 100755
index 000000000000..8a2578f14268
--- /dev/null
+++ b/scripts/atomic/fallbacks/dec_unless_positive
@@ -0,0 +1,14 @@
+cat <<EOF
+static inline bool
+${atomic}_dec_unless_positive(${atomic}_t *v)
+{
+        ${int} c = ${atomic}_read(v);
+        do {
+                if (unlikely(c > 0))
+                        return false;
+        } while (!${atomic}_try_cmpxchg(v, &c, c - 1));
+        return true;
+}
+EOF
diff --git a/scripts/atomic/fallbacks/fence b/scripts/atomic/fallbacks/fence
new file mode 100755
index 000000000000..82f68fa6931a
--- /dev/null
+++ b/scripts/atomic/fallbacks/fence
@@ -0,0 +1,11 @@
+cat <<EOF
+static inline ${ret}
+${atomic}_${pfx}${name}${sfx}(${params})
+{
+        ${ret} ret;
+        __atomic_pre_full_fence();
+        ret = ${atomic}_${pfx}${name}${sfx}_relaxed(${args});
+        __atomic_post_full_fence();
+        return ret;
+}
+EOF
diff --git a/scripts/atomic/fallbacks/fetch_add_unless b/scripts/atomic/fallbacks/fetch_add_unless
new file mode 100755
index 000000000000..d2c091db7eae
--- /dev/null
+++ b/scripts/atomic/fallbacks/fetch_add_unless
@@ -0,0 +1,23 @@
+cat << EOF
+/**
+ * ${atomic}_fetch_add_unless - add unless the number is already a given value
+ * @v: pointer of type ${atomic}_t
+ * @a: the amount to add to v...
+ * @u: ...unless v is equal to u.
+ *
+ * Atomically adds @a to @v, so long as @v was not already @u.
+ * Returns original value of @v
+ */
+static inline ${int}
+${atomic}_fetch_add_unless(${atomic}_t *v, ${int} a, ${int} u)
+{
+        ${int} c = ${atomic}_read(v);
+        do {
+                if (unlikely(c == u))
+                        break;
+        } while (!${atomic}_try_cmpxchg(v, &c, c + a));
+        return c;
+}
+EOF
diff --git a/scripts/atomic/fallbacks/inc b/scripts/atomic/fallbacks/inc
new file mode 100755
index 000000000000..f866b3ad2353
--- /dev/null
+++ b/scripts/atomic/fallbacks/inc
@@ -0,0 +1,7 @@
+cat <<EOF
+static inline ${ret}
+${atomic}_${pfx}inc${sfx}${order}(${atomic}_t *v)
+{
+        ${retstmt}${atomic}_${pfx}add${sfx}${order}(1, v);
+}
+EOF
diff --git a/scripts/atomic/fallbacks/inc_and_test b/scripts/atomic/fallbacks/inc_and_test
new file mode 100755
index 000000000000..4e2068869f7e
--- /dev/null
+++ b/scripts/atomic/fallbacks/inc_and_test
@@ -0,0 +1,15 @@
+cat <<EOF
+/**
+ * ${atomic}_inc_and_test - increment and test
+ * @v: pointer of type ${atomic}_t
+ *
+ * Atomically increments @v by 1
+ * and returns true if the result is zero, or false for all
+ * other cases.
+ */
+static inline bool
+${atomic}_inc_and_test(${atomic}_t *v)
+{
+        return ${atomic}_inc_return(v) == 0;
+}
+EOF
diff --git a/scripts/atomic/fallbacks/inc_not_zero b/scripts/atomic/fallbacks/inc_not_zero
new file mode 100755
index 000000000000..a7c45c8d107c
--- /dev/null
+++ b/scripts/atomic/fallbacks/inc_not_zero
@@ -0,0 +1,14 @@
+cat <<EOF
+/**
+ * ${atomic}_inc_not_zero - increment unless the number is zero
+ * @v: pointer of type ${atomic}_t
+ *
+ * Atomically increments @v by 1, if @v is non-zero.
+ * Returns true if the increment was done.
+ */
+static inline bool
+${atomic}_inc_not_zero(${atomic}_t *v)
+{
+        return ${atomic}_add_unless(v, 1, 0);
+}
+EOF
diff --git a/scripts/atomic/fallbacks/inc_unless_negative b/scripts/atomic/fallbacks/inc_unless_negative
new file mode 100755
index 000000000000..0c266e71dbd4
--- /dev/null
+++ b/scripts/atomic/fallbacks/inc_unless_negative
@@ -0,0 +1,14 @@
+cat <<EOF
+static inline bool
+${atomic}_inc_unless_negative(${atomic}_t *v)
+{
+        ${int} c = ${atomic}_read(v);
+        do {
+                if (unlikely(c < 0))
+                        return false;
+        } while (!${atomic}_try_cmpxchg(v, &c, c + 1));
+        return true;
+}
+EOF
diff --git a/scripts/atomic/fallbacks/read_acquire b/scripts/atomic/fallbacks/read_acquire
new file mode 100755
index 000000000000..75863b5203f7
--- /dev/null
+++ b/scripts/atomic/fallbacks/read_acquire
@@ -0,0 +1,7 @@
+cat <<EOF
+static inline ${ret}
+${atomic}_read_acquire(const ${atomic}_t *v)
+{
+        return smp_load_acquire(&(v)->counter);
+}
+EOF
diff --git a/scripts/atomic/fallbacks/release b/scripts/atomic/fallbacks/release
new file mode 100755
index 000000000000..3f628a3802d9
--- /dev/null
+++ b/scripts/atomic/fallbacks/release
@@ -0,0 +1,8 @@
+cat <<EOF
+static inline ${ret}
+${atomic}_${pfx}${name}${sfx}_release(${params})
+{
+        __atomic_release_fence();
+        ${retstmt}${atomic}_${pfx}${name}${sfx}_relaxed(${args});
+}
+EOF
diff --git a/scripts/atomic/fallbacks/set_release b/scripts/atomic/fallbacks/set_release
new file mode 100755
index 000000000000..45bb5e0cfc08
--- /dev/null
+++ b/scripts/atomic/fallbacks/set_release
@@ -0,0 +1,7 @@
+cat <<EOF
+static inline void
+${atomic}_set_release(${atomic}_t *v, ${int} i)
+{
+        smp_store_release(&(v)->counter, i);
+}
+EOF
diff --git a/scripts/atomic/fallbacks/sub_and_test b/scripts/atomic/fallbacks/sub_and_test
new file mode 100755
index 000000000000..289ef17a2d7a
--- /dev/null
+++ b/scripts/atomic/fallbacks/sub_and_test
@@ -0,0 +1,16 @@
+cat <<EOF
+/**
+ * ${atomic}_sub_and_test - subtract value from variable and test result
+ * @i: integer value to subtract
+ * @v: pointer of type ${atomic}_t
+ *
+ * Atomically subtracts @i from @v and returns
+ * true if the result is zero, or false for all
+ * other cases.
+ */
+static inline bool
+${atomic}_sub_and_test(${int} i, ${atomic}_t *v)
+{
+        return ${atomic}_sub_return(i, v) == 0;
+}
+EOF
diff --git a/scripts/atomic/fallbacks/try_cmpxchg b/scripts/atomic/fallbacks/try_cmpxchg
new file mode 100755
index 000000000000..4ed85e2f5378
--- /dev/null
+++ b/scripts/atomic/fallbacks/try_cmpxchg
@@ -0,0 +1,11 @@
+cat <<EOF
+static inline bool
+${atomic}_try_cmpxchg${order}(${atomic}_t *v, ${int} *old, ${int} new)
+{
+        ${int} r, o = *old;
+        r = ${atomic}_cmpxchg${order}(v, o, new);
+        if (unlikely(r != o))
+                *old = r;
+        return likely(r == o);
+}
+EOF
diff --git a/scripts/atomic/gen-atomic-fallback.sh b/scripts/atomic/gen-atomic-fallback.sh
new file mode 100755
index 000000000000..1bd7c1707633
--- /dev/null
+++ b/scripts/atomic/gen-atomic-fallback.sh
@@ -0,0 +1,181 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+ATOMICDIR=$(dirname $0)
+. ${ATOMICDIR}/atomic-tbl.sh
+#gen_template_fallback(template, meta, pfx, name, sfx, order, atomic, int, args...)
+gen_template_fallback()
+{
+        local template="$1"; shift
+        local meta="$1"; shift
+        local pfx="$1"; shift
+        local name="$1"; shift
+        local sfx="$1"; shift
+        local order="$1"; shift
+        local atomic="$1"; shift
+        local int="$1"; shift
+        local atomicname="${atomic}_${pfx}${name}${sfx}${order}"
+        local ret="$(gen_ret_type "${meta}" "${int}")"
+        local retstmt="$(gen_ret_stmt "${meta}")"
+        local params="$(gen_params "${int}" "${atomic}" "$@")"
+        local args="$(gen_args "$@")"
+        if [ ! -z "${template}" ]; then
+                printf "#ifndef ${atomicname}\n"
+                . ${template}
+                printf "#define ${atomicname} ${atomicname}\n"
+                printf "#endif\n\n"
+        fi
+}
+#gen_proto_fallback(meta, pfx, name, sfx, order, atomic, int, args...)
+gen_proto_fallback()
+{
+        local meta="$1"; shift
+        local pfx="$1"; shift
+        local name="$1"; shift
+        local sfx="$1"; shift
+        local order="$1"; shift
+        local tmpl="$(find_fallback_template "${pfx}" "${name}" "${sfx}" "${order}")"
+        gen_template_fallback "${tmpl}" "${meta}" "${pfx}" "${name}" "${sfx}" "${order}" "$@"
+}
+#gen_basic_fallbacks(basename)
+gen_basic_fallbacks()
+{
+        local basename="$1"; shift
+cat << EOF
+#define ${basename}_acquire ${basename}
+#define ${basename}_release ${basename}
+#define ${basename}_relaxed ${basename}
+EOF
+}
+#gen_proto_order_variants(meta, pfx, name, sfx, atomic, int, args...)
+gen_proto_order_variants()
+{
+        local meta="$1"; shift
+        local pfx="$1"; shift
+        local name="$1"; shift
+        local sfx="$1"; shift
+        local atomic="$1"
+        local basename="${atomic}_${pfx}${name}${sfx}"
+        local template="$(find_fallback_template "${pfx}" "${name}" "${sfx}" "${order}")"
+        # If we don't have relaxed atomics, then we don't bother with ordering fallbacks
+        # read_acquire and set_release need to be templated, though
+        if ! meta_has_relaxed "${meta}"; then
+                gen_proto_fallback "${meta}" "${pfx}" "${name}" "${sfx}" "" "$@"
+                if meta_has_acquire "${meta}"; then
+                        gen_proto_fallback "${meta}" "${pfx}" "${name}" "${sfx}" "_acquire" "$@"
+                fi
+                if meta_has_release "${meta}"; then
+                        gen_proto_fallback "${meta}" "${pfx}" "${name}" "${sfx}" "_release" "$@"
+                fi
+                return
+        fi
+        printf "#ifndef ${basename}_relaxed\n"
+        if [ ! -z "${template}" ]; then
+                printf "#ifdef ${basename}\n"
+        fi
+        gen_basic_fallbacks "${basename}"
+        if [ ! -z "${template}" ]; then
+                printf "#endif /* ${atomic}_${pfx}${name}${sfx} */\n\n"
+                gen_proto_fallback "${meta}" "${pfx}" "${name}" "${sfx}" "" "$@"
+                gen_proto_fallback "${meta}" "${pfx}" "${name}" "${sfx}" "_acquire" "$@"
+                gen_proto_fallback "${meta}" "${pfx}" "${name}" "${sfx}" "_release" "$@"
+                gen_proto_fallback "${meta}" "${pfx}" "${name}" "${sfx}" "_relaxed" "$@"
+        fi
+        printf "#else /* ${basename}_relaxed */\n\n"
+        gen_template_fallback "${ATOMICDIR}/fallbacks/acquire"  "${meta}" "${pfx}" "${name}" "${sfx}" "_acquire" "$@"
+        gen_template_fallback "${ATOMICDIR}/fallbacks/release"  "${meta}" "${pfx}" "${name}" "${sfx}" "_release" "$@"
+        gen_template_fallback "${ATOMICDIR}/fallbacks/fence"  "${meta}" "${pfx}" "${name}" "${sfx}" "" "$@"
+        printf "#endif /* ${basename}_relaxed */\n\n"
+}
+gen_xchg_fallbacks()
+{
+        local xchg="$1"; shift
+cat <<EOF
+#ifndef ${xchg}_relaxed
+#define ${xchg}_relaxed         ${xchg}
+#define ${xchg}_acquire         ${xchg}
+#define ${xchg}_release         ${xchg}
+#else /* ${xchg}_relaxed */
+#ifndef ${xchg}_acquire
+#define ${xchg}_acquire(...) \\
+        __atomic_op_acquire(${xchg}, __VA_ARGS__)
+#endif
+#ifndef ${xchg}_release
+#define ${xchg}_release(...) \\
+        __atomic_op_release(${xchg}, __VA_ARGS__)
+#endif
+#ifndef ${xchg}
+#define ${xchg}(...) \\
+        __atomic_op_fence(${xchg}, __VA_ARGS__)
+#endif
+#endif /* ${xchg}_relaxed */
+EOF
+}
+cat << EOF
+// SPDX-License-Identifier: GPL-2.0
+// Generated by $0
+// DO NOT MODIFY THIS FILE DIRECTLY
+#ifndef _LINUX_ATOMIC_FALLBACK_H
+#define _LINUX_ATOMIC_FALLBACK_H
+EOF
+for xchg in "xchg" "cmpxchg" "cmpxchg64"; do
+        gen_xchg_fallbacks "${xchg}"
+done
+grep '^[a-z]' "$1" | while read name meta args; do
+        gen_proto "${meta}" "${name}" "atomic" "int" ${args}
+done
+cat <<EOF
+#define atomic_cond_read_acquire(v, c) smp_cond_load_acquire(&(v)->counter, (c))
+#define atomic_cond_read_relaxed(v, c) smp_cond_load_relaxed(&(v)->counter, (c))
+#ifdef CONFIG_GENERIC_ATOMIC64
+#include <asm-generic/atomic64.h>
+#endif
+EOF
+grep '^[a-z]' "$1" | while read name meta args; do
+        gen_proto "${meta}" "${name}" "atomic64" "s64" ${args}
+done
+cat <<EOF
+#define atomic64_cond_read_acquire(v, c) smp_cond_load_acquire(&(v)->counter, (c))
+#define atomic64_cond_read_relaxed(v, c) smp_cond_load_relaxed(&(v)->counter, (c))
+#endif /* _LINUX_ATOMIC_FALLBACK_H */
+EOF
diff --git a/scripts/atomic/gen-atomic-instrumented.sh b/scripts/atomic/gen-atomic-instrumented.sh
new file mode 100755
index 000000000000..e09812372b17
--- /dev/null
+++ b/scripts/atomic/gen-atomic-instrumented.sh
@@ -0,0 +1,182 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+ATOMICDIR=$(dirname $0)
+. ${ATOMICDIR}/atomic-tbl.sh
+#gen_param_check(arg)
+gen_param_check()
+{
+        local arg="$1"; shift
+        local type="${arg%%:*}"
+        local name="$(gen_param_name "${arg}")"
+        local rw="write"
+        case "${type#c}" in
+        i) return;;
+        esac
+        # We don't write to constant parameters
+        [ ${type#c} != ${type} ] && rw="read"
+        printf "\tkasan_check_${rw}(${name}, sizeof(*${name}));\n"
+}
+#gen_param_check(arg...)
+gen_params_checks()
+{
+        while [ "$#" -gt 0 ]; do
+                gen_param_check "$1"
+                shift;
+        done
+}
+# gen_guard(meta, atomic, pfx, name, sfx, order)
+gen_guard()
+{
+        local meta="$1"; shift
+        local atomic="$1"; shift
+        local pfx="$1"; shift
+        local name="$1"; shift
+        local sfx="$1"; shift
+        local order="$1"; shift
+        local atomicname="arch_${atomic}_${pfx}${name}${sfx}${order}"
+        local template="$(find_fallback_template "${pfx}" "${name}" "${sfx}" "${order}")"
+        # We definitely need a preprocessor symbol for this atomic if it is an
+        # ordering variant, or if there's a generic fallback.
+        if [ ! -z "${order}" ] || [ ! -z "${template}" ]; then
+                printf "defined(${atomicname})"
+                return
+        fi
+        # If this is a base variant, but a relaxed variant *may* exist, then we
+        # only have a preprocessor symbol if the relaxed variant isn't defined
+        if meta_has_relaxed "${meta}"; then
+                printf "!defined(${atomicname}_relaxed) || defined(${atomicname})"
+        fi
+}
+#gen_proto_order_variant(meta, pfx, name, sfx, order, atomic, int, arg...)
+gen_proto_order_variant()
+{
+        local meta="$1"; shift
+        local pfx="$1"; shift
+        local name="$1"; shift
+        local sfx="$1"; shift
+        local order="$1"; shift
+        local atomic="$1"; shift
+        local int="$1"; shift
+        local atomicname="${atomic}_${pfx}${name}${sfx}${order}"
+        local guard="$(gen_guard "${meta}" "${atomic}" "${pfx}" "${name}" "${sfx}" "${order}")"
+        local ret="$(gen_ret_type "${meta}" "${int}")"
+        local params="$(gen_params "${int}" "${atomic}" "$@")"
+        local checks="$(gen_params_checks "$@")"
+        local args="$(gen_args "$@")"
+        local retstmt="$(gen_ret_stmt "${meta}")"
+        [ ! -z "${guard}" ] && printf "#if ${guard}\n"
+cat <<EOF
+static inline ${ret}
+${atomicname}(${params})
+{
+${checks}
+        ${retstmt}arch_${atomicname}(${args});
+}
+#define ${atomicname} ${atomicname}
+EOF
+        [ ! -z "${guard}" ] && printf "#endif\n"
+        printf "\n"
+}
+gen_xchg()
+{
+        local xchg="$1"; shift
+        local mult="$1"; shift
+cat <<EOF
+#define ${xchg}(ptr, ...)                                               \\
+({                                                                      \\
+        typeof(ptr) __ai_ptr = (ptr);                                   \\
+        kasan_check_write(__ai_ptr, ${mult}sizeof(*__ai_ptr));          \\
+        arch_${xchg}(__ai_ptr, __VA_ARGS__);                            \\
+})
+EOF
+}
+gen_optional_xchg()
+{
+        local name="$1"; shift
+        local sfx="$1"; shift
+        local guard="defined(arch_${name}${sfx})"
+        [ -z "${sfx}" ] && guard="!defined(arch_${name}_relaxed) || defined(arch_${name})"
+        printf "#if ${guard}\n"
+        gen_xchg "${name}${sfx}" ""
+        printf "#endif\n\n"
+}
+cat << EOF
+// SPDX-License-Identifier: GPL-2.0
+// Generated by $0
+// DO NOT MODIFY THIS FILE DIRECTLY
+/*
+ * This file provides wrappers with KASAN instrumentation for atomic operations.
+ * To use this functionality an arch's atomic.h file needs to define all
+ * atomic operations with arch_ prefix (e.g. arch_atomic_read()) and include
+ * this file at the end. This file provides atomic_read() that forwards to
+ * arch_atomic_read() for actual atomic operation.
+ * Note: if an arch atomic operation is implemented by means of other atomic
+ * operations (e.g. atomic_read()/atomic_cmpxchg() loop), then it needs to use
+ * arch_ variants (i.e. arch_atomic_read()/arch_atomic_cmpxchg()) to avoid
+ * double instrumentation.
+ */
+#ifndef _ASM_GENERIC_ATOMIC_INSTRUMENTED_H
+#define _ASM_GENERIC_ATOMIC_INSTRUMENTED_H
+#include <linux/build_bug.h>
+#include <linux/kasan-checks.h>
+EOF
+grep '^[a-z]' "$1" | while read name meta args; do
+        gen_proto "${meta}" "${name}" "atomic" "int" ${args}
+done
+grep '^[a-z]' "$1" | while read name meta args; do
+        gen_proto "${meta}" "${name}" "atomic64" "s64" ${args}
+done
+for xchg in "xchg" "cmpxchg" "cmpxchg64"; do
+        for order in "" "_acquire" "_release" "_relaxed"; do
+                gen_optional_xchg "${xchg}" "${order}"
+        done
+done
+for xchg in "cmpxchg_local" "cmpxchg64_local" "sync_cmpxchg"; do
+        gen_xchg "${xchg}" ""
+        printf "\n"
+done
+gen_xchg "cmpxchg_double" "2 * "
+printf "\n\n"
+gen_xchg "cmpxchg_double_local" "2 * "
+cat <<EOF
+#endif /* _ASM_GENERIC_ATOMIC_INSTRUMENTED_H */
+EOF
diff --git a/scripts/atomic/gen-atomic-long.sh b/scripts/atomic/gen-atomic-long.sh
new file mode 100755
index 000000000000..c240a7231b2e
--- /dev/null
+++ b/scripts/atomic/gen-atomic-long.sh
@@ -0,0 +1,101 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+ATOMICDIR=$(dirname $0)
+. ${ATOMICDIR}/atomic-tbl.sh
+#gen_cast(arg, int, atomic)
+gen_cast()
+{
+        local arg="$1"; shift
+        local int="$1"; shift
+        local atomic="$1"; shift
+        [ "${arg%%:*}" = "p" ] || return
+        printf "($(gen_param_type "${arg}" "${int}" "${atomic}"))"
+}
+#gen_args_cast(int, atomic, arg...)
+gen_args_cast()
+{
+        local int="$1"; shift
+        local atomic="$1"; shift
+        while [ "$#" -gt 0 ]; do
+                local cast="$(gen_cast "$1" "${int}" "${atomic}")"
+                local arg="$(gen_param_name "$1")"
+                printf "${cast}${arg}"
+                [ "$#" -gt 1 ] && printf ", "
+                shift;
+        done
+}
+#gen_proto_order_variant(meta, pfx, name, sfx, order, atomic, int, arg...)
+gen_proto_order_variant()
+{
+        local meta="$1"; shift
+        local name="$1$2$3$4"; shift; shift; shift; shift
+        local atomic="$1"; shift
+        local int="$1"; shift
+        local ret="$(gen_ret_type "${meta}" "long")"
+        local params="$(gen_params "long" "atomic_long" "$@")"
+        local argscast="$(gen_args_cast "${int}" "${atomic}" "$@")"
+        local retstmt="$(gen_ret_stmt "${meta}")"
+cat <<EOF
+static inline ${ret}
+atomic_long_${name}(${params})
+{
+        ${retstmt}${atomic}_${name}(${argscast});
+}
+EOF
+}
+cat << EOF
+// SPDX-License-Identifier: GPL-2.0
+// Generated by $0
+// DO NOT MODIFY THIS FILE DIRECTLY
+#ifndef _ASM_GENERIC_ATOMIC_LONG_H
+#define _ASM_GENERIC_ATOMIC_LONG_H
+#include <asm/types.h>
+#ifdef CONFIG_64BIT
+typedef atomic64_t atomic_long_t;
+#define ATOMIC_LONG_INIT(i)             ATOMIC64_INIT(i)
+#define atomic_long_cond_read_acquire   atomic64_cond_read_acquire
+#define atomic_long_cond_read_relaxed   atomic64_cond_read_relaxed
+#else
+typedef atomic_t atomic_long_t;
+#define ATOMIC_LONG_INIT(i)             ATOMIC_INIT(i)
+#define atomic_long_cond_read_acquire   atomic_cond_read_acquire
+#define atomic_long_cond_read_relaxed   atomic_cond_read_relaxed
+#endif
+#ifdef CONFIG_64BIT
+EOF
+grep '^[a-z]' "$1" | while read name meta args; do
+        gen_proto "${meta}" "${name}" "atomic64" "s64" ${args}
+done
+cat <<EOF
+#else /* CONFIG_64BIT */
+EOF
+grep '^[a-z]' "$1" | while read name meta args; do
+        gen_proto "${meta}" "${name}" "atomic" "int" ${args}
+done
+cat <<EOF
+#endif /* CONFIG_64BIT */
+#endif /* _ASM_GENERIC_ATOMIC_LONG_H */
+EOF
diff --git a/scripts/atomic/gen-atomics.sh b/scripts/atomic/gen-atomics.sh
new file mode 100644
index 000000000000..27400b0cd732
--- /dev/null
+++ b/scripts/atomic/gen-atomics.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+#
+# Generate atomic headers
+ATOMICDIR=$(dirname $0)
+ATOMICTBL=${ATOMICDIR}/atomics.tbl
+LINUXDIR=${ATOMICDIR}/../..
+cat <<EOF |
+gen-atomic-instrumented.sh      asm-generic/atomic-instrumented.h
+gen-atomic-long.sh              asm-generic/atomic-long.h
+gen-atomic-fallback.sh          linux/atomic-fallback.h
+EOF
+while read script header; do
+        ${ATOMICDIR}/${script} ${ATOMICTBL} > ${LINUXDIR}/include/${header}
+        HASH="$(sha1sum ${LINUXDIR}/include/${header})"
+        HASH="${HASH%% *}"
+        printf "// %s\n" "${HASH}" >> ${LINUXDIR}/include/${header}
+done
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index b737ca9d7204..5b756278df13 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -61,7 +61,7 @@ my $codespellfile = "/usr/share/codespell/dictionary.txt";
 my $conststructsfile = "$D/const_structs.checkpatch";
 my $typedefsfile = "";
 my $color = "auto";
-my $allow_c99_comments = 1;
+my $allow_c99_comments = 1; # Can be overridden by --ignore C99_COMMENT_TOLERANCE
 sub help {
        my ($exitcode) = @_;
@@ -466,6 +466,16 @@ our $logFunctions = qr{(?x:
        seq_vprintf|seq_printf|seq_puts
 )};
+our $allocFunctions = qr{(?x:
+        (?:(?:devm_)?
+                (?:kv|k|v)[czm]alloc(?:_node|_array)? |
+                kstrdup(?:_const)? |
+                kmemdup(?:_nul)?) |
+        (?:\w+)?alloc_skb(?:ip_align)? |
+                                # dev_alloc_skb/netdev_alloc_skb, et al
+        dma_alloc_coherent
+)};
 our $signature_tags = qr{(?xi:
        Signed-off-by:|
        Co-developed-by:|
@@ -1011,6 +1021,7 @@ if ($git) {
 }
 my $vname;
+$allow_c99_comments = !defined $ignore_type{"C99_COMMENT_TOLERANCE"};
 for my $filename (@ARGV) {
        my $FILE;
        if ($git) {
@@ -3037,6 +3048,14 @@ sub process {
                                        $comment = '..';
                                }
+# check SPDX comment style for .[chsS] files
+                                if ($realfile =~ /\.[chsS]$/ &&
+                                    $rawline =~ /SPDX-License-Identifier:/ &&
+                                    $rawline !~ /^\+\s*\Q$comment\E\s*/) {
+                                        WARN("SPDX_LICENSE_TAG",
+                                             "Improper SPDX comment style for '$realfile', please use '$comment' instead\n" . $herecurr);
+                                }
                                if ($comment !~ /^$/ &&
                                    $rawline !~ /^\+\Q$comment\E SPDX-License-Identifier: /) {
                                         WARN("SPDX_LICENSE_TAG",
@@ -3054,6 +3073,14 @@ sub process {
 # check we are in a valid source file if not then ignore this hunk
                next if ($realfile !~ /\.(h|c|s|S|sh|dtsi|dts)$/);
+# check for using SPDX-License-Identifier on the wrong line number
+                if ($realline != $checklicenseline &&
+                    $rawline =~ /\bSPDX-License-Identifier:/ &&
+                    substr($line, @-, @+ - @-) eq "$;" x (@+ - @-)) {
+                        WARN("SPDX_LICENSE_TAG",
+                             "Misplaced SPDX-License-Identifier tag - use line $checklicenseline instead\n" . $herecurr);
+                }
 # line length limit (with some exclusions)
 #
 # There are a few types of lines that may extend beyond $max_line_length:
@@ -5545,7 +5572,8 @@ sub process {
                        my ($s, $c) = ctx_statement_block($linenr - 3, $realcnt, 0);
 #                       print("line: <$line>\nprevline: <$prevline>\ns: <$s>\nc: <$c>\n\n\n");
-                        if ($s =~ /(?:^|\n)[ \+]\s*(?:$Type\s*)?\Q$testval\E\s*=\s*(?:\([^\)]*\)\s*)?\s*(?:devm_)?(?:[kv][czm]alloc(?:_node|_array)?\b|kstrdup|kmemdup|(?:dev_)?alloc_skb)/) {
+                        if ($s =~ /(?:^|\n)[ \+]\s*(?:$Type\s*)?\Q$testval\E\s*=\s*(?:\([^\)]*\)\s*)?\s*$allocFunctions\s*\(/ &&
+                            $s !~ /\b__GFP_NOWARN\b/ ) {
                                WARN("OOM_MESSAGE",
                                     "Possible unnecessary 'out of memory' message\n" . $hereprev);
                        }
@@ -6196,8 +6224,8 @@ sub process {
                        }
                }
-# check for pointless casting of kmalloc return
+# check for pointless casting of alloc functions
-                if ($line =~ /\*\s*\)\s*[kv][czm]alloc(_node){0,1}\b/) {
+                if ($line =~ /\*\s*\)\s*$allocFunctions\b/) {
                        WARN("UNNECESSARY_CASTS",
                             "unnecessary cast may hide bugs, see http://c-faq.com/malloc/mallocnocast.html\n" . $herecurr);
                }
@@ -6205,7 +6233,7 @@ sub process {
 # alloc style
 # p = alloc(sizeof(struct foo), ...) should be p = alloc(sizeof(*p), ...)
                if ($perl_version_ok &&
-                    $line =~ /\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*([kv][mz]alloc(?:_node)?)\s*\(\s*(sizeof\s*\(\s*struct\s+$Lval\s*\))/) {
+                    $line =~ /\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*((?:kv|k|v)[mz]alloc(?:_node)?)\s*\(\s*(sizeof\s*\(\s*struct\s+$Lval\s*\))/) {
                        CHK("ALLOC_SIZEOF_STRUCT",
                            "Prefer $3(sizeof(*$1)...) over $3($4...)\n" . $herecurr);
                }
@@ -6368,19 +6396,6 @@ sub process {
                        }
                }
-# check for bool bitfields
-                if ($sline =~ /^.\s+bool\s*$Ident\s*:\s*\d+\s*;/) {
-                        WARN("BOOL_BITFIELD",
-                             "Avoid using bool as bitfield.  Prefer bool bitfields as unsigned int or u<8|16|32>\n" . $herecurr);
-                }
-# check for bool use in .h files
-                if ($realfile =~ /\.h$/ &&
-                    $sline =~ /^.\s+bool\s*$Ident\s*(?::\s*d+\s*)?;/) {
-                        CHK("BOOL_MEMBER",
-                            "Avoid using bool structure members because of possible alignment issues - see: https://lkml.org/lkml/2017/11/21/384\n" . $herecurr);
-                }
 # check for semaphores initialized locked
                if ($line =~ /^.\s*sema_init.+,\W?0\W?\)/) {
                        WARN("CONSIDER_COMPLETION",
diff --git a/scripts/clang-version.sh b/scripts/clang-version.sh
index e65fbc3079d4..6fabf0695761 100755
--- a/scripts/clang-version.sh
+++ b/scripts/clang-version.sh
@@ -1,14 +1,10 @@
 #!/bin/sh
 # SPDX-License-Identifier: GPL-2.0
 #
-# clang-version [-p] clang-command
+# clang-version clang-command
-#
-# Prints the compiler version of `clang-command' in a canonical 4-digit form
-# such as `0500' for clang-5.0 etc.
-#
-# With the -p option, prints the patchlevel as well, for example `050001' for
-# clang-5.0.1 etc.
 #
+# Print the compiler version of `clang-command' in a 5 or 6-digit form
+# such as `50001' for clang-5.0.1 etc.
 compiler="$*"
diff --git a/scripts/coccinelle/free/put_device.cocci b/scripts/coccinelle/free/put_device.cocci
new file mode 100644
index 000000000000..7395697e7f19
--- /dev/null
+++ b/scripts/coccinelle/free/put_device.cocci
@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: GPL-2.0
+/// Find missing put_device for every of_find_device_by_node.
+///
+// Confidence: Moderate
+// Copyright: (C) 2018-2019 Wen Yang, ZTE.
+// Comments:
+// Options: --no-includes --include-headers
+virtual report
+virtual org
+@search exists@
+local idexpression id;
+expression x,e,e1;
+position p1,p2;
+type T,T1,T2,T3;
+@@
+id = of_find_device_by_node@p1(x)
+... when != e = id
+if (id == NULL || ...) { ... return ...; }
+... when != put_device(&id->dev)
+    when != platform_device_put(id)
+    when != of_dev_put(id)
+    when != if (id) { ... put_device(&id->dev) ... }
+    when != e1 = (T)id
+    when != e1 = &id->dev
+    when != e1 = get_device(&id->dev)
+    when != e1 = (T1)platform_get_drvdata(id)
+(
+  return
+(    id
+|    (T2)dev_get_drvdata(&id->dev)
+|    (T3)platform_get_drvdata(id)
+);
+| return@p2 ...;
+)
+@script:python depends on report@
+p1 << search.p1;
+p2 << search.p2;
+@@
+coccilib.report.print_report(p2[0], "ERROR: missing put_device; "
+                              + "call of_find_device_by_node on line "
+                              + p1[0].line
+                              + ", but without a corresponding object release "
+                              + "within this function.")
+@script:python depends on org@
+p1 << search.p1;
+p2 << search.p2;
+@@
+cocci.print_main("of_find_device_by_node", p1)
+cocci.print_secs("needed put_device", p2)
diff --git a/scripts/decode_stacktrace.sh b/scripts/decode_stacktrace.sh
index 98a7d63a723e..bcdd45df3f51 100755
--- a/scripts/decode_stacktrace.sh
+++ b/scripts/decode_stacktrace.sh
@@ -37,6 +37,13 @@ parse_symbol() {
        symbol=${symbol#\(}
        symbol=${symbol%\)}
+        # Strip segment
+        local segment
+        if [[ $symbol == *:* ]] ; then
+                segment=${symbol%%:*}:
+                symbol=${symbol#*:}
+        fi
        # Strip the symbol name so that we could look it up
        local name=${symbol%+*}
@@ -84,7 +91,7 @@ parse_symbol() {
        code=${code//$'\n'/' '}
        # Replace old address with pretty line numbers
-        symbol="$name ($code)"
+        symbol="$segment$name ($code)"
 }
 decode_code() {
diff --git a/scripts/dtc/dtx_diff b/scripts/dtc/dtx_diff
index 8c4fbad2055e..0d8572008729 100755
--- a/scripts/dtc/dtx_diff
+++ b/scripts/dtc/dtx_diff
@@ -21,6 +21,7 @@ Usage:
        diff DTx_1 and DTx_2
+      --annotate    synonym for -T
       -f           print full dts in diff (--unified=99999)
       -h           synonym for --help
       -help        synonym for --help
@@ -28,6 +29,7 @@ Usage:
       -s SRCTREE   linux kernel source tree is at path SRCTREE
                        (default is current directory)
       -S           linux kernel source tree is at root of current git repo
+       -T           Annotate output .dts with input source file and line (-T -T for more details)
       -u           unsorted, do not sort DTx
@@ -174,6 +176,7 @@ compile_to_dts() {
 # -----  start of script
+annotate=""
 cmd_diff=0
 diff_flags="-u"
 dtx_file_1=""
@@ -208,6 +211,14 @@ while [ $# -gt 0 ] ; do
                shift
                ;;
+        -T | --annotate )
+                if [ "${annotate}"  = "" ] ; then
+                        annotate="-T"
+                elif [ "${annotate}"  = "-T" ] ; then
+                        annotate="-T -T"
+                fi
+                shift
+                ;;
        -u )
                dtc_sort=""
                shift
@@ -327,7 +338,7 @@ cpp_flags="\
 DTC="\
        ${DTC}                                     \
        -i ${srctree}/scripts/dtc/include-prefixes \
-        -O dts -qq -f ${dtc_sort} -o -"
+        -O dts -qq -f ${dtc_sort} ${annotate} -o -"
 # -----  do the diff or decompile
diff --git a/scripts/gcc-plugins/Kconfig b/scripts/gcc-plugins/Kconfig
index d45f7f36b859..74271dba4f94 100644
--- a/scripts/gcc-plugins/Kconfig
+++ b/scripts/gcc-plugins/Kconfig
@@ -67,27 +67,59 @@ config GCC_PLUGIN_LATENT_ENTROPY
           * https://pax.grsecurity.net/
 config GCC_PLUGIN_STRUCTLEAK
-        bool "Force initialization of variables containing userspace addresses"
+        bool "Zero initialize stack variables"
-        # Currently STRUCTLEAK inserts initialization out of live scope of
-        # variables from KASAN point of view. This leads to KASAN false
-        # positive reports. Prohibit this combination for now.
-        depends on !KASAN_EXTRA
        help
-          This plugin zero-initializes any structures containing a
+          While the kernel is built with warnings enabled for any missed
-          __user attribute. This can prevent some classes of information
+          stack variable initializations, this warning is silenced for
-          exposures.
+          anything passed by reference to another function, under the
+          occasionally misguided assumption that the function will do
-          This plugin was ported from grsecurity/PaX. More information at:
+          the initialization. As this regularly leads to exploitable
+          flaws, this plugin is available to identify and zero-initialize
+          such variables, depending on the chosen level of coverage.
+          This plugin was originally ported from grsecurity/PaX. More
+          information at:
           * https://grsecurity.net/
           * https://pax.grsecurity.net/
-config GCC_PLUGIN_STRUCTLEAK_BYREF_ALL
+choice
-        bool "Force initialize all struct type variables passed by reference"
+        prompt "Coverage"
        depends on GCC_PLUGIN_STRUCTLEAK
-        depends on !COMPILE_TEST
+        default GCC_PLUGIN_STRUCTLEAK_BYREF_ALL
        help
-          Zero initialize any struct type local variable that may be passed by
+          This chooses the level of coverage over classes of potentially
-          reference without having been initialized.
+          uninitialized variables. The selected class will be
+          zero-initialized before use.
+        config GCC_PLUGIN_STRUCTLEAK_USER
+                bool "structs marked for userspace"
+                help
+                  Zero-initialize any structures on the stack containing
+                  a __user attribute. This can prevent some classes of
+                  uninitialized stack variable exploits and information
+                  exposures, like CVE-2013-2141:
+                  https://git.kernel.org/linus/b9e146d8eb3b9eca
+        config GCC_PLUGIN_STRUCTLEAK_BYREF
+                bool "structs passed by reference"
+                help
+                  Zero-initialize any structures on the stack that may
+                  be passed by reference and had not already been
+                  explicitly initialized. This can prevent most classes
+                  of uninitialized stack variable exploits and information
+                  exposures, like CVE-2017-1000410:
+                  https://git.kernel.org/linus/06e7e776ca4d3654
+        config GCC_PLUGIN_STRUCTLEAK_BYREF_ALL
+                bool "anything passed by reference"
+                help
+                  Zero-initialize any stack variables that may be passed
+                  by reference and had not already been explicitly
+                  initialized. This is intended to eliminate all classes
+                  of uninitialized stack variable exploits and information
+                  exposures.
+endchoice
 config GCC_PLUGIN_STRUCTLEAK_VERBOSE
        bool "Report forcefully initialized variables"
diff --git a/scripts/gcc-plugins/structleak_plugin.c b/scripts/gcc-plugins/structleak_plugin.c
index 10292f791e99..e89be8f5c859 100644
--- a/scripts/gcc-plugins/structleak_plugin.c
+++ b/scripts/gcc-plugins/structleak_plugin.c
@@ -16,6 +16,7 @@
 * Options:
 * -fplugin-arg-structleak_plugin-disable
 * -fplugin-arg-structleak_plugin-verbose
+ * -fplugin-arg-structleak_plugin-byref
 * -fplugin-arg-structleak_plugin-byref-all
 *
 * Usage:
@@ -26,7 +27,6 @@
 * $ gcc -fplugin=./structleak_plugin.so test.c -O2
 *
 * TODO: eliminate redundant initializers
- *       increase type coverage
 */
 #include "gcc-common.h"
@@ -37,13 +37,18 @@
 __visible int plugin_is_GPL_compatible;
 static struct plugin_info structleak_plugin_info = {
-        .version        = "201607271510vanilla",
+        .version        = "20190125vanilla",
        .help           = "disable\tdo not activate plugin\n"
-                           "verbose\tprint all initialized variables\n",
+                          "byref\tinit structs passed by reference\n"
+                          "byref-all\tinit anything passed by reference\n"
+                          "verbose\tprint all initialized variables\n",
 };
+#define BYREF_STRUCT    1
+#define BYREF_ALL       2
 static bool verbose;
-static bool byref_all;
+static int byref;
 static tree handle_user_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
 {
@@ -118,6 +123,7 @@ static void initialize(tree var)
        gimple_stmt_iterator gsi;
        tree initializer;
        gimple init_stmt;
+        tree type;
        /* this is the original entry bb before the forced split */
        bb = single_succ(ENTRY_BLOCK_PTR_FOR_FN(cfun));
@@ -148,11 +154,15 @@ static void initialize(tree var)
        if (verbose)
                inform(DECL_SOURCE_LOCATION(var),
                        "%s variable will be forcibly initialized",
-                        (byref_all && TREE_ADDRESSABLE(var)) ? "byref"
+                        (byref && TREE_ADDRESSABLE(var)) ? "byref"
-                                                             : "userspace");
+                                                         : "userspace");
        /* build the initializer expression */
-        initializer = build_constructor(TREE_TYPE(var), NULL);
+        type = TREE_TYPE(var);
+        if (AGGREGATE_TYPE_P(type))
+                initializer = build_constructor(type, NULL);
+        else
+                initializer = fold_convert(type, integer_zero_node);
        /* build the initializer stmt */
        init_stmt = gimple_build_assign(var, initializer);
@@ -184,13 +194,13 @@ static unsigned int structleak_execute(void)
                if (!auto_var_in_fn_p(var, current_function_decl))
                        continue;
-                /* only care about structure types */
+                /* only care about structure types unless byref-all */
-                if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
+                if (byref != BYREF_ALL && TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
                        continue;
                /* if the type is of interest, examine the variable */
                if (TYPE_USERSPACE(type) ||
-                    (byref_all && TREE_ADDRESSABLE(var)))
+                    (byref && TREE_ADDRESSABLE(var)))
                        initialize(var);
        }
@@ -232,8 +242,12 @@ __visible int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gc
                        verbose = true;
                        continue;
                }
+                if (!strcmp(argv[i].key, "byref")) {
+                        byref = BYREF_STRUCT;
+                        continue;
+                }
                if (!strcmp(argv[i].key, "byref-all")) {
-                        byref_all = true;
+                        byref = BYREF_ALL;
                        continue;
                }
                error(G_("unknown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
diff --git a/scripts/gcc-version.sh b/scripts/gcc-version.sh
index 11bb909845e7..ae353432539b 100755
--- a/scripts/gcc-version.sh
+++ b/scripts/gcc-version.sh
@@ -1,33 +1,20 @@
 #!/bin/sh
 # SPDX-License-Identifier: GPL-2.0
 #
-# gcc-version [-p] gcc-command
+# gcc-version gcc-command
-#
-# Prints the gcc version of `gcc-command' in a canonical 4-digit form
-# such as `0295' for gcc-2.95, `0303' for gcc-3.3, etc.
-#
-# With the -p option, prints the patchlevel as well, for example `029503' for
-# gcc-2.95.3, `030301' for gcc-3.3.1, etc.
 #
+# Print the gcc version of `gcc-command' in a 5 or 6-digit form
-if [ "$1" = "-p" ] ; then
+# such as `29503' for gcc-2.95.3, `30301' for gcc-3.3.1, etc.
-        with_patchlevel=1;
-        shift;
-fi
 compiler="$*"
 if [ ${#compiler} -eq 0 ]; then
-        echo "Error: No compiler specified."
+        echo "Error: No compiler specified." >&2
-        printf "Usage:\n\t$0 <gcc-command>\n"
+        printf "Usage:\n\t$0 <gcc-command>\n" >&2
        exit 1
 fi
 MAJOR=$(echo __GNUC__ | $compiler -E -x c - | tail -n 1)
 MINOR=$(echo __GNUC_MINOR__ | $compiler -E -x c - | tail -n 1)
-if [ "x$with_patchlevel" != "x" ] ; then
+PATCHLEVEL=$(echo __GNUC_PATCHLEVEL__ | $compiler -E -x c - | tail -n 1)
-        PATCHLEVEL=$(echo __GNUC_PATCHLEVEL__ | $compiler -E -x c - | tail -n 1)
+printf "%d%02d%02d\\n" $MAJOR $MINOR $PATCHLEVEL
-        printf "%02d%02d%02d\\n" $MAJOR $MINOR $PATCHLEVEL
-else
-        printf "%02d%02d\\n" $MAJOR $MINOR
-fi
diff --git a/scripts/gdb/linux/Makefile b/scripts/gdb/linux/Makefile
index aba23be985e4..3df395a9c2ce 100644
--- a/scripts/gdb/linux/Makefile
+++ b/scripts/gdb/linux/Makefile
@@ -1,24 +1,25 @@
 # SPDX-License-Identifier: GPL-2.0
-always := gdb-scripts
-SRCTREE := $(abspath $(srctree))
-$(obj)/gdb-scripts:
 ifneq ($(KBUILD_SRC),)
-        $(Q)ln -fsn $(SRCTREE)/$(obj)/*.py $(objtree)/$(obj)
+symlinks := $(patsubst $(srctree)/$(src)/%,%,$(wildcard $(srctree)/$(src)/*.py))
+quiet_cmd_symlink = SYMLINK $@
+      cmd_symlink = ln -fsn $(patsubst $(obj)/%,$(abspath $(srctree))/$(src)/%,$@) $@
+extra-y += $(symlinks)
+$(addprefix $(obj)/, $(symlinks)): FORCE
+        $(call if_changed,symlink)
 endif
-        @:
 quiet_cmd_gen_constants_py = GEN     $@
      cmd_gen_constants_py = \
        $(CPP) -E -x c -P $(c_flags) $< > $@ ;\
        sed -i '1,/<!-- end-c-headers -->/d;' $@
-targets += constants.py
+extra-y += constants.py
-$(obj)/constants.py: $(SRCTREE)/$(obj)/constants.py.in FORCE
+$(obj)/constants.py: $(src)/constants.py.in FORCE
        $(call if_changed_dep,gen_constants_py)
-build_constants_py: $(obj)/constants.py
+clean-files := *.pyc *.pyo
-        @:
-clean-files := *.pyc *.pyo $(if $(KBUILD_SRC),*.py) $(obj)/constants.py
diff --git a/scripts/gdb/linux/constants.py.in b/scripts/gdb/linux/constants.py.in
index 7aad82406422..d3319a80788a 100644
--- a/scripts/gdb/linux/constants.py.in
+++ b/scripts/gdb/linux/constants.py.in
@@ -37,12 +37,12 @@
 import gdb
 /* linux/fs.h */
-LX_VALUE(MS_RDONLY)
+LX_VALUE(SB_RDONLY)
-LX_VALUE(MS_SYNCHRONOUS)
+LX_VALUE(SB_SYNCHRONOUS)
-LX_VALUE(MS_MANDLOCK)
+LX_VALUE(SB_MANDLOCK)
-LX_VALUE(MS_DIRSYNC)
+LX_VALUE(SB_DIRSYNC)
-LX_VALUE(MS_NOATIME)
+LX_VALUE(SB_NOATIME)
-LX_VALUE(MS_NODIRATIME)
+LX_VALUE(SB_NODIRATIME)
 /* linux/mount.h */
 LX_VALUE(MNT_NOSUID)
diff --git a/scripts/gdb/linux/proc.py b/scripts/gdb/linux/proc.py
index 0aebd7565b03..2f01a958eb22 100644
--- a/scripts/gdb/linux/proc.py
+++ b/scripts/gdb/linux/proc.py
@@ -114,11 +114,11 @@ def info_opts(lst, opt):
    return opts
-FS_INFO = {constants.LX_MS_SYNCHRONOUS: ",sync",
+FS_INFO = {constants.LX_SB_SYNCHRONOUS: ",sync",
-           constants.LX_MS_MANDLOCK: ",mand",
+           constants.LX_SB_MANDLOCK: ",mand",
-           constants.LX_MS_DIRSYNC: ",dirsync",
+           constants.LX_SB_DIRSYNC: ",dirsync",
-           constants.LX_MS_NOATIME: ",noatime",
+           constants.LX_SB_NOATIME: ",noatime",
-           constants.LX_MS_NODIRATIME: ",nodiratime"}
+           constants.LX_SB_NODIRATIME: ",nodiratime"}
 MNT_INFO = {constants.LX_MNT_NOSUID: ",nosuid",
            constants.LX_MNT_NODEV: ",nodev",
@@ -184,7 +184,7 @@ values of that process namespace"""
            fstype = superblock['s_type']['name'].string()
            s_flags = int(superblock['s_flags'])
            m_flags = int(vfs['mnt']['mnt_flags'])
-            rd = "ro" if (s_flags & constants.LX_MS_RDONLY) else "rw"
+            rd = "ro" if (s_flags & constants.LX_SB_RDONLY) else "rw"
            gdb.write(
                "{} {} {} {}{}{} 0 0\n"
diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
index f75e7bda4889..e17837f1d3f2 100644
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -62,11 +62,11 @@ static int all_symbols = 0;
 static int absolute_percpu = 0;
 static int base_relative = 0;
-int token_profit[0x10000];
+static int token_profit[0x10000];
 /* the table that holds the result of the compression */
-unsigned char best_table[256][2];
+static unsigned char best_table[256][2];
-unsigned char best_table_len[256];
+static unsigned char best_table_len[256];
 static void usage(void)
@@ -80,7 +80,7 @@ static void usage(void)
 * This ignores the intensely annoying "mapping symbols" found
 * in ARM ELF files: $a, $t and $d.
 */
-static inline int is_arm_mapping_symbol(const char *str)
+static int is_arm_mapping_symbol(const char *str)
 {
        return str[0] == '$' && strchr("axtd", str[1])
               && (str[2] == '\0' || str[2] == '.');
@@ -331,7 +331,7 @@ static void write_src(void)
        unsigned int *markers;
        char buf[KSYM_NAME_LEN];
-        printf("#include <asm/types.h>\n");
+        printf("#include <asm/bitsperlong.h>\n");
        printf("#if BITS_PER_LONG == 64\n");
        printf("#define PTR .quad\n");
        printf("#define ALGN .balign 8\n");
@@ -596,9 +596,6 @@ static void insert_real_symbols_in_table(void)
 {
        unsigned int i, j, c;
-        memset(best_table, 0, sizeof(best_table));
-        memset(best_table_len, 0, sizeof(best_table_len));
        for (i = 0; i < table_cnt; i++) {
                for (j = 0; j < table[i].len; j++) {
                        c = table[i].sym[j];
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 181973509a05..7c5dc31c1d95 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -143,11 +143,12 @@ help:
 # ===========================================================================
 # object files used by all kconfig flavours
-common-objs     := confdata.o expr.o symbol.o preprocess.o zconf.lex.o zconf.tab.o
+common-objs     := confdata.o expr.o lexer.lex.o parser.tab.o preprocess.o \
+                   symbol.o
-$(obj)/zconf.lex.o: $(obj)/zconf.tab.h
+$(obj)/lexer.lex.o: $(obj)/parser.tab.h
-HOSTCFLAGS_zconf.lex.o  := -I$(src)
+HOSTCFLAGS_lexer.lex.o  := -I$(src)
-HOSTCFLAGS_zconf.tab.o  := -I$(src)
+HOSTCFLAGS_parser.tab.o := -I$(src)
 # conf: Used for defconfig, oldconfig and related targets
 hostprogs-y     += conf
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index da89ef788a8d..ef3678c24bab 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -488,7 +488,6 @@ int main(int ac, char **av)
        const char *progname = av[0];
        int opt;
        const char *name, *defconfig_file = NULL /* gcc uninit */;
-        struct stat tmpstat;
        int no_conf_write = 0;
        tty_stdio = isatty(0) && isatty(1);
@@ -560,18 +559,6 @@ int main(int ac, char **av)
        name = av[optind];
        conf_parse(name);
        //zconfdump(stdout);
-        if (sync_kconfig) {
-                name = conf_get_configname();
-                if (stat(name, &tmpstat)) {
-                        fprintf(stderr, "***\n"
-                                "*** Configuration file \"%s\" not found!\n"
-                                "***\n"
-                                "*** Please run some configurator (e.g. \"make oldconfig\" or\n"
-                                "*** \"make menuconfig\" or \"make xconfig\").\n"
-                                "***\n", name);
-                        exit(1);
-                }
-        }
        switch (input_mode) {
        case defconfig:
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index 999edb60cd53..8dde65bc3165 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -172,7 +172,7 @@ struct symbol {
 *         int "BAZ Value"
 *         range 1..255
 *
- * Please, also check zconf.y:print_symbol() when modifying the
+ * Please, also check parser.y:print_symbol() when modifying the
 * list of property types!
 */
 enum prop_type {
diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/lexer.l
index b2d0a3b0bce9..c9df1c8b9824 100644
--- a/scripts/kconfig/zconf.l
+++ b/scripts/kconfig/lexer.l
@@ -15,7 +15,7 @@
 #include <unistd.h>
 #include "lkc.h"
-#include "zconf.tab.h"
+#include "parser.tab.h"
 #define YY_DECL         static int yylex1(void)
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
index 531ff7c57d92..d871539e4b45 100644
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -90,7 +90,7 @@ void *xrealloc(void *p, size_t size);
 char *xstrdup(const char *s);
 char *xstrndup(const char *s, size_t n);
-/* zconf.l */
+/* lexer.l */
 int yylex(void);
 struct gstr {
diff --git a/scripts/kconfig/lxdialog/.gitignore b/scripts/kconfig/lxdialog/.gitignore
deleted file mode 100644
index 90b08ff025a6..000000000000
--- a/scripts/kconfig/lxdialog/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Generated files
-#
-lxdialog
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/parser.y
index 60936c76865b..60936c76865b 100644
--- a/scripts/kconfig/zconf.y
+++ b/scripts/kconfig/parser.y
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 8be8a70c5542..ce7fc87a49a7 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -1392,6 +1392,8 @@ ConfigMainWindow::ConfigMainWindow(void)
        conf_set_changed_callback(conf_changed);
        // Set saveAction's initial state
        conf_changed();
+        configname = xstrdup(conf_get_configname());
        QAction *saveAsAction = new QAction("Save &As...", this);
          connect(saveAsAction, SIGNAL(triggered(bool)), SLOT(saveConfigAs()));
        QAction *searchAction = new QAction("&Find", this);
@@ -1520,17 +1522,29 @@ ConfigMainWindow::ConfigMainWindow(void)
 void ConfigMainWindow::loadConfig(void)
 {
-        QString s = QFileDialog::getOpenFileName(this, "", conf_get_configname());
+        QString str;
-        if (s.isNull())
+        QByteArray ba;
+        const char *name;
+        str = QFileDialog::getOpenFileName(this, "", configname);
+        if (str.isNull())
                return;
-        if (conf_read(QFile::encodeName(s)))
+        ba = str.toLocal8Bit();
+        name = ba.data();
+        if (conf_read(name))
                QMessageBox::information(this, "qconf", "Unable to load configuration!");
+        free(configname);
+        configname = xstrdup(name);
        ConfigView::updateListAll();
 }
 bool ConfigMainWindow::saveConfig(void)
 {
-        if (conf_write(NULL)) {
+        if (conf_write(configname)) {
                QMessageBox::information(this, "qconf", "Unable to save configuration!");
                return false;
        }
@@ -1541,10 +1555,24 @@ bool ConfigMainWindow::saveConfig(void)
 void ConfigMainWindow::saveConfigAs(void)
 {
-        QString s = QFileDialog::getSaveFileName(this, "", conf_get_configname());
+        QString str;
-        if (s.isNull())
+        QByteArray ba;
+        const char *name;
+        str = QFileDialog::getSaveFileName(this, "", configname);
+        if (str.isNull())
                return;
-        saveConfig();
+        ba = str.toLocal8Bit();
+        name = ba.data();
+        if (conf_write(name)) {
+                QMessageBox::information(this, "qconf", "Unable to save configuration!");
+        }
+        conf_write_autoconf(0);
+        free(configname);
+        configname = xstrdup(name);
 }
 void ConfigMainWindow::searchConfig(void)
diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h
index 41df466e67d9..45bfe9b2b966 100644
--- a/scripts/kconfig/qconf.h
+++ b/scripts/kconfig/qconf.h
@@ -291,6 +291,7 @@ protected:
 class ConfigMainWindow : public QMainWindow {
        Q_OBJECT
+        char *configname;
        static QAction *saveAction;
        static void conf_changed(void);
 public:
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index c5333d251985..3350e498b4ce 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1474,7 +1474,7 @@ sub push_parameter($$$$) {
        if (!defined $parameterdescs{$param} && $param !~ /^#/) {
                $parameterdescs{$param} = $undescribed;
-                if (show_warnings($type, $declaration_name)) {
+                if (show_warnings($type, $declaration_name) && $param !~ /\./) {
                        print STDERR
                              "${file}:$.: warning: Function parameter or member '$param' not described in '$declaration_name'\n";
                        ++$warnings;
diff --git a/scripts/leaking_addresses.pl b/scripts/leaking_addresses.pl
index 6a897788f5a7..ef9e5b2a1614 100755
--- a/scripts/leaking_addresses.pl
+++ b/scripts/leaking_addresses.pl
@@ -97,7 +97,7 @@ Options:
        --32-bit                        Scan 32-bit kernel.
        --page-offset-32-bit=o          Page offset (for 32-bit kernel 0xABCD1234).
        -d, --debug                     Display debugging output.
-        -h, --help, --version           Display this help and exit.
+        -h, --help                      Display this help and exit.
 Scans the running kernel for potential leaking addresses.
@@ -108,7 +108,6 @@ EOM
 GetOptions(
        'd|debug'               => \$debug,
        'h|help'                => \$help,
-        'version'               => \$help,
        'o|output-raw=s'        => \$output_raw,
        'i|input-raw=s'         => \$input_raw,
        'suppress-dmesg'        => \$suppress_dmesg,
@@ -231,7 +230,7 @@ sub get_kernel_config_option
                my $tmp_file = "/tmp/tmpkconf";
                if (system("gunzip < /proc/config.gz > $tmp_file")) {
-                        dprint "$0: system(gunzip < /proc/config.gz) failed\n";
+                        dprint("system(gunzip < /proc/config.gz) failed\n");
                        return "";
                } else {
                        @config_files = ($tmp_file);
@@ -243,7 +242,7 @@ sub get_kernel_config_option
        }
        foreach my $file (@config_files) {
-                dprint("parsing config file: %s\n", $file);
+                dprint("parsing config file: $file\n");
                $value = option_from_file($option, $file);
                if ($value ne "") {
                        last;
@@ -502,7 +501,7 @@ sub walk
                                next;
                        }
-                        dprint "parsing: $path\n";
+                        dprint("parsing: $path\n");
                        timed_parse_file($path);
                }
        }
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index c8cf45362bd6..dc0e8c5a1402 100755
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -3,22 +3,17 @@
 #
 # link vmlinux
 #
-# vmlinux is linked from the objects selected by $(KBUILD_VMLINUX_INIT) and
+# vmlinux is linked from the objects selected by $(KBUILD_VMLINUX_OBJS) and
-# $(KBUILD_VMLINUX_MAIN) and $(KBUILD_VMLINUX_LIBS). Most are built-in.a files
+# $(KBUILD_VMLINUX_LIBS). Most are built-in.a files from top-level directories
-# from top-level directories in the kernel tree, others are specified in
+# in the kernel tree, others are specified in arch/$(ARCH)/Makefile.
-# arch/$(ARCH)/Makefile. Ordering when linking is important, and
+# $(KBUILD_VMLINUX_LIBS) are archives which are linked conditionally
-# $(KBUILD_VMLINUX_INIT) must be first. $(KBUILD_VMLINUX_LIBS) are archives
+# (not within --whole-archive), and do not require symbol indexes added.
-# which are linked conditionally (not within --whole-archive), and do not
-# require symbol indexes added.
 #
 # vmlinux
 #   ^
 #   |
-#   +-< $(KBUILD_VMLINUX_INIT)
+#   +--< $(KBUILD_VMLINUX_OBJS)
-#   |   +--< init/version.o + more
+#   |    +--< init/built-in.a drivers/built-in.a mm/built-in.a + more
-#   |
-#   +--< $(KBUILD_VMLINUX_MAIN)
-#   |    +--< drivers/built-in.a mm/built-in.a + more
 #   |
 #   +--< $(KBUILD_VMLINUX_LIBS)
 #   |    +--< lib/lib.a + more
@@ -44,24 +39,6 @@ info()
        fi
 }
-# Thin archive build here makes a final archive with symbol table and indexes
-# from vmlinux objects INIT and MAIN, which can be used as input to linker.
-# KBUILD_VMLINUX_LIBS archives should already have symbol table and indexes
-# added.
-#
-# Traditional incremental style of link does not require this step
-#
-# built-in.a output file
-#
-archive_builtin()
-{
-        info AR built-in.a
-        rm -f built-in.a;
-        ${AR} rcsTP${KBUILD_ARFLAGS} built-in.a                 \
-                                ${KBUILD_VMLINUX_INIT}          \
-                                ${KBUILD_VMLINUX_MAIN}
-}
 # Link of vmlinux.o used for section mismatch analysis
 # ${1} output file
 modpost_link()
@@ -69,7 +46,7 @@ modpost_link()
        local objects
        objects="--whole-archive                                \
-                built-in.a                                      \
+                ${KBUILD_VMLINUX_OBJS}                          \
                --no-whole-archive                              \
                --start-group                                   \
                ${KBUILD_VMLINUX_LIBS}                          \
@@ -88,7 +65,7 @@ vmlinux_link()
        if [ "${SRCARCH}" != "um" ]; then
                objects="--whole-archive                        \
-                        built-in.a                              \
+                        ${KBUILD_VMLINUX_OBJS}                  \
                        --no-whole-archive                      \
                        --start-group                           \
                        ${KBUILD_VMLINUX_LIBS}                  \
@@ -99,7 +76,7 @@ vmlinux_link()
                        -T ${lds} ${objects}
        else
                objects="-Wl,--whole-archive                    \
-                        built-in.a                              \
+                        ${KBUILD_VMLINUX_OBJS}                  \
                        -Wl,--no-whole-archive                  \
                        -Wl,--start-group                       \
                        ${KBUILD_VMLINUX_LIBS}                  \
@@ -160,7 +137,6 @@ cleanup()
        rm -f .tmp_System.map
        rm -f .tmp_kallsyms*
        rm -f .tmp_vmlinux*
-        rm -f built-in.a
        rm -f System.map
        rm -f vmlinux
        rm -f vmlinux.o
@@ -195,14 +171,7 @@ if [ "$1" = "clean" ]; then
 fi
 # We need access to CONFIG_ symbols
-case "${KCONFIG_CONFIG}" in
+. include/config/auto.conf
-*/*)
-        . "${KCONFIG_CONFIG}"
-        ;;
-*)
-        # Force using a file from the current directory
-        . "./${KCONFIG_CONFIG}"
-esac
 # Update version
 info GEN .version
@@ -217,8 +186,6 @@ fi;
 # final build of init/
 ${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init
-archive_builtin
 #link vmlinux.o
 info LD vmlinux.o
 modpost_link vmlinux.o
diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
index 87f1fc9801d7..2339f86126cb 100755
--- a/scripts/mkcompile_h
+++ b/scripts/mkcompile_h
@@ -62,7 +62,7 @@ UTS_TRUNCATE="cut -b -$UTS_LEN"
 # Generate a temporary compile.h
-( echo /\* This file is auto generated, version $VERSION \*/
+{ echo /\* This file is auto generated, version $VERSION \*/
  if [ -n "$CONFIG_FLAGS" ] ; then echo "/* $CONFIG_FLAGS */"; fi
  echo \#define UTS_MACHINE \"$ARCH\"
@@ -73,7 +73,7 @@ UTS_TRUNCATE="cut -b -$UTS_LEN"
  echo \#define LINUX_COMPILE_HOST \"`echo $LINUX_COMPILE_HOST | $UTS_TRUNCATE`\"
  echo \#define LINUX_COMPILER \"`$CC -v 2>&1 | grep ' version ' | sed 's/[[:space:]]*$//'`\"
-) > .tmpcompile
+} > .tmpcompile
 # Only replace the real compile.h if the new one is different,
 # in order to preserve the timestamp and avoid unnecessary
diff --git a/scripts/mod/devicetable-offsets.c b/scripts/mod/devicetable-offsets.c
index 293004499b4d..054405b90ba4 100644
--- a/scripts/mod/devicetable-offsets.c
+++ b/scripts/mod/devicetable-offsets.c
@@ -225,5 +225,11 @@ int main(void)
        DEVID_FIELD(typec_device_id, svid);
        DEVID_FIELD(typec_device_id, mode);
+        DEVID(tee_client_device_id);
+        DEVID_FIELD(tee_client_device_id, uuid);
+        DEVID(wmi_device_id);
+        DEVID_FIELD(wmi_device_id, guid_string);
        return 0;
 }
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index a37af7d71973..e17a29ae2e97 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -37,6 +37,10 @@ typedef unsigned char	__u8;
 typedef struct {
        __u8 b[16];
 } uuid_le;
+typedef struct {
+        __u8 b[16];
+} uuid_t;
+#define UUID_STRING_LEN         36
 /* Big exception to the "don't include kernel headers into userspace, which
 * even potentially has different endianness and word sizes, since
@@ -50,6 +54,9 @@ struct devtable {
        int (*do_entry)(const char *filename, void *symval, char *alias);
 };
+/* Size of alias provided to do_entry functions */
+#define ALIAS_SIZE 500
 /* Define a variable f that holds the value of field f of struct devid
 * based at address m.
 */
@@ -1287,6 +1294,42 @@ static int do_typec_entry(const char *filename, void *symval, char *alias)
        return 1;
 }
+/* Looks like: tee:uuid */
+static int do_tee_entry(const char *filename, void *symval, char *alias)
+{
+        DEF_FIELD(symval, tee_client_device_id, uuid);
+        sprintf(alias, "tee:%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+                uuid.b[0], uuid.b[1], uuid.b[2], uuid.b[3], uuid.b[4],
+                uuid.b[5], uuid.b[6], uuid.b[7], uuid.b[8], uuid.b[9],
+                uuid.b[10], uuid.b[11], uuid.b[12], uuid.b[13], uuid.b[14],
+                uuid.b[15]);
+        add_wildcard(alias);
+        return 1;
+}
+/* Looks like: wmi:guid */
+static int do_wmi_entry(const char *filename, void *symval, char *alias)
+{
+        int len;
+        DEF_FIELD_ADDR(symval, wmi_device_id, guid_string);
+        if (strlen(*guid_string) != UUID_STRING_LEN) {
+                warn("Invalid WMI device id 'wmi:%s' in '%s'\n",
+                                *guid_string, filename);
+                return 0;
+        }
+        len = snprintf(alias, ALIAS_SIZE, WMI_MODULE_PREFIX "%s", *guid_string);
+        if (len < 0 || len >= ALIAS_SIZE) {
+                warn("Could not generate all MODULE_ALIAS's in '%s'\n",
+                                filename);
+                return 0;
+        }
+        return 1;
+}
 /* Does namelen bytes of name exactly match the symbol? */
 static bool sym_is(const char *name, unsigned namelen, const char *symbol)
 {
@@ -1303,7 +1346,7 @@ static void do_table(void *symval, unsigned long size,
                     struct module *mod)
 {
        unsigned int i;
-        char alias[500];
+        char alias[ALIAS_SIZE];
        device_id_check(mod->name, device_id, size, id_size, symval);
        /* Leave last one: it's the terminator. */
@@ -1357,6 +1400,8 @@ static const struct devtable devtable[] = {
        {"fslmc", SIZE_fsl_mc_device_id, do_fsl_mc_entry},
        {"tbsvc", SIZE_tb_service_id, do_tbsvc_entry},
        {"typec", SIZE_typec_device_id, do_typec_entry},
+        {"tee", SIZE_tee_client_device_id, do_tee_entry},
+        {"wmi", SIZE_wmi_device_id, do_wmi_entry},
 };
 /* Create MODULE_ALIAS() statements.
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 26bf886bd168..0b0d1080b1c5 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -35,7 +35,6 @@ static int vmlinux_section_warnings = 1;
 static int warn_unresolved = 0;
 /* How a symbol is exported */
 static int sec_mismatch_count = 0;
-static int sec_mismatch_verbose = 1;
 static int sec_mismatch_fatal = 0;
 /* ignore missing files */
 static int ignore_missing_files;
@@ -1406,8 +1405,6 @@ static void report_sec_mismatch(const char *modname,
        char *prl_to;
        sec_mismatch_count++;
-        if (!sec_mismatch_verbose)
-                return;
        get_pretty_name(from_is_func, &from, &from_p);
        get_pretty_name(to_is_func, &to, &to_p);
@@ -1655,9 +1652,7 @@ static void extable_mismatch_handler(const char* modname, struct elf_info *elf,
        sec_mismatch_count++;
-        if (sec_mismatch_verbose)
+        report_extable_warnings(modname, elf, mismatch, r, sym, fromsec, tosec);
-                report_extable_warnings(modname, elf, mismatch, r, sym,
-                                        fromsec, tosec);
        if (match(tosec, mismatch->bad_tosec))
                fatal("The relocation at %s+0x%lx references\n"
@@ -2433,7 +2428,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:mnsST:o:awE")) != -1) {
+        while ((opt = getopt(argc, argv, "i:I:e:mnsT:o:awE")) != -1) {
                switch (opt) {
                case 'i':
                        kernel_read = optarg;
@@ -2465,9 +2460,6 @@ int main(int argc, char **argv)
                case 's':
                        vmlinux_section_warnings = 0;
                        break;
-                case 'S':
-                        sec_mismatch_verbose = 0;
-                        break;
                case 'T':
                        files_source = optarg;
                        break;
@@ -2525,18 +2517,9 @@ int main(int argc, char **argv)
        }
        if (dump_write)
                write_dump(dump_write);
-        if (sec_mismatch_count) {
+        if (sec_mismatch_count && sec_mismatch_fatal)
-                if (!sec_mismatch_verbose) {
+                fatal("modpost: Section mismatches detected.\n"
-                        warn("modpost: Found %d section mismatch(es).\n"
+                      "Set CONFIG_SECTION_MISMATCH_WARN_ONLY=y to allow them.\n");
-                             "To see full details build your kernel with:\n"
-                             "'make CONFIG_DEBUG_SECTION_MISMATCH=y'\n",
-                             sec_mismatch_count);
-                }
-                if (sec_mismatch_fatal) {
-                        fatal("modpost: Section mismatches detected.\n"
-                              "Set CONFIG_SECTION_MISMATCH_WARN_ONLY=y to allow them.\n");
-                }
-        }
        free(buf.p);
        return err;
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index 453fecee62f0..2c6de21e5152 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -59,7 +59,7 @@ rpm-pkg: FORCE
 # binrpm-pkg
 # ---------------------------------------------------------------------------
 binrpm-pkg: FORCE
-        $(MAKE) KBUILD_SRC=
+        $(MAKE) -f $(srctree)/Makefile
        $(CONFIG_SHELL) $(MKSPEC) prebuilt > $(objtree)/binkernel.spec
        +rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \
                $(UTS_MACHINE) -bb $(objtree)/binkernel.spec
@@ -72,11 +72,11 @@ deb-pkg: FORCE
        $(call cmd,src_tar,$(KDEB_SOURCENAME))
        origversion=$$(dpkg-parsechangelog -SVersion |sed 's/-[^-]*$$//');\
                mv $(KDEB_SOURCENAME).tar.gz ../$(KDEB_SOURCENAME)_$${origversion}.orig.tar.gz
-        +dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) -i.git -us -uc
+        +dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) $(DPKG_FLAGS) -i.git -us -uc
 bindeb-pkg: FORCE
        $(CONFIG_SHELL) $(srctree)/scripts/package/mkdebian
-        +dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) -b -nc -uc
+        +dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) $(DPKG_FLAGS) -b -nc -uc
 intdeb-pkg: FORCE
        +$(CONFIG_SHELL) $(srctree)/scripts/package/builddeb
@@ -102,7 +102,7 @@ clean-dirs += $(objtree)/snap/
 # tarball targets
 # ---------------------------------------------------------------------------
 tar%pkg: FORCE
-        $(MAKE) KBUILD_SRC=
+        $(MAKE) -f $(srctree)/Makefile
        $(CONFIG_SHELL) $(srctree)/scripts/package/buildtar $@
 clean-dirs += $(objtree)/tar-install/
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index f43a274f4f1d..b03dd56a4782 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -12,6 +12,18 @@
 set -e
+is_enabled() {
+        grep -q "^$1=y" include/config/auto.conf
+}
+if_enabled_echo() {
+        if is_enabled "$1"; then
+                echo -n "$2"
+        elif [ $# -ge 3 ]; then
+                echo -n "$3"
+        fi
+}
 create_package() {
        local pname="$1" pdir="$2"
@@ -62,7 +74,7 @@ parisc|mips|powerpc)
        installed_image_path="boot/vmlinuz-$version"
 esac
-BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)"
+BUILD_DEBUG=$(if_enabled_echo CONFIG_DEBUG_INFO Yes)
 # Setup the directory structure
 rm -rf "$tmpdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" $objtree/debian/files
@@ -83,15 +95,15 @@ else
 fi
 cp "$($MAKE -s -f $srctree/Makefile image_name)" "$tmpdir/$installed_image_path"
-if grep -q "^CONFIG_OF_EARLY_FLATTREE=y" $KCONFIG_CONFIG ; then
+if is_enabled CONFIG_OF_EARLY_FLATTREE; then
        # Only some architectures with OF support have this target
        if [ -d "${srctree}/arch/$SRCARCH/boot/dts" ]; then
-                $MAKE KBUILD_SRC= INSTALL_DTBS_PATH="$tmpdir/usr/lib/$packagename" dtbs_install
+                $MAKE -f $srctree/Makefile INSTALL_DTBS_PATH="$tmpdir/usr/lib/$packagename" dtbs_install
        fi
 fi
-if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
+if is_enabled CONFIG_MODULES; then
-        INSTALL_MOD_PATH="$tmpdir" $MAKE KBUILD_SRC= modules_install
+        INSTALL_MOD_PATH="$tmpdir" $MAKE -f $srctree/Makefile modules_install
        rm -f "$tmpdir/lib/modules/$version/build"
        rm -f "$tmpdir/lib/modules/$version/source"
        if [ "$ARCH" = "um" ] ; then
@@ -111,16 +123,15 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
                done
                # resign stripped modules
-                MODULE_SIG_ALL="$(grep -s '^CONFIG_MODULE_SIG_ALL=y' $KCONFIG_CONFIG || true)"
+                if is_enabled CONFIG_MODULE_SIG_ALL; then
-                if [ -n "$MODULE_SIG_ALL" ]; then
+                        INSTALL_MOD_PATH="$tmpdir" $MAKE -f $srctree/Makefile modules_sign
-                        INSTALL_MOD_PATH="$tmpdir" $MAKE KBUILD_SRC= modules_sign
                fi
        fi
 fi
 if [ "$ARCH" != "um" ]; then
-        $MAKE headers_check KBUILD_SRC=
+        $MAKE -f $srctree/Makefile headers_check
-        $MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr"
+        $MAKE -f $srctree/Makefile headers_install INSTALL_HDR_PATH="$libc_headers_dir/usr"
 fi
 # Install the maintainer scripts
@@ -129,11 +140,6 @@ fi
 # make-kpkg sets $INITRD to indicate whether an initramfs is wanted, and
 # so do we; recent versions of dracut and initramfs-tools will obey this.
 debhookdir=${KDEB_HOOKDIR:-/etc/kernel}
-if grep -q '^CONFIG_BLK_DEV_INITRD=y' $KCONFIG_CONFIG; then
-        want_initrd=Yes
-else
-        want_initrd=No
-fi
 for script in postinst postrm preinst prerm ; do
        mkdir -p "$tmpdir$debhookdir/$script.d"
        cat <<EOF > "$tmpdir/DEBIAN/$script"
@@ -145,7 +151,7 @@ set -e
 export DEB_MAINT_PARAMS="\$*"
 # Tell initramfs builder whether it's wanted
-export INITRD=$want_initrd
+export INITRD=$(if_enabled_echo CONFIG_BLK_DEV_INITRD Yes No)
 test -d $debhookdir/$script.d && run-parts --arg="$version" --arg="/$installed_image_path" $debhookdir/$script.d
 exit 0
@@ -158,11 +164,11 @@ done
 (cd $srctree; find arch/*/include include scripts -type f -o -type l) >> "$objtree/debian/hdrsrcfiles"
 (cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> "$objtree/debian/hdrsrcfiles"
 (cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> "$objtree/debian/hdrsrcfiles"
-if grep -q '^CONFIG_STACK_VALIDATION=y' $KCONFIG_CONFIG ; then
+if is_enabled CONFIG_STACK_VALIDATION; then
        (cd $objtree; find tools/objtool -type f -executable) >> "$objtree/debian/hdrobjfiles"
 fi
 (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f) >> "$objtree/debian/hdrobjfiles"
-if grep -q '^CONFIG_GCC_PLUGINS=y' $KCONFIG_CONFIG ; then
+if is_enabled CONFIG_GCC_PLUGINS; then
        (cd $objtree; find scripts/gcc-plugins -name \*.so -o -name gcc-common.h) >> "$objtree/debian/hdrobjfiles"
 fi
 destdir=$kernel_headers_dir/usr/src/linux-headers-$version
diff --git a/scripts/package/buildtar b/scripts/package/buildtar
index d624a07a4e77..2f66c81e4021 100755
--- a/scripts/package/buildtar
+++ b/scripts/package/buildtar
@@ -56,8 +56,8 @@ dirs=boot
 #
 # Try to install modules
 #
-if grep -q '^CONFIG_MODULES=y' "${KCONFIG_CONFIG}"; then
+if grep -q '^CONFIG_MODULES=y' include/config/auto.conf; then
-        make ARCH="${ARCH}" O="${objtree}" KBUILD_SRC= INSTALL_MOD_PATH="${tmpdir}" modules_install
+        make ARCH="${ARCH}" -f ${srctree}/Makefile INSTALL_MOD_PATH="${tmpdir}" modules_install
        dirs="$dirs lib"
 fi
diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
index edcad61fe3cd..8351584cb24e 100755
--- a/scripts/package/mkdebian
+++ b/scripts/package/mkdebian
@@ -7,7 +7,7 @@
 set -e
 is_enabled() {
-        grep -q "^CONFIG_$1=y" $KCONFIG_CONFIG
+        grep -q "^$1=y" include/config/auto.conf
 }
 if_enabled_echo() {
@@ -31,23 +31,23 @@ set_debarch() {
        x86_64)
                debarch=amd64 ;;
        sparc*)
-                debarch=sparc$(if_enabled_echo 64BIT 64) ;;
+                debarch=sparc$(if_enabled_echo CONFIG_64BIT 64) ;;
        s390*)
                debarch=s390x ;;
        ppc*)
-                if is_enabled 64BIT; then
+                if is_enabled CONFIG_64BIT; then
-                        debarch=ppc64$(if_enabled_echo CPU_LITTLE_ENDIAN el)
+                        debarch=ppc64$(if_enabled_echo CONFIG_CPU_LITTLE_ENDIAN el)
                else
-                        debarch=powerpc$(if_enabled_echo SPE spe)
+                        debarch=powerpc$(if_enabled_echo CONFIG_SPE spe)
                fi
                ;;
        parisc*)
                debarch=hppa ;;
        mips*)
-                if is_enabled CPU_LITTLE_ENDIAN; then
+                if is_enabled CONFIG_CPU_LITTLE_ENDIAN; then
-                        debarch=mips$(if_enabled_echo 64BIT 64)$(if_enabled_echo CPU_MIPSR6 r6)el
+                        debarch=mips$(if_enabled_echo CONFIG_64BIT 64)$(if_enabled_echo CONFIG_CPU_MIPSR6 r6)el
-                elif is_enabled CPU_MIPSR6; then
+                elif is_enabled CONFIG_CPU_MIPSR6; then
-                        debarch=mips$(if_enabled_echo 64BIT 64)r6
+                        debarch=mips$(if_enabled_echo CONFIG_64BIT 64)r6
                else
                        debarch=mips
                fi
@@ -55,8 +55,8 @@ set_debarch() {
        aarch64|arm64)
                debarch=arm64 ;;
        arm*)
-                if is_enabled AEABI; then
+                if is_enabled CONFIG_AEABI; then
-                        debarch=arm$(if_enabled_echo VFP hf el)
+                        debarch=arm$(if_enabled_echo CONFIG_VFP hf el)
                else
                        debarch=arm
                fi
@@ -64,10 +64,10 @@ set_debarch() {
        openrisc)
                debarch=or1k ;;
        sh)
-                if is_enabled CPU_SH3; then
+                if is_enabled CONFIG_CPU_SH3; then
-                        debarch=sh3$(if_enabled_echo CPU_BIG_ENDIAN eb)
+                        debarch=sh3$(if_enabled_echo CONFIG_CPU_BIG_ENDIAN eb)
-                elif is_enabled CPU_SH4; then
+                elif is_enabled CONFIG_CPU_SH4; then
-                        debarch=sh4$(if_enabled_echo CPU_BIG_ENDIAN eb)
+                        debarch=sh4$(if_enabled_echo CONFIG_CPU_BIG_ENDIAN eb)
                fi
                ;;
        esac
@@ -132,8 +132,12 @@ else
        echo >&2 "Install lsb-release or set \$KDEB_CHANGELOG_DIST explicitly"
 fi
-mkdir -p debian/
+mkdir -p debian/source/
+echo "1.0" > debian/source/format
 echo $debarch > debian/arch
+extra_build_depends=", $(if_enabled_echo CONFIG_UNWINDER_ORC libelf-dev)"
+extra_build_depends="$extra_build_depends, $(if_enabled_echo CONFIG_SYSTEM_TRUSTED_KEYRING libssl-dev:native)"
 # Generate a simple changelog template
 cat <<EOF > debian/changelog
@@ -170,7 +174,7 @@ Source: $sourcename
 Section: kernel
 Priority: optional
 Maintainer: $maintainer
-Build-Depends: bc, kmod, cpio
+Build-Depends: bc, kmod, cpio, bison, flex | flex:native $extra_build_depends
 Homepage: http://www.kernel.org/
 Package: $packagename
@@ -205,13 +209,15 @@ EOF
 cat <<EOF > debian/rules
 #!$(command -v $MAKE) -f
+srctree ?= .
 build:
        \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} \
-        KBUILD_BUILD_VERSION=${revision} KBUILD_SRC=
+        KBUILD_BUILD_VERSION=${revision} -f \$(srctree)/Makefile
 binary-arch:
        \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} \
-        KBUILD_BUILD_VERSION=${revision} KBUILD_SRC= intdeb-pkg
+        KBUILD_BUILD_VERSION=${revision} -f \$(srctree)/Makefile intdeb-pkg
 clean:
        rm -rf debian/*tmp debian/files
@@ -219,5 +225,6 @@ clean:
 binary: binary-arch
 EOF
+chmod +x debian/rules
 exit 0
diff --git a/scripts/spdxcheck.py b/scripts/spdxcheck.py
index e559c6294c39..4fe392e507fb 100755
--- a/scripts/spdxcheck.py
+++ b/scripts/spdxcheck.py
@@ -175,7 +175,13 @@ class id_parser(object):
                self.lines_checked += 1
                if line.find("SPDX-License-Identifier:") < 0:
                    continue
-                expr = line.split(':')[1].replace('*/', '').strip()
+                expr = line.split(':')[1].strip()
+                # Remove trailing comment closure
+                if line.strip().endswith('*/'):
+                    expr = expr.rstrip('*/').strip()
+                # Special case for SH magic boot code files
+                if line.startswith('LIST \"'):
+                    expr = expr.rstrip('\"').strip()
                self.parse(expr)
                self.spdx_valid += 1
                #
diff --git a/scripts/spelling.txt b/scripts/spelling.txt
index 517d0c3f83df..86b87332b9e5 100644
--- a/scripts/spelling.txt
+++ b/scripts/spelling.txt
@@ -10,6 +10,8 @@
 abandonning||abandoning
 abigious||ambiguous
 abitrate||arbitrate
+abnornally||abnormally
+abnrormal||abnormal
 abord||abort
 aboslute||absolute
 abov||above
@@ -107,6 +109,7 @@ ambigious||ambiguous
 amoung||among
 amout||amount
 amplifer||amplifier
+amplifyer||amplifier
 an union||a union
 an user||a user
 an userspace||a userspace
@@ -145,6 +148,7 @@ artillary||artillery
 asign||assign
 asser||assert
 assertation||assertion
+assertting||asserting
 assiged||assigned
 assigment||assignment
 assigments||assignments
@@ -168,6 +172,8 @@ attachement||attachment
 attched||attached
 attemps||attempts
 attemping||attempting
+attepmpt||attempt
+attnetion||attention
 attruibutes||attributes
 authentification||authentication
 automaticaly||automatically
@@ -217,6 +223,7 @@ boardcast||broadcast
 borad||board
 boundry||boundary
 brievely||briefly
+broadcase||broadcast
 broadcat||broadcast
 bufufer||buffer
 cacluated||calculated
@@ -234,6 +241,7 @@ cancle||cancel
 capabilites||capabilities
 capabilty||capability
 capabitilies||capabilities
+capablity||capability
 capatibilities||capabilities
 capapbilities||capabilities
 caputure||capture
@@ -274,6 +282,7 @@ clared||cleared
 closeing||closing
 clustred||clustered
 coexistance||coexistence
+colescing||coalescing
 collapsable||collapsible
 colorfull||colorful
 comand||command
@@ -290,6 +299,7 @@ comsumer||consumer
 comsuming||consuming
 compability||compatibility
 compaibility||compatibility
+comparsion||comparison
 compatability||compatibility
 compatable||compatible
 compatibiliy||compatibility
@@ -303,6 +313,7 @@ completly||completely
 complient||compliant
 componnents||components
 compoment||component
+comppatible||compatible
 compres||compress
 compresion||compression
 comression||compression
@@ -368,6 +379,8 @@ decsribed||described
 decription||description
 dectected||detected
 defailt||default
+deferal||deferral
+deffered||deferred
 defferred||deferred
 definate||definite
 definately||definitely
@@ -400,6 +413,7 @@ descritptor||descriptor
 desctiptor||descriptor
 desriptor||descriptor
 desriptors||descriptors
+desination||destination
 destionation||destination
 destoried||destroyed
 destory||destroy
@@ -426,7 +440,9 @@ diffrent||different
 differenciate||differentiate
 diffrentiate||differentiate
 difinition||definition
+dimention||dimension
 dimesions||dimensions
+dispalying||displaying
 diplay||display
 directon||direction
 direectly||directly
@@ -442,6 +458,7 @@ disbled||disabled
 disconnet||disconnect
 discontinous||discontinuous
 disharge||discharge
+disnabled||disabled
 dispertion||dispersion
 dissapears||disappears
 distiction||distinction
@@ -456,6 +473,7 @@ dorp||drop
 dosen||doesn
 downlad||download
 downlads||downloads
+droped||dropped
 druing||during
 dynmaic||dynamic
 eanable||enable
@@ -471,6 +489,7 @@ elementry||elementary
 eletronic||electronic
 embeded||embedded
 enabledi||enabled
+enble||enable
 enchanced||enhanced
 encorporating||incorporating
 encrupted||encrypted
@@ -479,6 +498,9 @@ encryptio||encryption
 endianess||endianness
 enhaced||enhanced
 enlightnment||enlightenment
+enqueing||enqueuing
+entires||entries
+entites||entities
 entrys||entries
 enocded||encoded
 enterily||entirely
@@ -498,6 +520,8 @@ etsbalishment||establishment
 excecutable||executable
 exceded||exceeded
 excellant||excellent
+execeeded||exceeded
+execeeds||exceeds
 exeed||exceed
 existance||existence
 existant||existent
@@ -506,6 +530,7 @@ exlcude||exclude
 exlcusive||exclusive
 exmaple||example
 expecially||especially
+experies||expires
 explicite||explicit
 explicitely||explicitly
 explict||explicit
@@ -521,6 +546,7 @@ extracter||extractor
 faield||failed
 falied||failed
 faild||failed
+failded||failed
 failer||failure
 faill||fail
 failied||failed
@@ -540,6 +566,7 @@ fetaure||feature
 fetaures||features
 fileystem||filesystem
 fimware||firmware
+firmare||firmware
 firware||firmware
 finanize||finalize
 findn||find
@@ -574,6 +601,7 @@ funtions||functions
 furthur||further
 futhermore||furthermore
 futrue||future
+gauage||gauge
 gaurenteed||guaranteed
 generiously||generously
 genereate||generate
@@ -645,6 +673,7 @@ independed||independent
 indiate||indicate
 indicat||indicate
 inexpect||inexpected
+inferface||interface
 infomation||information
 informatiom||information
 informations||information
@@ -662,14 +691,17 @@ initialiazation||initialization
 initializiation||initialization
 initialze||initialize
 initialzed||initialized
+initialzing||initializing
 initilization||initialization
 initilize||initialize
 inofficial||unofficial
 inrerface||interface
 insititute||institute
+instace||instance
 instal||install
 instanciate||instantiate
 instanciated||instantiated
+insufficent||insufficient
 inteface||interface
 integreated||integrated
 integrety||integrity
@@ -684,6 +716,8 @@ intermittant||intermittent
 internel||internal
 interoprability||interoperability
 interuupt||interrupt
+interupt||interrupt
+interupts||interrupts
 interrface||interface
 interrrupt||interrupt
 interrup||interrupt
@@ -699,11 +733,14 @@ intialization||initialization
 intialized||initialized
 intialize||initialize
 intregral||integral
+intrerrupt||interrupt
 intrrupt||interrupt
 intterrupt||interrupt
 intuative||intuitive
 inavlid||invalid
 invaid||invalid
+invaild||invalid
+invailid||invalid
 invald||invalid
 invalde||invalid
 invalide||invalid
@@ -712,6 +749,7 @@ invalud||invalid
 invididual||individual
 invokation||invocation
 invokations||invocations
+ireelevant||irrelevant
 irrelevent||irrelevant
 isnt||isn't
 isssue||issue
@@ -747,6 +785,7 @@ loobpack||loopback
 loosing||losing
 losted||lost
 machinary||machinery
+maibox||mailbox
 maintainance||maintenance
 maintainence||maintenance
 maintan||maintain
@@ -758,14 +797,19 @@ managable||manageable
 managment||management
 mangement||management
 manoeuvering||maneuvering
+manufaucturing||manufacturing
 mappping||mapping
 matchs||matches
 mathimatical||mathematical
 mathimatic||mathematic
 mathimatics||mathematics
+maximium||maximum
 maxium||maximum
 mechamism||mechanism
 meetign||meeting
+memeory||memory
+memmber||member
+memoery||memory
 ment||meant
 mergable||mergeable
 mesage||message
@@ -779,6 +823,7 @@ migrateable||migratable
 milliseonds||milliseconds
 minium||minimum
 minimam||minimum
+miniumum||minimum
 minumum||minimum
 misalinged||misaligned
 miscelleneous||miscellaneous
@@ -839,6 +884,7 @@ occurence||occurrence
 occure||occurred
 occured||occurred
 occuring||occurring
+offser||offset
 offet||offset
 offloded||offloaded
 omited||omitted
@@ -855,6 +901,7 @@ optmizations||optimizations
 orientatied||orientated
 orientied||oriented
 orignal||original
+originial||original
 otherise||otherwise
 ouput||output
 oustanding||outstanding
@@ -874,6 +921,7 @@ packege||package
 packge||package
 packtes||packets
 pakage||package
+paket||packet
 pallette||palette
 paln||plan
 paramameters||parameters
@@ -886,6 +934,8 @@ paramters||parameters
 parmaters||parameters
 particuarly||particularly
 particularily||particularly
+partion||partition
+partions||partitions
 partiton||partition
 pased||passed
 passin||passing
@@ -897,10 +947,12 @@ peice||piece
 pendantic||pedantic
 peprocessor||preprocessor
 perfoming||performing
+peripherial||peripheral
 permissons||permissions
 peroid||period
 persistance||persistence
 persistant||persistent
+phoneticly||phonetically
 plalform||platform
 platfoem||platform
 platfrom||platform
@@ -915,6 +967,7 @@ posible||possible
 positon||position
 possibilites||possibilities
 powerfull||powerful
+pramater||parameter
 preamle||preamble
 preample||preamble
 preapre||prepare
@@ -976,6 +1029,7 @@ psudo||pseudo
 psuedo||pseudo
 psychadelic||psychedelic
 pwoer||power
+queing||queuing
 quering||querying
 randomally||randomly
 raoming||roaming
@@ -1004,6 +1058,7 @@ refering||referring
 refernces||references
 refernnce||reference
 refrence||reference
+registed||registered
 registerd||registered
 registeration||registration
 registeresd||registered
@@ -1018,6 +1073,7 @@ regulamentations||regulations
 reigstration||registration
 releated||related
 relevent||relevant
+reloade||reload
 remoote||remote
 remore||remote
 removeable||removable
@@ -1036,19 +1092,23 @@ requried||required
 requst||request
 reregisteration||reregistration
 reseting||resetting
+reseved||reserved
 reseverd||reserved
 resizeable||resizable
 resouce||resource
 resouces||resources
 resoures||resources
 responce||response
+resrouce||resource
 ressizes||resizes
 ressource||resource
 ressources||resources
 restesting||retesting
+resumbmitting||resubmitting
 retransmited||retransmitted
 retreived||retrieved
 retreive||retrieve
+retreiving||retrieving
 retrive||retrieve
 retuned||returned
 reudce||reduce
@@ -1120,6 +1180,7 @@ sleeped||slept
 softwares||software
 speach||speech
 specfic||specific
+specfield||specified
 speciefied||specified
 specifc||specific
 specifed||specified
@@ -1142,7 +1203,10 @@ staion||station
 standardss||standards
 standartization||standardization
 standart||standard
+standy||standby
+stardard||standard
 staticly||statically
+statuss||status
 stoped||stopped
 stoping||stopping
 stoppped||stopped
@@ -1227,12 +1291,14 @@ tipically||typically
 timeing||timing
 timout||timeout
 tmis||this
+toogle||toggle
 torerable||tolerable
 traking||tracking
 tramsmitted||transmitted
 tramsmit||transmit
 tranasction||transaction
 tranfer||transfer
+transcevier||transceiver
 transciever||transceiver
 transferd||transferred
 transfered||transferred
@@ -1267,6 +1333,7 @@ unfortunatelly||unfortunately
 unifiy||unify
 uniterrupted||uninterrupted
 unintialized||uninitialized
+unitialized||uninitialized
 unkmown||unknown
 unknonw||unknown
 unknow||unknown
@@ -1291,7 +1358,9 @@ unsuccessfull||unsuccessful
 unsuported||unsupported
 untill||until
 unuseful||useless
+unvalid||invalid
 upate||update
+upsupported||unsupported
 usefule||useful
 usefull||useful
 usege||usage
diff --git a/scripts/ver_linux b/scripts/ver_linux
index a6c728db05ce..810e608baa24 100755
--- a/scripts/ver_linux
+++ b/scripts/ver_linux
@@ -13,6 +13,8 @@ BEGIN {
        system("uname -a")
        printf("\n")
+        vernum = "[0-9]+([.]?[0-9]+)+"
        printversion("GNU C", version("gcc -dumpversion"))
        printversion("GNU Make", version("make --version"))
        printversion("Binutils", version("ld -v"))
@@ -34,7 +36,7 @@ BEGIN {
        while (getline <"/proc/self/maps" > 0) {
                if (/libc.*\.so$/) {
                        n = split($0, procmaps, "/")
-                        if (match(procmaps[n], /[0-9]+([.]?[0-9]+)+/)) {
+                        if (match(procmaps[n], vernum)) {
                                ver = substr(procmaps[n], RSTART, RLENGTH)
                                printversion("Linux C Library", ver)
                                break
@@ -70,7 +72,7 @@ BEGIN {
 function version(cmd,    ver) {
        cmd = cmd " 2>&1"
        while (cmd | getline > 0) {
-                if (match($0, /[0-9]+([.]?[0-9]+)+/)) {
+                if (match($0, vernum)) {
                        ver = substr($0, RSTART, RLENGTH)
                        break
                }