Merge tag 'v4.19-rc2' into next-general

Sync to Linux 4.19-rc2 for downstream developers.

67 files changed, 1109 insertions, 825 deletions

diff --git a/scripts/.gitignore b/scripts/.gitignore
index 0442c06eefcb..12d302d70128 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -1,6 +1,7 @@
 #
 # Generated files
 #
+bin2c
 conmakehash
 kallsyms
 pnmtologo
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index c8156d61678c..ce53639a864a 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -56,7 +56,7 @@ kecho := $($(quiet)kecho)
 define filechk
         $(Q)set -e;                             \
         mkdir -p $(dir $@);                     \
-        $(filechk_$(1)) < $< > $@.tmp;          \
+        $(filechk_$(1)) > $@.tmp;               \
         if [ -r $@ ] && cmp -s $@ $@.tmp; then  \
                 rm -f $@.tmp;                   \
         else                                    \
@@ -126,7 +126,7 @@ cc-option = $(call __cc-option, $(CC),\
 # hostcc-option
 # Usage: cflags-y += $(call hostcc-option,-march=winchip-c6,-march=i586)
 hostcc-option = $(call __cc-option, $(HOSTCC),\
-        $(HOSTCFLAGS) $(HOST_EXTRACFLAGS),$(1),$(2))
+        $(KBUILD_HOSTCFLAGS) $(HOST_EXTRACFLAGS),$(1),$(2))
 
 # cc-option-yn
 # Usage: flag := $(call cc-option-yn,-march=winchip-c6)
@@ -153,18 +153,14 @@ cc-fullversion = $(shell $(CONFIG_SHELL) \
 # Usage:  EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)
 cc-ifversion = $(shell [ $(cc-version) $(1) $(2) ] && echo $(3) || echo $(4))
 
-# cc-if-fullversion
-# Usage:  EXTRA_CFLAGS += $(call cc-if-fullversion, -lt, 040502, -O1)
-cc-if-fullversion = $(shell [ $(cc-fullversion) $(1) $(2) ] && echo $(3) || echo $(4))
-
 # cc-ldoption
 # Usage: ldflags += $(call cc-ldoption, -Wl$(comma)--hash-style=both)
 cc-ldoption = $(call try-run,\
         $(CC) $(1) $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) -nostdlib -x c /dev/null -o "$$TMP",$(1),$(2))
 
 # ld-option
-# Usage: LDFLAGS += $(call ld-option, -X)
-ld-option = $(call try-run, $(LD) $(LDFLAGS) $(1) -v,$(1),$(2))
+# Usage: KBUILD_LDFLAGS += $(call ld-option, -X, -Y)
+ld-option = $(call try-run, $(LD) $(KBUILD_LDFLAGS) $(1) -v,$(1),$(2),$(3))
 
 # ar-option
 # Usage: KBUILD_ARFLAGS := $(call ar-option,D)
@@ -214,7 +210,7 @@ hdr-inst := -f $(srctree)/scripts/Makefile.headersinst obj
 # Prefix -I with $(srctree) if it is not an absolute path.
 # skip if -I has no parameter
 addtree = $(if $(patsubst -I%,%,$(1)), \
-$(if $(filter-out -I/% -I./% -I../%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1)),$(1)))
+$(if $(filter-out -I/% -I./% -I../%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1)),$(1)),$(1))
 
 # Find all -I options and call addtree
 flags = $(foreach o,$($(1)),$(if $(filter -I%,$(o)),$(call addtree,$(o)),$(o)))
@@ -400,3 +396,6 @@ endif
 endef
 #
 ###############################################################################
+
+# delete partially updated (i.e. corrupted) files on error
+.DELETE_ON_ERROR:
diff --git a/scripts/Makefile b/scripts/Makefile
index 25ab143cbe14..61affa300d25 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -10,6 +10,7 @@
 
 HOST_EXTRACFLAGS += -I$(srctree)/tools/include
 
+hostprogs-$(CONFIG_BUILD_BIN2C)  += bin2c
 hostprogs-$(CONFIG_KALLSYMS)     += kallsyms
 hostprogs-$(CONFIG_LOGO)         += pnmtologo
 hostprogs-$(CONFIG_VT)           += conmakehash
@@ -22,8 +23,8 @@ hostprogs-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE) += insert-sys-cert
 
 HOSTCFLAGS_sortextable.o = -I$(srctree)/tools/include
 HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include
-HOSTLOADLIBES_sign-file = -lcrypto
-HOSTLOADLIBES_extract-cert = -lcrypto
+HOSTLDLIBS_sign-file = -lcrypto
+HOSTLDLIBS_extract-cert = -lcrypto
 
 always          := $(hostprogs-y) $(hostprogs-m)
 
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index e7889f486ca1..5a2d1c9578a0 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -53,13 +53,6 @@ endif
 
 include scripts/Makefile.lib
 
-ifdef host-progs
-ifneq ($(hostprogs-y),$(host-progs))
-$(warning kbuild: $(obj)/Makefile - Usage of host-progs is deprecated. Please replace with hostprogs-y!)
-hostprogs-y += $(host-progs)
-endif
-endif
-
 # Do not include host rules unless needed
 ifneq ($(hostprogs-y)$(hostprogs-m)$(hostlibs-y)$(hostlibs-m)$(hostcxxlibs-y)$(hostcxxlibs-m),)
 include scripts/Makefile.host
@@ -197,7 +190,7 @@ cmd_modversions_c =								\
                 $(call cmd_gensymtypes_c,$(KBUILD_SYMTYPES),$(@:.o=.symtypes))  \
                     > $(@D)/.tmp_$(@F:.o=.ver);                                 \
                                                                                 \
-                $(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F)                      \
+                $(LD) $(KBUILD_LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F)               \
                         -T $(@D)/.tmp_$(@F:.o=.ver);                            \
                 rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver);                \
         else                                                                    \
@@ -206,11 +199,8 @@ cmd_modversions_c =								\
 endif
 
 ifdef CONFIG_FTRACE_MCOUNT_RECORD
-# gcc 5 supports generating the mcount tables directly
-ifneq ($(call cc-option,-mrecord-mcount,y),y)
-KBUILD_CFLAGS += -mrecord-mcount
-else
-# else do it all manually
+ifndef CC_USING_RECORD_MCOUNT
+# compiler will not generate __mcount_loc use recordmcount or recordmcount.pl
 ifdef BUILD_C_RECORDMCOUNT
 ifeq ("$(origin RECORDMCOUNT_WARN)", "command line")
   RECORDMCOUNT_FLAGS = -w
@@ -230,7 +220,7 @@ sub_cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH
         "$(if $(CONFIG_CPU_BIG_ENDIAN),big,little)" \
         "$(if $(CONFIG_64BIT),64,32)" \
         "$(OBJDUMP)" "$(OBJCOPY)" "$(CC) $(KBUILD_CFLAGS)" \
-        "$(LD)" "$(NM)" "$(RM)" "$(MV)" \
+        "$(LD) $(KBUILD_LDFLAGS)" "$(NM)" "$(RM)" "$(MV)" \
         "$(if $(part-of-module),1,0)" "$(@)";
 recordmcount_source := $(srctree)/scripts/recordmcount.pl
 endif # BUILD_C_RECORDMCOUNT
@@ -239,7 +229,7 @@ cmd_record_mcount =						\
              "$(CC_FLAGS_FTRACE)" ]; then                       \
                 $(sub_cmd_record_mcount)                        \
         fi;
-endif # -record-mcount
+endif # CC_USING_RECORD_MCOUNT
 endif # CONFIG_FTRACE_MCOUNT_RECORD
 
 ifdef CONFIG_STACK_VALIDATION
@@ -256,8 +246,6 @@ objtool_args += --no-fp
 endif
 ifdef CONFIG_GCOV_KERNEL
 objtool_args += --no-unreachable
-else
-objtool_args += $(call cc-ifversion, -lt, 0405, --no-unreachable)
 endif
 ifdef CONFIG_RETPOLINE
 ifneq ($(RETPOLINE_CFLAGS),)
@@ -404,7 +392,7 @@ cmd_modversions_S =								\
                 $(call cmd_gensymtypes_S,$(KBUILD_SYMTYPES),$(@:.o=.symtypes))  \
                     > $(@D)/.tmp_$(@F:.o=.ver);                                 \
                                                                                 \
-                $(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F)                      \
+                $(LD) $(KBUILD_LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F)               \
                         -T $(@D)/.tmp_$(@F:.o=.ver);                            \
                 rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver);                \
         else                                                                    \
@@ -590,7 +578,4 @@ endif
 # We never want them to be removed automatically.
 .SECONDARY: $(targets)
 
-# Declare the contents of the .PHONY variable as phony.  We keep that
-# information in a variable se we can use it in if_changed and friends.
-
 .PHONY: $(PHONY)
diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean
index 808d09f27ad4..0b80e3207b20 100644
--- a/scripts/Makefile.clean
+++ b/scripts/Makefile.clean
@@ -38,7 +38,6 @@ subdir-ymn	:= $(addprefix $(obj)/,$(subdir-ymn))
 
 __clean-files   := $(extra-y) $(extra-m) $(extra-)       \
                    $(always) $(targets) $(clean-files)   \
-                   $(host-progs)                         \
                    $(hostprogs-y) $(hostprogs-m) $(hostprogs-) \
                    $(hostlibs-y) $(hostlibs-m) $(hostlibs-) \
                    $(hostcxxlibs-y) $(hostcxxlibs-m)
@@ -88,7 +87,4 @@ PHONY += $(subdir-ymn)
 $(subdir-ymn):
         $(Q)$(MAKE) $(clean)=$@
 
-# Declare the contents of the .PHONY variable as phony.  We keep that
-# information in a variable se we can use it in if_changed and friends.
-
 .PHONY: $(PHONY)
diff --git a/scripts/Makefile.gcc-plugins b/scripts/Makefile.gcc-plugins
index c961b9a65d11..0a482f341576 100644
--- a/scripts/Makefile.gcc-plugins
+++ b/scripts/Makefile.gcc-plugins
@@ -1,33 +1,44 @@
 # SPDX-License-Identifier: GPL-2.0
+
 gcc-plugin-$(CONFIG_GCC_PLUGIN_CYC_COMPLEXITY)  += cyc_complexity_plugin.so
 
 gcc-plugin-$(CONFIG_GCC_PLUGIN_LATENT_ENTROPY)  += latent_entropy_plugin.so
-gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_LATENT_ENTROPY)   += -DLATENT_ENTROPY_PLUGIN
+gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_LATENT_ENTROPY)           \
+                += -DLATENT_ENTROPY_PLUGIN
 ifdef CONFIG_GCC_PLUGIN_LATENT_ENTROPY
-    DISABLE_LATENT_ENTROPY_PLUGIN                       += -fplugin-arg-latent_entropy_plugin-disable
+    DISABLE_LATENT_ENTROPY_PLUGIN += -fplugin-arg-latent_entropy_plugin-disable
 endif
+export DISABLE_LATENT_ENTROPY_PLUGIN
 
 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_ALL)     += -fplugin-arg-structleak_plugin-byref-all
-gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK)       += -DSTRUCTLEAK_PLUGIN
+gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE)       \
+                += -fplugin-arg-structleak_plugin-verbose
+gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL)     \
+                += -fplugin-arg-structleak_plugin-byref-all
+gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK)               \
+                += -DSTRUCTLEAK_PLUGIN
 
 gcc-plugin-$(CONFIG_GCC_PLUGIN_RANDSTRUCT)      += randomize_layout_plugin.so
-gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_RANDSTRUCT)       += -DRANDSTRUCT_PLUGIN
-gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_RANDSTRUCT_PERFORMANCE)   += -fplugin-arg-randomize_layout_plugin-performance-mode
+gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_RANDSTRUCT)               \
+                += -DRANDSTRUCT_PLUGIN
+gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_RANDSTRUCT_PERFORMANCE)   \
+                += -fplugin-arg-randomize_layout_plugin-performance-mode
 
+# All the plugin CFLAGS are collected here in case a build target needs to
+# filter them out of the KBUILD_CFLAGS.
 GCC_PLUGINS_CFLAGS := $(strip $(addprefix -fplugin=$(objtree)/scripts/gcc-plugins/, $(gcc-plugin-y)) $(gcc-plugin-cflags-y))
-
-export GCC_PLUGINS_CFLAGS GCC_PLUGIN GCC_PLUGIN_SUBDIR
-export DISABLE_LATENT_ENTROPY_PLUGIN
-
-# sancov_plugin.so can be only in CFLAGS_KCOV because avoid duplication.
+# The sancov_plugin.so is included via CFLAGS_KCOV, so it is removed here.
 GCC_PLUGINS_CFLAGS := $(filter-out %/sancov_plugin.so, $(GCC_PLUGINS_CFLAGS))
+export GCC_PLUGINS_CFLAGS
 
+# Add the flags to the build!
 KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
+
+# All enabled GCC plugins are collected here for building below.
 GCC_PLUGIN := $(gcc-plugin-y)
-GCC_PLUGIN_SUBDIR := $(gcc-plugin-subdir-y)
+export GCC_PLUGIN
 
 # Actually do the build, if requested.
 PHONY += gcc-plugins
diff --git a/scripts/Makefile.host b/scripts/Makefile.host
index aa971cc3f339..0393f75db4d4 100644
--- a/scripts/Makefile.host
+++ b/scripts/Makefile.host
@@ -62,9 +62,9 @@ host-cxxshobjs	:= $(addprefix $(obj)/,$(host-cxxshobjs))
 #####
 # Handle options to gcc. Support building with separate output directory
 
-_hostc_flags   = $(HOSTCFLAGS)   $(HOST_EXTRACFLAGS)   \
+_hostc_flags   = $(KBUILD_HOSTCFLAGS)   $(HOST_EXTRACFLAGS)   \
                  $(HOSTCFLAGS_$(basetarget).o)
-_hostcxx_flags = $(HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) \
+_hostcxx_flags = $(KBUILD_HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) \
                  $(HOSTCXXFLAGS_$(basetarget).o)
 
 ifeq ($(KBUILD_SRC),)
@@ -84,17 +84,17 @@ hostcxx_flags  = -Wp,-MD,$(depfile) $(__hostcxx_flags)
 # Create executable from a single .c file
 # host-csingle -> Executable
 quiet_cmd_host-csingle  = HOSTCC  $@
-      cmd_host-csingle  = $(HOSTCC) $(hostc_flags) $(HOSTLDFLAGS) -o $@ $< \
-                $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
+      cmd_host-csingle  = $(HOSTCC) $(hostc_flags) $(KBUILD_HOSTLDFLAGS) -o $@ $< \
+                $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F))
 $(host-csingle): $(obj)/%: $(src)/%.c FORCE
         $(call if_changed_dep,host-csingle)
 
 # Link an executable based on list of .o files, all plain c
 # host-cmulti -> executable
 quiet_cmd_host-cmulti   = HOSTLD  $@
-      cmd_host-cmulti   = $(HOSTCC) $(HOSTLDFLAGS) -o $@ \
+      cmd_host-cmulti   = $(HOSTCC) $(KBUILD_HOSTLDFLAGS) -o $@ \
                           $(addprefix $(obj)/,$($(@F)-objs)) \
-                          $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
+                          $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F))
 $(host-cmulti): FORCE
         $(call if_changed,host-cmulti)
 $(call multi_depend, $(host-cmulti), , -objs)
@@ -109,10 +109,10 @@ $(host-cobjs): $(obj)/%.o: $(src)/%.c FORCE
 # Link an executable based on list of .o files, a mixture of .c and .cc
 # host-cxxmulti -> executable
 quiet_cmd_host-cxxmulti = HOSTLD  $@
-      cmd_host-cxxmulti = $(HOSTCXX) $(HOSTLDFLAGS) -o $@ \
+      cmd_host-cxxmulti = $(HOSTCXX) $(KBUILD_HOSTLDFLAGS) -o $@ \
                           $(foreach o,objs cxxobjs,\
                           $(addprefix $(obj)/,$($(@F)-$(o)))) \
-                          $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
+                          $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F))
 $(host-cxxmulti): FORCE
         $(call if_changed,host-cxxmulti)
 $(call multi_depend, $(host-cxxmulti), , -objs -cxxobjs)
@@ -143,9 +143,9 @@ $(host-cxxshobjs): $(obj)/%.o: $(src)/%.c FORCE
 # Link a shared library, based on position independent .o files
 # *.o -> .so shared library (host-cshlib)
 quiet_cmd_host-cshlib   = HOSTLLD -shared $@
-      cmd_host-cshlib   = $(HOSTCC) $(HOSTLDFLAGS) -shared -o $@ \
+      cmd_host-cshlib   = $(HOSTCC) $(KBUILD_HOSTLDFLAGS) -shared -o $@ \
                           $(addprefix $(obj)/,$($(@F:.so=-objs))) \
-                          $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
+                          $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F))
 $(host-cshlib): FORCE
         $(call if_changed,host-cshlib)
 $(call multi_depend, $(host-cshlib), .so, -objs)
@@ -153,9 +153,9 @@ $(call multi_depend, $(host-cshlib), .so, -objs)
 # Link a shared library, based on position independent .o files
 # *.o -> .so shared library (host-cxxshlib)
 quiet_cmd_host-cxxshlib = HOSTLLD -shared $@
-      cmd_host-cxxshlib = $(HOSTCXX) $(HOSTLDFLAGS) -shared -o $@ \
+      cmd_host-cxxshlib = $(HOSTCXX) $(KBUILD_HOSTLDFLAGS) -shared -o $@ \
                           $(addprefix $(obj)/,$($(@F:.so=-objs))) \
-                          $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
+                          $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F))
 $(host-cxxshlib): FORCE
         $(call if_changed,host-cxxshlib)
 $(call multi_depend, $(host-cxxshlib), .so, -objs)
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 1bb594fcfe12..61e596650ed3 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -162,7 +162,7 @@ a_flags        = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE)     \
 cpp_flags      = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE)     \
                  $(__cpp_flags)
 
-ld_flags       = $(LDFLAGS) $(ldflags-y)
+ld_flags       = $(KBUILD_LDFLAGS) $(ldflags-y) $(LDFLAGS_$(@F))
 
 DTC_INCLUDE    := $(srctree)/scripts/dtc/include-prefixes
 
@@ -225,8 +225,7 @@ $(obj)/%: $(src)/%_shipped
 # ---------------------------------------------------------------------------
 
 quiet_cmd_ld = LD      $@
-cmd_ld = $(LD) $(LDFLAGS) $(ldflags-y) $(LDFLAGS_$(@F)) \
-               $(filter-out FORCE,$^) -o $@
+cmd_ld = $(LD) $(ld_flags) $(filter-out FORCE,$^) -o $@
 
 # Objcopy
 # ---------------------------------------------------------------------------
@@ -416,7 +415,7 @@ define filechk_offsets
          echo " * This file was generated by Kbuild"; \
          echo " */"; \
          echo ""; \
-         sed -ne $(sed-offsets); \
+         sed -ne $(sed-offsets) < $<; \
          echo ""; \
          echo "#endif" )
 endef
diff --git a/scripts/Makefile.modbuiltin b/scripts/Makefile.modbuiltin
index a763b4775d06..a072a4267746 100644
--- a/scripts/Makefile.modbuiltin
+++ b/scripts/Makefile.modbuiltin
@@ -8,10 +8,10 @@ src := $(obj)
 PHONY := __modbuiltin
 __modbuiltin:
 
--include include/config/auto.conf
+include include/config/auto.conf
 # tristate.conf sets tristate variables to uppercase 'Y' or 'M'
 # That way, we get the list of built-in modules in obj-Y
--include include/config/tristate.conf
+include include/config/tristate.conf
 
 include scripts/Kbuild.include
 
@@ -54,8 +54,4 @@ PHONY += $(subdir-ym)
 $(subdir-ym):
         $(Q)$(MAKE) $(modbuiltin)=$@
 
-
-# Declare the contents of the .PHONY variable as phony.  We keep that
-# information in a variable se we can use it in if_changed and friends.
-
 .PHONY: $(PHONY)
diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst
index 51ca0244fc8a..ff5ca9817a85 100644
--- a/scripts/Makefile.modinst
+++ b/scripts/Makefile.modinst
@@ -35,8 +35,4 @@ modinst_dir = $(if $(KBUILD_EXTMOD),$(ext-mod-dir),kernel/$(@D))
 $(modules):
         $(call cmd,modules_install,$(MODLIB)/$(modinst_dir))
 
-
-# Declare the contents of the .PHONY variable as phony.  We keep that
-# information in a variable so we can use it in if_changed and friends.
-
 .PHONY: $(PHONY)
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index df4174405feb..7d4af0d0accb 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -120,7 +120,7 @@ ARCH_POSTLINK := $(wildcard $(srctree)/arch/$(SRCARCH)/Makefile.postlink)
 # Step 6), final link of the modules with optional arch pass after final link
 quiet_cmd_ld_ko_o = LD [M]  $@
       cmd_ld_ko_o =                                                     \
-        $(LD) -r $(LDFLAGS)                                             \
+        $(LD) -r $(KBUILD_LDFLAGS)                                      \
                  $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE)             \
                  -o $@ $(filter-out FORCE,$^) ;                         \
         $(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true)
@@ -149,8 +149,4 @@ ifneq ($(cmd_files),)
   include $(cmd_files)
 endif
 
-
-# Declare the contents of the .PHONY variable as phony.  We keep that
-# information in a variable se we can use it in if_changed and friends.
-
 .PHONY: $(PHONY)
diff --git a/scripts/Makefile.modsign b/scripts/Makefile.modsign
index 171483bc0538..da56aa78d245 100644
--- a/scripts/Makefile.modsign
+++ b/scripts/Makefile.modsign
@@ -27,7 +27,4 @@ modinst_dir = $(if $(KBUILD_EXTMOD),$(ext-mod-dir),kernel/$(@D))
 $(modules):
         $(call cmd,sign_ko,$(MODLIB)/$(modinst_dir))
 
-# Declare the contents of the .PHONY variable as phony.  We keep that
-# information in a variable se we can use it in if_changed and friends.
-
 .PHONY: $(PHONY)
diff --git a/scripts/Makefile.ubsan b/scripts/Makefile.ubsan
index b593b36ccff8..38b2b4818e8e 100644
--- a/scripts/Makefile.ubsan
+++ b/scripts/Makefile.ubsan
@@ -14,10 +14,6 @@ ifdef CONFIG_UBSAN_ALIGNMENT
       CFLAGS_UBSAN += $(call cc-option, -fsanitize=alignment)
 endif
 
-ifdef CONFIG_UBSAN_NULL
-      CFLAGS_UBSAN += $(call cc-option, -fsanitize=null)
-endif
-
       # -fsanitize=* options makes GCC less smart than usual and
       # increase number of 'maybe-uninitialized false-positives
       CFLAGS_UBSAN += $(call cc-option, -Wno-maybe-uninitialized)
diff --git a/scripts/basic/.gitignore b/scripts/basic/.gitignore
index 9528ec9e5adc..a776371a3502 100644
--- a/scripts/basic/.gitignore
+++ b/scripts/basic/.gitignore
@@ -1,2 +1 @@
 fixdep
-bin2c
diff --git a/scripts/basic/Makefile b/scripts/basic/Makefile
index 0372b33febe5..af49b446f17d 100644
--- a/scripts/basic/Makefile
+++ b/scripts/basic/Makefile
@@ -9,7 +9,6 @@
 # fixdep:        Used to generate dependency information during build process
 
 hostprogs-y     := fixdep
-hostprogs-$(CONFIG_BUILD_BIN2C)     += bin2c
 always          := $(hostprogs-y)
 
 # fixdep is needed to compile other host programs
diff --git a/scripts/basic/bin2c.c b/scripts/bin2c.c
index c3d7eef3ad06..c3d7eef3ad06 100644
--- a/scripts/basic/bin2c.c
+++ b/scripts/bin2c.c
diff --git a/scripts/cc-can-link.sh b/scripts/cc-can-link.sh
index 208eb2825dab..6efcead31989 100755
--- a/scripts/cc-can-link.sh
+++ b/scripts/cc-can-link.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # SPDX-License-Identifier: GPL-2.0
 
-cat << "END" | $@ -x c - -o /dev/null >/dev/null 2>&1 && echo "y"
+cat << "END" | $@ -x c - -o /dev/null >/dev/null 2>&1
 #include <stdio.h>
 int main(void)
 {
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index e3b7362b0ee4..5219280bf7ff 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -13,6 +13,7 @@ use POSIX;
 use File::Basename;
 use Cwd 'abs_path';
 use Term::ANSIColor qw(:constants);
+use Encode qw(decode encode);
 
 my $P = $0;
 my $D = dirname(abs_path($P));
@@ -240,11 +241,11 @@ $check_orig = $check;
 
 my $exit = 0;
 
+my $perl_version_ok = 1;
 if ($^V && $^V lt $minimum_perl_version) {
+        $perl_version_ok = 0;
         printf "$P: requires at least perl version %vd\n", $minimum_perl_version;
-        if (!$ignore_perl_version) {
-                exit(1);
-        }
+        exit(1) if (!$ignore_perl_version);
 }
 
 #if no filenames are given, push '-' to read patch from stdin
@@ -346,9 +347,10 @@ our $Sparse	= qr{
                         __force|
                         __iomem|
                         __must_check|
-                        __init_refok|
                         __kprobes|
                         __ref|
+                        __refconst|
+                        __refdata|
                         __rcu|
                         __private
                 }x;
@@ -847,6 +849,17 @@ sub is_maintained_obsolete {
         return $status =~ /obsolete/i;
 }
 
+sub is_SPDX_License_valid {
+        my ($license) = @_;
+
+        return 1 if (!$tree || which("python") eq "" || !(-e "$root/scripts/spdxcheck.py") || !(-e "$root/.git"));
+
+        my $root_path = abs_path($root);
+        my $status = `cd "$root_path"; echo "$license" | python scripts/spdxcheck.py -`;
+        return 0 if ($status ne "");
+        return 1;
+}
+
 my $camelcase_seeded = 0;
 sub seed_camelcase_includes {
         return if ($camelcase_seeded);
@@ -1026,11 +1039,11 @@ if (!$quiet) {
         hash_show_words(\%use_type, "Used");
         hash_show_words(\%ignore_type, "Ignored");
 
-        if ($^V lt 5.10.0) {
+        if (!$perl_version_ok) {
                 print << "EOM"
 
 NOTE: perl $^V is not modern enough to detect all possible issues.
-      An upgrade to at least perl v5.10.0 is suggested.
+      An upgrade to at least perl $minimum_perl_version is suggested.
 EOM
         }
         if ($exit) {
@@ -2235,10 +2248,14 @@ sub process {
 
         our $clean = 1;
         my $signoff = 0;
+        my $author = '';
+        my $authorsignoff = 0;
         my $is_patch = 0;
+        my $is_binding_patch = -1;
         my $in_header_lines = $file ? 0 : 1;
         my $in_commit_log = 0;          #Scanning lines before patch
         my $has_commit_log = 0;         #Encountered lines before patch
+        my $commit_log_lines = 0;       #Number of commit log lines
         my $commit_log_possible_stack_dump = 0;
         my $commit_log_long_line = 0;
         my $commit_log_has_diff = 0;
@@ -2485,6 +2502,19 @@ sub process {
                                 $check = $check_orig;
                         }
                         $checklicenseline = 1;
+
+                        if ($realfile !~ /^MAINTAINERS/) {
+                                my $last_binding_patch = $is_binding_patch;
+
+                                $is_binding_patch = () = $realfile =~ m@^(?:Documentation/devicetree/|include/dt-bindings/)@;
+
+                                if (($last_binding_patch != -1) &&
+                                    ($last_binding_patch ^ $is_binding_patch)) {
+                                        WARN("DT_SPLIT_BINDING_PATCH",
+                                             "DT binding docs and includes should be a separate patch. See: Documentation/devicetree/bindings/submitting-patches.txt\n");
+                                }
+                        }
+
                         next;
                 }
 
@@ -2496,6 +2526,18 @@ sub process {
 
                 $cnt_lines++ if ($realcnt != 0);
 
+# Verify the existence of a commit log if appropriate
+# 2 is used because a $signature is counted in $commit_log_lines
+                if ($in_commit_log) {
+                        if ($line !~ /^\s*$/) {
+                                $commit_log_lines++;    #could be a $signature
+                        }
+                } elsif ($has_commit_log && $commit_log_lines < 2) {
+                        WARN("COMMIT_MESSAGE",
+                             "Missing commit description - Add an appropriate one\n");
+                        $commit_log_lines = 2;  #warn only once
+                }
+
 # Check if the commit log has what seems like a diff which can confuse patch
                 if ($in_commit_log && !$commit_log_has_diff &&
                     (($line =~ m@^\s+diff\b.*a/[\w/]+@ &&
@@ -2517,10 +2559,24 @@ sub process {
                         }
                 }
 
+# Check the patch for a From:
+                if (decode("MIME-Header", $line) =~ /^From:\s*(.*)/) {
+                        $author = $1;
+                        $author = encode("utf8", $author) if ($line =~ /=\?utf-8\?/i);
+                        $author =~ s/"//g;
+                }
+
 # Check the patch for a signoff:
                 if ($line =~ /^\s*signed-off-by:/i) {
                         $signoff++;
                         $in_commit_log = 0;
+                        if ($author ne '') {
+                                my $l = $line;
+                                $l =~ s/"//g;
+                                if ($l =~ /^\s*signed-off-by:\s*\Q$author\E/i) {
+                                    $authorsignoff = 1;
+                                }
+                        }
                 }
 
 # Check if MAINTAINERS is being updated.  If so, there's probably no need to
@@ -2606,12 +2662,6 @@ sub process {
                              "A patch subject line should describe the change not the tool that found it\n" . $herecurr);
                 }
 
-# Check for old stable address
-                if ($line =~ /^\s*cc:\s*.*<?\bstable\@kernel\.org\b>?.*$/i) {
-                        ERROR("STABLE_ADDRESS",
-                              "The 'stable' address should be 'stable\@vger.kernel.org'\n" . $herecurr);
-                }
-
 # Check for unwanted Gerrit info
                 if ($in_commit_log && $line =~ /^\s*change-id:/i) {
                         ERROR("GERRIT_CHANGE_ID",
@@ -2966,8 +3016,14 @@ sub process {
 
                                 if ($comment !~ /^$/ &&
                                     $rawline !~ /^\+\Q$comment\E SPDX-License-Identifier: /) {
-                                        WARN("SPDX_LICENSE_TAG",
-                                             "Missing or malformed SPDX-License-Identifier tag in line $checklicenseline\n" . $herecurr);
+                                         WARN("SPDX_LICENSE_TAG",
+                                              "Missing or malformed SPDX-License-Identifier tag in line $checklicenseline\n" . $herecurr);
+                                } elsif ($rawline =~ /(SPDX-License-Identifier: .*)/) {
+                                         my $spdx_license = $1;
+                                         if (!is_SPDX_License_valid($spdx_license)) {
+                                                  WARN("SPDX_LICENSE_TAG",
+                                                       "'$spdx_license' is not supported in LICENSES/...\n" . $herecurr);
+                                         }
                                 }
                         }
                 }
@@ -3085,7 +3141,7 @@ sub process {
                 }
 
 # check indentation starts on a tab stop
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                     $sline =~ /^\+\t+( +)(?:$c90_Keywords\b|\{\s*$|\}\s*(?:else\b|while\b|\s*$)|$Declare\s*$Ident\s*[;=])/) {
                         my $indent = length($1);
                         if ($indent % 8) {
@@ -3098,7 +3154,7 @@ sub process {
                 }
 
 # check multi-line statement indentation matches previous line
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                     $prevline =~ /^\+([ \t]*)((?:$c90_Keywords(?:\s+if)\s*)|(?:$Declare\s*)?(?:$Ident|\(\s*\*\s*$Ident\s*\))\s*|(?:\*\s*)*$Lval\s*=\s*$Ident\s*)\(.*(\&\&|\|\||,)\s*$/) {
                         $prevline =~ /^\+(\t*)(.*)$/;
                         my $oldindent = $1;
@@ -3787,6 +3843,26 @@ sub process {
                              "type '$tmp' should be specified in [[un]signed] [short|int|long|long long] order\n" . $herecurr);
                 }
 
+# check for unnecessary <signed> int declarations of short/long/long long
+                while ($sline =~ m{\b($TypeMisordered(\s*\*)*|$C90_int_types)\b}g) {
+                        my $type = trim($1);
+                        next if ($type !~ /\bint\b/);
+                        next if ($type !~ /\b(?:short|long\s+long|long)\b/);
+                        my $new_type = $type;
+                        $new_type =~ s/\b\s*int\s*\b/ /;
+                        $new_type =~ s/\b\s*(?:un)?signed\b\s*/ /;
+                        $new_type =~ s/^const\s+//;
+                        $new_type = "unsigned $new_type" if ($type =~ /\bunsigned\b/);
+                        $new_type = "const $new_type" if ($type =~ /^const\b/);
+                        $new_type =~ s/\s+/ /g;
+                        $new_type = trim($new_type);
+                        if (WARN("UNNECESSARY_INT",
+                                 "Prefer '$new_type' over '$type' as the int is unnecessary\n" . $herecurr) &&
+                            $fix) {
+                                $fixed[$fixlinenr] =~ s/\b\Q$type\E\b/$new_type/;
+                        }
+                }
+
 # check for static const char * arrays.
                 if ($line =~ /\bstatic\s+const\s+char\s*\*\s*(\w+)\s*\[\s*\]\s*=\s*/) {
                         WARN("STATIC_CONST_CHAR_ARRAY",
@@ -3973,7 +4049,7 @@ sub process {
 
 # function brace can't be on same line, except for #defines of do while,
 # or if closed on same line
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                     $sline =~ /$Type\s*$Ident\s*$balanced_parens\s*\{/ &&
                     $sline !~ /\#\s*define\b.*do\s*\{/ &&
                     $sline !~ /}/) {
@@ -4489,11 +4565,11 @@ sub process {
 
 #need space before brace following if, while, etc
                 if (($line =~ /\(.*\)\{/ && $line !~ /\($Type\)\{/) ||
-                    $line =~ /do\{/) {
+                    $line =~ /\b(?:else|do)\{/) {
                         if (ERROR("SPACING",
                                   "space required before the open brace '{'\n" . $herecurr) &&
                             $fix) {
-                                $fixed[$fixlinenr] =~ s/^(\+.*(?:do|\)))\{/$1 {/;
+                                $fixed[$fixlinenr] =~ s/^(\+.*(?:do|else|\)))\{/$1 {/;
                         }
                 }
 
@@ -4584,7 +4660,7 @@ sub process {
 # check for unnecessary parentheses around comparisons in if uses
 # when !drivers/staging or command-line uses --strict
                 if (($realfile !~ m@^(?:drivers/staging/)@ || $check_orig) &&
-                    $^V && $^V ge 5.10.0 && defined($stat) &&
+                    $perl_version_ok && defined($stat) &&
                     $stat =~ /(^.\s*if\s*($balanced_parens))/) {
                         my $if_stat = $1;
                         my $test = substr($2, 1, -1);
@@ -4621,7 +4697,7 @@ sub process {
 # return is not a function
                 if (defined($stat) && $stat =~ /^.\s*return(\s*)\(/s) {
                         my $spacing = $1;
-                        if ($^V && $^V ge 5.10.0 &&
+                        if ($perl_version_ok &&
                             $stat =~ /^.\s*return\s*($balanced_parens)\s*;\s*$/) {
                                 my $value = $1;
                                 $value = deparenthesize($value);
@@ -4648,7 +4724,7 @@ sub process {
                }
 
 # if statements using unnecessary parentheses - ie: if ((foo == bar))
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                     $line =~ /\bif\s*((?:\(\s*){2,})/) {
                         my $openparens = $1;
                         my $count = $openparens =~ tr@\(@\(@;
@@ -4665,7 +4741,7 @@ sub process {
 #       avoid cases like "foo + BAR < baz"
 #       only fix matches surrounded by parentheses to avoid incorrect
 #       conversions like "FOO < baz() + 5" being "misfixed" to "baz() > FOO + 5"
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                     $line =~ /^\+(.*)\b($Constant|[A-Z_][A-Z0-9_]*)\s*($Compare)\s*($LvalOrFunc)/) {
                         my $lead = $1;
                         my $const = $2;
@@ -4955,6 +5031,7 @@ sub process {
                         if (defined $define_args && $define_args ne "") {
                                 $define_args = substr($define_args, 1, length($define_args) - 2);
                                 $define_args =~ s/\s*//g;
+                                $define_args =~ s/\\\+?//g;
                                 @def_args = split(",", $define_args);
                         }
 
@@ -5090,7 +5167,7 @@ sub process {
 # do {} while (0) macro tests:
 # single-statement macros do not need to be enclosed in do while (0) loop,
 # macro should not end with a semicolon
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                     $realfile !~ m@/vmlinux.lds.h$@ &&
                     $line =~ /^.\s*\#\s*define\s+$Ident(\()?/) {
                         my $ln = $linenr;
@@ -5336,15 +5413,28 @@ sub process {
                 }
 
 # concatenated string without spaces between elements
-                if ($line =~ /$String[A-Z_]/ || $line =~ /[A-Za-z0-9_]$String/) {
-                        CHK("CONCATENATED_STRING",
-                            "Concatenated strings should use spaces between elements\n" . $herecurr);
+                if ($line =~ /$String[A-Za-z0-9_]/ || $line =~ /[A-Za-z0-9_]$String/) {
+                        if (CHK("CONCATENATED_STRING",
+                                "Concatenated strings should use spaces between elements\n" . $herecurr) &&
+                            $fix) {
+                                while ($line =~ /($String)/g) {
+                                        my $extracted_string = substr($rawline, $-[0], $+[0] - $-[0]);
+                                        $fixed[$fixlinenr] =~ s/\Q$extracted_string\E([A-Za-z0-9_])/$extracted_string $1/;
+                                        $fixed[$fixlinenr] =~ s/([A-Za-z0-9_])\Q$extracted_string\E/$1 $extracted_string/;
+                                }
+                        }
                 }
 
 # uncoalesced string fragments
                 if ($line =~ /$String\s*"/) {
-                        WARN("STRING_FRAGMENTS",
-                             "Consecutive strings are generally better as a single string\n" . $herecurr);
+                        if (WARN("STRING_FRAGMENTS",
+                                 "Consecutive strings are generally better as a single string\n" . $herecurr) &&
+                            $fix) {
+                                while ($line =~ /($String)(?=\s*")/g) {
+                                        my $extracted_string = substr($rawline, $-[0], $+[0] - $-[0]);
+                                        $fixed[$fixlinenr] =~ s/\Q$extracted_string\E\s*"/substr($extracted_string, 0, -1)/e;
+                                }
+                        }
                 }
 
 # check for non-standard and hex prefixed decimal printf formats
@@ -5380,9 +5470,14 @@ sub process {
 
 # warn about #if 0
                 if ($line =~ /^.\s*\#\s*if\s+0\b/) {
-                        CHK("REDUNDANT_CODE",
-                            "if this code is redundant consider removing it\n" .
-                                $herecurr);
+                        WARN("IF_0",
+                             "Consider removing the code enclosed by this #if 0 and its #endif\n" . $herecurr);
+                }
+
+# warn about #if 1
+                if ($line =~ /^.\s*\#\s*if\s+1\b/) {
+                        WARN("IF_1",
+                             "Consider removing the #if 1 and its #endif\n" . $herecurr);
                 }
 
 # check for needless "if (<foo>) fn(<foo>)" uses
@@ -5453,7 +5548,7 @@ sub process {
                 }
 
 # check for mask then right shift without a parentheses
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                     $line =~ /$LvalOrFunc\s*\&\s*($LvalOrFunc)\s*>>/ &&
                     $4 !~ /^\&/) { # $LvalOrFunc may be &foo, ignore if so
                         WARN("MASK_THEN_SHIFT",
@@ -5461,7 +5556,7 @@ sub process {
                 }
 
 # check for pointer comparisons to NULL
-                if ($^V && $^V ge 5.10.0) {
+                if ($perl_version_ok) {
                         while ($line =~ /\b$LvalOrFunc\s*(==|\!=)\s*NULL\b/g) {
                                 my $val = $1;
                                 my $equal = "!";
@@ -5733,7 +5828,7 @@ sub process {
                 }
 
 # Check for __attribute__ weak, or __weak declarations (may have link issues)
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                     $line =~ /(?:$Declare|$DeclareMisordered)\s*$Ident\s*$balanced_parens\s*(?:$Attribute)?\s*;/ &&
                     ($line =~ /\b__attribute__\s*\(\s*\(.*\bweak\b/ ||
                      $line =~ /\b__weak\b/)) {
@@ -5815,18 +5910,18 @@ sub process {
                 }
 
 # check for vsprintf extension %p<foo> misuses
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                     defined $stat &&
                     $stat =~ /^\+(?![^\{]*\{\s*).*\b(\w+)\s*\(.*$String\s*,/s &&
                     $1 !~ /^_*volatile_*$/) {
-                        my $specifier;
-                        my $extension;
-                        my $bad_specifier = "";
                         my $stat_real;
 
                         my $lc = $stat =~ tr@\n@@;
                         $lc = $lc + $linenr;
                         for (my $count = $linenr; $count <= $lc; $count++) {
+                                my $specifier;
+                                my $extension;
+                                my $bad_specifier = "";
                                 my $fmt = get_quoted_string($lines[$count - 1], raw_line($count, 0));
                                 $fmt =~ s/%%//g;
 
@@ -5862,7 +5957,7 @@ sub process {
                 }
 
 # Check for misused memsets
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                     defined $stat &&
                     $stat =~ /^\+(?:.*?)\bmemset\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*$FuncArg\s*\)/) {
 
@@ -5880,7 +5975,7 @@ sub process {
                 }
 
 # Check for memcpy(foo, bar, ETH_ALEN) that could be ether_addr_copy(foo, bar)
-#               if ($^V && $^V ge 5.10.0 &&
+#               if ($perl_version_ok &&
 #                   defined $stat &&
 #                   $stat =~ /^\+(?:.*?)\bmemcpy\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*ETH_ALEN\s*\)/) {
 #                       if (WARN("PREFER_ETHER_ADDR_COPY",
@@ -5891,7 +5986,7 @@ sub process {
 #               }
 
 # Check for memcmp(foo, bar, ETH_ALEN) that could be ether_addr_equal*(foo, bar)
-#               if ($^V && $^V ge 5.10.0 &&
+#               if ($perl_version_ok &&
 #                   defined $stat &&
 #                   $stat =~ /^\+(?:.*?)\bmemcmp\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*ETH_ALEN\s*\)/) {
 #                       WARN("PREFER_ETHER_ADDR_EQUAL",
@@ -5900,7 +5995,7 @@ sub process {
 
 # check for memset(foo, 0x0, ETH_ALEN) that could be eth_zero_addr
 # check for memset(foo, 0xFF, ETH_ALEN) that could be eth_broadcast_addr
-#               if ($^V && $^V ge 5.10.0 &&
+#               if ($perl_version_ok &&
 #                   defined $stat &&
 #                   $stat =~ /^\+(?:.*?)\bmemset\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*ETH_ALEN\s*\)/) {
 #
@@ -5922,7 +6017,7 @@ sub process {
 #               }
 
 # typecasts on min/max could be min_t/max_t
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                     defined $stat &&
                     $stat =~ /^\+(?:.*?)\b(min|max)\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\)/) {
                         if (defined $2 || defined $7) {
@@ -5946,7 +6041,7 @@ sub process {
                 }
 
 # check usleep_range arguments
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                     defined $stat &&
                     $stat =~ /^\+(?:.*?)\busleep_range\s*\(\s*($FuncArg)\s*,\s*($FuncArg)\s*\)/) {
                         my $min = $1;
@@ -5962,7 +6057,7 @@ sub process {
                 }
 
 # check for naked sscanf
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                     defined $stat &&
                     $line =~ /\bsscanf\b/ &&
                     ($stat !~ /$Ident\s*=\s*sscanf\s*$balanced_parens/ &&
@@ -5976,7 +6071,7 @@ sub process {
                 }
 
 # check for simple sscanf that should be kstrto<foo>
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                     defined $stat &&
                     $line =~ /\bsscanf\b/) {
                         my $lc = $stat =~ tr@\n@@;
@@ -6048,7 +6143,7 @@ sub process {
                 }
 
 # check for function definitions
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                     defined $stat &&
                     $stat =~ /^.\s*(?:$Storage\s+)?$Type\s*($Ident)\s*$balanced_parens\s*{/s) {
                         $context_function = $1;
@@ -6088,14 +6183,14 @@ sub process {
 
 # alloc style
 # p = alloc(sizeof(struct foo), ...) should be p = alloc(sizeof(*p), ...)
-                if ($^V && $^V ge 5.10.0 &&
+                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*\))/) {
                         CHK("ALLOC_SIZEOF_STRUCT",
                             "Prefer $3(sizeof(*$1)...) over $3($4...)\n" . $herecurr);
                 }
 
 # check for k[mz]alloc with multiplies that could be kmalloc_array/kcalloc
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                     defined $stat &&
                     $stat =~ /^\+\s*($Lval)\s*\=\s*(?:$balanced_parens)?\s*(k[mz]alloc)\s*\(\s*($FuncArg)\s*\*\s*($FuncArg)\s*,/) {
                         my $oldfunc = $3;
@@ -6124,8 +6219,9 @@ sub process {
                 }
 
 # check for krealloc arg reuse
-                if ($^V && $^V ge 5.10.0 &&
-                    $line =~ /\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*krealloc\s*\(\s*\1\s*,/) {
+                if ($perl_version_ok &&
+                    $line =~ /\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*krealloc\s*\(\s*($Lval)\s*,/ &&
+                    $1 eq $3) {
                         WARN("KREALLOC_ARG_REUSE",
                              "Reusing the krealloc arg is almost always a bug\n" . $herecurr);
                 }
@@ -6193,7 +6289,7 @@ sub process {
                 }
 
 # check for switch/default statements without a break;
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                     defined $stat &&
                     $stat =~ /^\+[$;\s]*(?:case[$;\s]+\w+[$;\s]*:[$;\s]*|)*[$;\s]*\bdefault[$;\s]*:[$;\s]*;/g) {
                         my $cnt = statement_rawlines($stat);
@@ -6257,6 +6353,13 @@ sub process {
                              "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",
@@ -6303,7 +6406,7 @@ sub process {
                 }
 
 # likely/unlikely comparisons similar to "(likely(foo) > 0)"
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                     $line =~ /\b((?:un)?likely)\s*\(\s*$FuncArg\s*\)\s*$Compare/) {
                         WARN("LIKELY_MISUSE",
                              "Using $1 should generally have parentheses around the comparison\n" . $herecurr);
@@ -6346,7 +6449,7 @@ sub process {
 # check for DEVICE_ATTR uses that could be DEVICE_ATTR_<FOO>
 # and whether or not function naming is typical and if
 # DEVICE_ATTR permissions uses are unusual too
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                     defined $stat &&
                     $stat =~ /\bDEVICE_ATTR\s*\(\s*(\w+)\s*,\s*\(?\s*(\s*(?:${multi_mode_perms_string_search}|0[0-7]{3,3})\s*)\s*\)?\s*,\s*(\w+)\s*,\s*(\w+)\s*\)/) {
                         my $var = $1;
@@ -6406,7 +6509,7 @@ sub process {
 #   specific definition of not visible in sysfs.
 # o Ignore proc_create*(...) uses with a decimal 0 permission as that means
 #   use the default permissions
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                     defined $stat &&
                     $line =~ /$mode_perms_search/) {
                         foreach my $entry (@mode_permission_funcs) {
@@ -6492,9 +6595,14 @@ sub process {
                 ERROR("NOT_UNIFIED_DIFF",
                       "Does not appear to be a unified-diff format patch\n");
         }
-        if ($is_patch && $has_commit_log && $chk_signoff && $signoff == 0) {
-                ERROR("MISSING_SIGN_OFF",
-                      "Missing Signed-off-by: line(s)\n");
+        if ($is_patch && $has_commit_log && $chk_signoff) {
+                if ($signoff == 0) {
+                        ERROR("MISSING_SIGN_OFF",
+                              "Missing Signed-off-by: line(s)\n");
+                } elsif (!$authorsignoff) {
+                        WARN("NO_AUTHOR_SIGN_OFF",
+                             "Missing Signed-off-by: line by nominal patch author '$author'\n");
+                }
         }
 
         print report_dump();
diff --git a/scripts/checkstack.pl b/scripts/checkstack.pl
index cbdf0dfd4c22..8081b6cf67d2 100755
--- a/scripts/checkstack.pl
+++ b/scripts/checkstack.pl
@@ -15,6 +15,7 @@
 #       M68k port by Geert Uytterhoeven and Andreas Schwab
 #       AArch64, PARISC ports by Kyle McMartin
 #       sparc port by Martin Habets <errandir_news@mph.eclipse.co.uk>
+#       ppc64le port by Breno Leitao <leitao@debian.org>
 #
 #       Usage:
 #       objdump -d vmlinux | scripts/checkstack.pl [arch]
@@ -78,13 +79,9 @@ my (@stack, $re, $dre, $x, $xs, $funcre);
                 $re = qr/.*l\.addi.*r1,r1,-(([0-9]{2}|[3-9])[0-9]{2})/o;
         } elsif ($arch eq 'parisc' || $arch eq 'parisc64') {
                 $re = qr/.*ldo ($x{1,8})\(sp\),sp/o;
-        } elsif ($arch eq 'ppc') {
-                #c00029f4:       94 21 ff 30     stwu    r1,-208(r1)
-                $re = qr/.*stwu.*r1,-($x{1,8})\(r1\)/o;
-        } elsif ($arch eq 'ppc64') {
-                #XXX
-                $re = qr/.*stdu.*r1,-($x{1,8})\(r1\)/o;
-        } elsif ($arch eq 'powerpc') {
+        } elsif ($arch eq 'powerpc' || $arch =~ /^ppc(64)?(le)?$/ ) {
+                # powerpc    : 94 21 ff 30     stwu    r1,-208(r1)
+                # ppc64(le)  : 81 ff 21 f8     stdu    r1,-128(r1)
                 $re = qr/.*st[dw]u.*r1,-($x{1,8})\(r1\)/o;
         } elsif ($arch =~ /^s390x?$/) {
                 #   11160:       a7 fb ff 60             aghi   %r15,-160
diff --git a/scripts/clang-version.sh b/scripts/clang-version.sh
index dbf0a31eb111..e65fbc3079d4 100755
--- a/scripts/clang-version.sh
+++ b/scripts/clang-version.sh
@@ -12,7 +12,7 @@
 
 compiler="$*"
 
-if !( $compiler --version | grep -q clang) ; then
+if ! ( $compiler --version | grep -q clang) ; then
         echo 0
         exit 1
 fi
diff --git a/scripts/coccicheck b/scripts/coccicheck
index 9fedca611b7f..e04d328210ac 100755
--- a/scripts/coccicheck
+++ b/scripts/coccicheck
@@ -128,9 +128,10 @@ run_cmd_parmap() {
         fi
         echo $@ >>$DEBUG_FILE
         $@ 2>>$DEBUG_FILE
-        if [[ $? -ne 0 ]]; then
+        err=$?
+        if [[ $err -ne 0 ]]; then
                 echo "coccicheck failed"
-                exit $?
+                exit $err
         fi
 }
 
diff --git a/scripts/coccinelle/api/alloc/zalloc-simple.cocci b/scripts/coccinelle/api/alloc/zalloc-simple.cocci
index 92b20913055f..d819275b7fde 100644
--- a/scripts/coccinelle/api/alloc/zalloc-simple.cocci
+++ b/scripts/coccinelle/api/alloc/zalloc-simple.cocci
@@ -35,8 +35,7 @@ statement S;
 
 * x = (T)\(kmalloc(E1, ...)\|vmalloc(E1)\|dma_alloc_coherent(...,E1,...)\|
   kmalloc_node(E1, ...)\|kmem_cache_alloc(...)\|kmem_alloc(E1, ...)\|
-  devm_kmalloc(...,E1,...)\|kvmalloc(E1, ...)\|pci_alloc_consistent(...,E1,...)\|
-  kvmalloc_node(E1,...)\);
+  devm_kmalloc(...,E1,...)\|kvmalloc(E1, ...)\|kvmalloc_node(E1,...)\);
   if ((x==NULL) || ...) S
 * memset((T2)x,0,E1);
 
@@ -124,15 +123,6 @@ statement S;
 - x = (T)kvmalloc(E1,E2);
 + x = (T)kvzalloc(E1,E2);
 |
-- x = pci_alloc_consistent(E2,E1,E3);
-+ x = pci_zalloc_consistent(E2,E1,E3);
-|
-- x = (T *)pci_alloc_consistent(E2,E1,E3);
-+ x = pci_zalloc_consistent(E2,E1,E3);
-|
-- x = (T)pci_alloc_consistent(E2,E1,E3);
-+ x = (T)pci_zalloc_consistent(E2,E1,E3);
-|
 - x = kvmalloc_node(E1,E2,E3);
 + x = kvzalloc_node(E1,E2,E3);
 |
@@ -389,35 +379,6 @@ msg="WARNING: kvzalloc should be used for %s, instead of kvmalloc/memset" % (x)
 coccilib.report.print_report(p[0], msg)
 
 //-----------------------------------------------------------------
-@r8 depends on org || report@
-type T, T2;
-expression x;
-expression E1,E2,E3;
-statement S;
-position p;
-@@
-
- x = (T)pci_alloc_consistent@p(E2,E1,E3);
- if ((x==NULL) || ...) S
- memset((T2)x,0,E1);
-
-@script:python depends on org@
-p << r8.p;
-x << r8.x;
-@@
-
-msg="%s" % (x)
-msg_safe=msg.replace("[","@(").replace("]",")")
-coccilib.org.print_todo(p[0], msg_safe)
-
-@script:python depends on report@
-p << r8.p;
-x << r8.x;
-@@
-
-msg="WARNING: pci_zalloc_consistent should be used for %s, instead of pci_alloc_consistent/memset" % (x)
-coccilib.report.print_report(p[0], msg)
-//-----------------------------------------------------------------
 @r9 depends on org || report@
 type T, T2;
 expression x;
diff --git a/scripts/coccinelle/api/atomic_as_refcounter.cocci b/scripts/coccinelle/api/atomic_as_refcounter.cocci
new file mode 100644
index 000000000000..988120e0fd67
--- /dev/null
+++ b/scripts/coccinelle/api/atomic_as_refcounter.cocci
@@ -0,0 +1,129 @@
+// Check if refcount_t type and API should be used
+// instead of atomic_t type when dealing with refcounters
+//
+// Copyright (c) 2016-2017, Elena Reshetova, Intel Corporation
+//
+// Confidence: Moderate
+// URL: http://coccinelle.lip6.fr/
+// Options: --include-headers --very-quiet
+
+virtual report
+
+@r1 exists@
+identifier a, x;
+position p1, p2;
+identifier fname =~ ".*free.*";
+identifier fname2 =~ ".*destroy.*";
+identifier fname3 =~ ".*del.*";
+identifier fname4 =~ ".*queue_work.*";
+identifier fname5 =~ ".*schedule_work.*";
+identifier fname6 =~ ".*call_rcu.*";
+
+@@
+
+(
+ atomic_dec_and_test@p1(&(a)->x)
+|
+ atomic_dec_and_lock@p1(&(a)->x, ...)
+|
+ atomic_long_dec_and_lock@p1(&(a)->x, ...)
+|
+ atomic_long_dec_and_test@p1(&(a)->x)
+|
+ atomic64_dec_and_test@p1(&(a)->x)
+|
+ local_dec_and_test@p1(&(a)->x)
+)
+...
+(
+ fname@p2(a, ...);
+|
+ fname2@p2(...);
+|
+ fname3@p2(...);
+|
+ fname4@p2(...);
+|
+ fname5@p2(...);
+|
+ fname6@p2(...);
+)
+
+
+@script:python depends on report@
+p1 << r1.p1;
+p2 << r1.p2;
+@@
+msg = "atomic_dec_and_test variation before object free at line %s."
+coccilib.report.print_report(p1[0], msg % (p2[0].line))
+
+@r4 exists@
+identifier a, x, y;
+position p1, p2;
+identifier fname =~ ".*free.*";
+
+@@
+
+(
+ atomic_dec_and_test@p1(&(a)->x)
+|
+ atomic_dec_and_lock@p1(&(a)->x, ...)
+|
+ atomic_long_dec_and_lock@p1(&(a)->x, ...)
+|
+ atomic_long_dec_and_test@p1(&(a)->x)
+|
+ atomic64_dec_and_test@p1(&(a)->x)
+|
+ local_dec_and_test@p1(&(a)->x)
+)
+...
+y=a
+...
+fname@p2(y, ...);
+
+
+@script:python depends on report@
+p1 << r4.p1;
+p2 << r4.p2;
+@@
+msg = "atomic_dec_and_test variation before object free at line %s."
+coccilib.report.print_report(p1[0], msg % (p2[0].line))
+
+@r2 exists@
+identifier a, x;
+position p1;
+@@
+
+(
+atomic_add_unless(&(a)->x,-1,1)@p1
+|
+atomic_long_add_unless(&(a)->x,-1,1)@p1
+|
+atomic64_add_unless(&(a)->x,-1,1)@p1
+)
+
+@script:python depends on report@
+p1 << r2.p1;
+@@
+msg = "atomic_add_unless"
+coccilib.report.print_report(p1[0], msg)
+
+@r3 exists@
+identifier x;
+position p1;
+@@
+
+(
+x = atomic_add_return@p1(-1, ...);
+|
+x = atomic_long_add_return@p1(-1, ...);
+|
+x = atomic64_add_return@p1(-1, ...);
+)
+
+@script:python depends on report@
+p1 << r3.p1;
+@@
+msg = "x = atomic_add_return(-1, ...)"
+coccilib.report.print_report(p1[0], msg)
diff --git a/scripts/coccinelle/tests/doubletest.cocci b/scripts/coccinelle/tests/doubletest.cocci
index 78d74c22ca12..7af2ce7eb9bf 100644
--- a/scripts/coccinelle/tests/doubletest.cocci
+++ b/scripts/coccinelle/tests/doubletest.cocci
@@ -1,6 +1,7 @@
 /// Find &&/|| operations that include the same argument more than once
-//# A common source of false positives is when the argument performs a side
-//# effect.
+//# A common source of false positives is when the expression, or
+//# another expresssion in the same && or || operation, performs a
+//# side effect.
 ///
 // Confidence: Moderate
 // Copyright: (C) 2010 Nicolas Palix, DIKU.  GPLv2.
@@ -20,20 +21,37 @@ position p;
 @@
 
 (
-* E@p
-  || ... || E
+ E@p || ... || E
 |
-* E@p
-  && ... && E
+ E@p && ... && E
 )
 
-@script:python depends on org@
+@bad@
+expression r.E,e1,e2,fn;
+position r.p;
+assignment operator op;
+@@
+
+(
+E@p
+&
+ <+... \(fn(...)\|e1 op e2\|e1++\|e1--\|++e1\|--e1\) ...+>
+)
+
+@depends on context && !bad@
+expression r.E;
+position r.p;
+@@
+
+*E@p
+
+@script:python depends on org && !bad@
 p << r.p;
 @@
 
 cocci.print_main("duplicated argument to && or ||",p)
 
-@script:python depends on report@
+@script:python depends on report && !bad@
 p << r.p;
 @@
 
diff --git a/scripts/depmod.sh b/scripts/depmod.sh
index 1a6f85e0e6e1..999d585eaa73 100755
--- a/scripts/depmod.sh
+++ b/scripts/depmod.sh
@@ -10,10 +10,16 @@ fi
 DEPMOD=$1
 KERNELRELEASE=$2
 
-if ! test -r System.map -a -x "$DEPMOD"; then
+if ! test -r System.map ; then
         exit 0
 fi
 
+if [ -z $(command -v $DEPMOD) ]; then
+        echo "'make modules_install' requires $DEPMOD. Please install it." >&2
+        echo "This is probably in the kmod package." >&2
+        exit 1
+fi
+
 # older versions of depmod require the version string to start with three
 # numbers, so we cheat with a symlink here
 depmod_hack_needed=true
diff --git a/scripts/documentation-file-ref-check b/scripts/documentation-file-ref-check
index 078999a3fdff..ad9db6821824 100755
--- a/scripts/documentation-file-ref-check
+++ b/scripts/documentation-file-ref-check
@@ -75,6 +75,12 @@ while (<IN>) {
                 # Remove URL false-positives
                 next if ($fulref =~ m/^http/);
 
+                # Remove sched-pelt false-positive
+                next if ($fulref =~ m,^Documentation/scheduler/sched-pelt$,);
+
+                # Discard some build examples from Documentation/target/tcm_mod_builder.txt
+                next if ($fulref =~ m,mnt/sdb/lio-core-2.6.git/Documentation/target,);
+
                 # Check if exists, evaluating wildcards
                 next if (grep -e, glob("$ref $fulref"));
 
diff --git a/scripts/dtc/Makefile b/scripts/dtc/Makefile
index 9cac65b7419c..1c943e03eaf2 100644
--- a/scripts/dtc/Makefile
+++ b/scripts/dtc/Makefile
@@ -9,21 +9,11 @@ dtc-objs	:= dtc.o flattree.o fstree.o data.o livetree.o treesource.o \
 dtc-objs        += dtc-lexer.lex.o dtc-parser.tab.o
 
 # Source files need to get at the userspace version of libfdt_env.h to compile
+HOST_EXTRACFLAGS := -I$(src)/libfdt
 
-HOSTCFLAGS_DTC := -I$(src) -I$(src)/libfdt
-
-HOSTCFLAGS_checks.o := $(HOSTCFLAGS_DTC)
-HOSTCFLAGS_data.o := $(HOSTCFLAGS_DTC)
-HOSTCFLAGS_dtc.o := $(HOSTCFLAGS_DTC)
-HOSTCFLAGS_flattree.o := $(HOSTCFLAGS_DTC)
-HOSTCFLAGS_fstree.o := $(HOSTCFLAGS_DTC)
-HOSTCFLAGS_livetree.o := $(HOSTCFLAGS_DTC)
-HOSTCFLAGS_srcpos.o := $(HOSTCFLAGS_DTC)
-HOSTCFLAGS_treesource.o := $(HOSTCFLAGS_DTC)
-HOSTCFLAGS_util.o := $(HOSTCFLAGS_DTC)
-
-HOSTCFLAGS_dtc-lexer.lex.o := $(HOSTCFLAGS_DTC)
-HOSTCFLAGS_dtc-parser.tab.o := $(HOSTCFLAGS_DTC)
+# Generated files need one more search path to include headers in source tree
+HOSTCFLAGS_dtc-lexer.lex.o := -I$(src)
+HOSTCFLAGS_dtc-parser.tab.o := -I$(src)
 
 # dependencies on generated files need to be listed explicitly
 $(obj)/dtc-lexer.lex.o: $(obj)/dtc-parser.tab.h
diff --git a/scripts/extract-vmlinux b/scripts/extract-vmlinux
index 5061abcc2540..e6239f39abad 100755
--- a/scripts/extract-vmlinux
+++ b/scripts/extract-vmlinux
@@ -57,6 +57,8 @@ try_decompress '\3757zXZ\000' abcde unxz
 try_decompress 'BZh'          xy    bunzip2
 try_decompress '\135\0\0\0'   xxx   unlzma
 try_decompress '\211\114\132' xy    'lzop -d'
+try_decompress '\002!L\030'   xxx   'lz4 -d'
+try_decompress '(\265/\375'   xxx   unzstd
 
 # Bail out:
 echo "$me: Cannot find vmlinux." >&2
diff --git a/scripts/gcc-plugins/Kconfig b/scripts/gcc-plugins/Kconfig
new file mode 100644
index 000000000000..cb0c889e13aa
--- /dev/null
+++ b/scripts/gcc-plugins/Kconfig
@@ -0,0 +1,142 @@
+preferred-plugin-hostcc := $(if-success,[ $(gcc-version) -ge 40800 ],$(HOSTCXX),$(HOSTCC))
+
+config PLUGIN_HOSTCC
+        string
+        default "$(shell,$(srctree)/scripts/gcc-plugin.sh "$(preferred-plugin-hostcc)" "$(HOSTCXX)" "$(CC)")" if CC_IS_GCC
+        help
+          Host compiler used to build GCC plugins.  This can be $(HOSTCXX),
+          $(HOSTCC), or a null string if GCC plugin is unsupported.
+
+config HAVE_GCC_PLUGINS
+        bool
+        help
+          An arch should select this symbol if it supports building with
+          GCC plugins.
+
+menuconfig GCC_PLUGINS
+        bool "GCC plugins"
+        depends on HAVE_GCC_PLUGINS
+        depends on PLUGIN_HOSTCC != ""
+        help
+          GCC plugins are loadable modules that provide extra features to the
+          compiler. They are useful for runtime instrumentation and static analysis.
+
+          See Documentation/gcc-plugins.txt for details.
+
+if GCC_PLUGINS
+
+config GCC_PLUGIN_CYC_COMPLEXITY
+        bool "Compute the cyclomatic complexity of a function" if EXPERT
+        depends on !COMPILE_TEST        # too noisy
+        help
+          The complexity M of a function's control flow graph is defined as:
+           M = E - N + 2P
+          where
+
+          E = the number of edges
+          N = the number of nodes
+          P = the number of connected components (exit nodes).
+
+          Enabling this plugin reports the complexity to stderr during the
+          build. It mainly serves as a simple example of how to create a
+          gcc plugin for the kernel.
+
+config GCC_PLUGIN_SANCOV
+        bool
+        help
+          This plugin inserts a __sanitizer_cov_trace_pc() call at the start of
+          basic blocks. It supports all gcc versions with plugin support (from
+          gcc-4.5 on). It is based on the commit "Add fuzzing coverage support"
+          by Dmitry Vyukov <dvyukov@google.com>.
+
+config GCC_PLUGIN_LATENT_ENTROPY
+        bool "Generate some entropy during boot and runtime"
+        help
+          By saying Y here the kernel will instrument some kernel code to
+          extract some entropy from both original and artificially created
+          program state.  This will help especially embedded systems where
+          there is little 'natural' source of entropy normally.  The cost
+          is some slowdown of the boot process (about 0.5%) and fork and
+          irq processing.
+
+          Note that entropy extracted this way is not cryptographically
+          secure!
+
+          This plugin was ported from grsecurity/PaX. More information at:
+           * https://grsecurity.net/
+           * https://pax.grsecurity.net/
+
+config GCC_PLUGIN_STRUCTLEAK
+        bool "Force initialization of variables containing userspace addresses"
+        # 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
+          __user attribute. This can prevent some classes of information
+          exposures.
+
+          This plugin was ported from grsecurity/PaX. More information at:
+           * https://grsecurity.net/
+           * https://pax.grsecurity.net/
+
+config GCC_PLUGIN_STRUCTLEAK_BYREF_ALL
+        bool "Force initialize all struct type variables passed by reference"
+        depends on GCC_PLUGIN_STRUCTLEAK
+        depends on !COMPILE_TEST
+        help
+          Zero initialize any struct type local variable that may be passed by
+          reference without having been initialized.
+
+config GCC_PLUGIN_STRUCTLEAK_VERBOSE
+        bool "Report forcefully initialized variables"
+        depends on GCC_PLUGIN_STRUCTLEAK
+        depends on !COMPILE_TEST        # too noisy
+        help
+          This option will cause a warning to be printed each time the
+          structleak plugin finds a variable it thinks needs to be
+          initialized. Since not all existing initializers are detected
+          by the plugin, this can produce false positive warnings.
+
+config GCC_PLUGIN_RANDSTRUCT
+        bool "Randomize layout of sensitive kernel structures"
+        select MODVERSIONS if MODULES
+        help
+          If you say Y here, the layouts of structures that are entirely
+          function pointers (and have not been manually annotated with
+          __no_randomize_layout), or structures that have been explicitly
+          marked with __randomize_layout, will be randomized at compile-time.
+          This can introduce the requirement of an additional information
+          exposure vulnerability for exploits targeting these structure
+          types.
+
+          Enabling this feature will introduce some performance impact,
+          slightly increase memory usage, and prevent the use of forensic
+          tools like Volatility against the system (unless the kernel
+          source tree isn't cleaned after kernel installation).
+
+          The seed used for compilation is located at
+          scripts/gcc-plgins/randomize_layout_seed.h.  It remains after
+          a make clean to allow for external modules to be compiled with
+          the existing seed and will be removed by a make mrproper or
+          make distclean.
+
+          Note that the implementation requires gcc 4.7 or newer.
+
+          This plugin was ported from grsecurity/PaX. More information at:
+           * https://grsecurity.net/
+           * https://pax.grsecurity.net/
+
+config GCC_PLUGIN_RANDSTRUCT_PERFORMANCE
+        bool "Use cacheline-aware structure randomization"
+        depends on GCC_PLUGIN_RANDSTRUCT
+        depends on !COMPILE_TEST        # do not reduce test coverage
+        help
+          If you say Y here, the RANDSTRUCT randomization will make a
+          best effort at restricting randomization to cacheline-sized
+          groups of elements.  It will further not randomize bitfields
+          in structures.  This reduces the performance hit of RANDSTRUCT
+          at the cost of weakened randomization.
+
+endif
diff --git a/scripts/gcc-plugins/Makefile b/scripts/gcc-plugins/Makefile
index 326254653bd0..aa0d0ec6936d 100644
--- a/scripts/gcc-plugins/Makefile
+++ b/scripts/gcc-plugins/Makefile
@@ -14,8 +14,6 @@ else
   export HOST_EXTRACXXFLAGS
 endif
 
-export HOSTLIBS
-
 $(obj)/randomize_layout_plugin.o: $(objtree)/$(obj)/randomize_layout_seed.h
 quiet_cmd_create_randomize_layout_seed = GENSEED $@
 cmd_create_randomize_layout_seed = \
@@ -29,7 +27,4 @@ always := $($(HOSTLIBS)-y)
 
 $(foreach p,$($(HOSTLIBS)-y:%.so=%),$(eval $(p)-objs := $(p).o))
 
-subdir-y := $(GCC_PLUGIN_SUBDIR)
-subdir-  += $(GCC_PLUGIN_SUBDIR)
-
 clean-files += *.so
diff --git a/scripts/gcc-plugins/gcc-common.h b/scripts/gcc-plugins/gcc-common.h
index f46750053377..552d5efd7cb7 100644
--- a/scripts/gcc-plugins/gcc-common.h
+++ b/scripts/gcc-plugins/gcc-common.h
@@ -392,13 +392,6 @@ static inline struct cgraph_node *cgraph_alias_target(struct cgraph_node *n)
 }
 #endif
 
-#if BUILDING_GCC_VERSION >= 4007 && BUILDING_GCC_VERSION <= 4009
-#define cgraph_create_edge(caller, callee, call_stmt, count, freq, nest) \
-        cgraph_create_edge((caller), (callee), (call_stmt), (count), (freq))
-#define cgraph_create_edge_including_clones(caller, callee, old_call_stmt, call_stmt, count, freq, nest, reason) \
-        cgraph_create_edge_including_clones((caller), (callee), (old_call_stmt), (call_stmt), (count), (freq), (reason))
-#endif
-
 #if BUILDING_GCC_VERSION <= 4008
 #define ENTRY_BLOCK_PTR_FOR_FN(FN)      ENTRY_BLOCK_PTR_FOR_FUNCTION(FN)
 #define EXIT_BLOCK_PTR_FOR_FN(FN)       EXIT_BLOCK_PTR_FOR_FUNCTION(FN)
@@ -723,10 +716,23 @@ static inline const char *get_decl_section_name(const_tree decl)
 #define varpool_get_node(decl) varpool_node::get(decl)
 #define dump_varpool_node(file, node) (node)->dump(file)
 
-#define cgraph_create_edge(caller, callee, call_stmt, count, freq, nest) \
+#if BUILDING_GCC_VERSION >= 8000
+#define cgraph_create_edge(caller, callee, call_stmt, count, freq) \
+        (caller)->create_edge((callee), (call_stmt), (count))
+
+#define cgraph_create_edge_including_clones(caller, callee,     \
+                old_call_stmt, call_stmt, count, freq, reason)  \
+        (caller)->create_edge_including_clones((callee),        \
+                (old_call_stmt), (call_stmt), (count), (reason))
+#else
+#define cgraph_create_edge(caller, callee, call_stmt, count, freq) \
         (caller)->create_edge((callee), (call_stmt), (count), (freq))
-#define cgraph_create_edge_including_clones(caller, callee, old_call_stmt, call_stmt, count, freq, nest, reason) \
-        (caller)->create_edge_including_clones((callee), (old_call_stmt), (call_stmt), (count), (freq), (reason))
+
+#define cgraph_create_edge_including_clones(caller, callee,     \
+                old_call_stmt, call_stmt, count, freq, reason)  \
+        (caller)->create_edge_including_clones((callee),        \
+                (old_call_stmt), (call_stmt), (count), (freq), (reason))
+#endif
 
 typedef struct cgraph_node *cgraph_node_ptr;
 typedef struct cgraph_edge *cgraph_edge_p;
diff --git a/scripts/gcc-x86_64-has-stack-protector.sh b/scripts/gcc-x86_64-has-stack-protector.sh
index 3755af0cd9f7..75e4e22b986a 100755
--- a/scripts/gcc-x86_64-has-stack-protector.sh
+++ b/scripts/gcc-x86_64-has-stack-protector.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 # SPDX-License-Identifier: GPL-2.0
 
-echo "int foo(void) { char X[200]; return 3; }" | $* -S -x c -c -O0 -mcmodel=kernel -fno-PIE -fstack-protector - -o - 2> /dev/null | grep -q "%gs"
+echo "int foo(void) { char X[200]; return 3; }" | $* -S -x c -c -m64 -O0 -mcmodel=kernel -fno-PIE -fstack-protector - -o - 2> /dev/null | grep -q "%gs"
diff --git a/scripts/gen_initramfs_list.sh b/scripts/gen_initramfs_list.sh
deleted file mode 100755
index 10e528b3a08f..000000000000
--- a/scripts/gen_initramfs_list.sh
+++ /dev/null
@@ -1,328 +0,0 @@
-#!/bin/sh
-# Copyright (C) Martin Schlemmer <azarah@nosferatu.za.org>
-# Copyright (C) 2006 Sam Ravnborg <sam@ravnborg.org>
-#
-# Released under the terms of the GNU GPL
-#
-# Generate a cpio packed initramfs. It uses gen_init_cpio to generate
-# the cpio archive, and then compresses it.
-# The script may also be used to generate the inputfile used for gen_init_cpio
-# This script assumes that gen_init_cpio is located in usr/ directory
-
-# error out on errors
-set -e
-
-usage() {
-cat << EOF
-Usage:
-$0 [-o <file>] [-u <uid>] [-g <gid>] {-d | <cpio_source>} ...
-        -o <file>      Create compressed initramfs file named <file> using
-                       gen_init_cpio and compressor depending on the extension
-        -u <uid>       User ID to map to user ID 0 (root).
-                       <uid> is only meaningful if <cpio_source> is a
-                       directory.  "squash" forces all files to uid 0.
-        -g <gid>       Group ID to map to group ID 0 (root).
-                       <gid> is only meaningful if <cpio_source> is a
-                       directory.  "squash" forces all files to gid 0.
-        <cpio_source>  File list or directory for cpio archive.
-                       If <cpio_source> is a .cpio file it will be used
-                       as direct input to initramfs.
-        -d             Output the default cpio list.
-
-All options except -o and -l may be repeated and are interpreted
-sequentially and immediately.  -u and -g states are preserved across
-<cpio_source> options so an explicit "-u 0 -g 0" is required
-to reset the root/group mapping.
-EOF
-}
-
-# awk style field access
-# $1 - field number; rest is argument string
-field() {
-        shift $1 ; echo $1
-}
-
-list_default_initramfs() {
-        # echo usr/kinit/kinit
-        :
-}
-
-default_initramfs() {
-        cat <<-EOF >> ${output}
-                # This is a very simple, default initramfs
-
-                dir /dev 0755 0 0
-                nod /dev/console 0600 0 0 c 5 1
-                dir /root 0700 0 0
-                # file /kinit usr/kinit/kinit 0755 0 0
-                # slink /init kinit 0755 0 0
-        EOF
-}
-
-filetype() {
-        local argv1="$1"
-
-        # symlink test must come before file test
-        if [ -L "${argv1}" ]; then
-                echo "slink"
-        elif [ -f "${argv1}" ]; then
-                echo "file"
-        elif [ -d "${argv1}" ]; then
-                echo "dir"
-        elif [ -b "${argv1}" -o -c "${argv1}" ]; then
-                echo "nod"
-        elif [ -p "${argv1}" ]; then
-                echo "pipe"
-        elif [ -S "${argv1}" ]; then
-                echo "sock"
-        else
-                echo "invalid"
-        fi
-        return 0
-}
-
-list_print_mtime() {
-        :
-}
-
-print_mtime() {
-        local my_mtime="0"
-
-        if [ -e "$1" ]; then
-                my_mtime=$(find "$1" -printf "%T@\n" | sort -r | head -n 1)
-        fi
-
-        echo "# Last modified: ${my_mtime}" >> ${output}
-        echo "" >> ${output}
-}
-
-list_parse() {
-        if [ -L "$1" ]; then
-                return
-        fi
-        echo "$1" | sed 's/:/\\:/g; s/$/ \\/'
-}
-
-# for each file print a line in following format
-# <filetype> <name> <path to file> <octal mode> <uid> <gid>
-# for links, devices etc the format differs. See gen_init_cpio for details
-parse() {
-        local location="$1"
-        local name="/${location#${srcdir}}"
-        # change '//' into '/'
-        name=$(echo "$name" | sed -e 's://*:/:g')
-        local mode="$2"
-        local uid="$3"
-        local gid="$4"
-        local ftype=$(filetype "${location}")
-        # remap uid/gid to 0 if necessary
-        [ "$root_uid" = "squash" ] && uid=0 || [ "$uid" -eq "$root_uid" ] && uid=0
-        [ "$root_gid" = "squash" ] && gid=0 || [ "$gid" -eq "$root_gid" ] && gid=0
-        local str="${mode} ${uid} ${gid}"
-
-        [ "${ftype}" = "invalid" ] && return 0
-        [ "${location}" = "${srcdir}" ] && return 0
-
-        case "${ftype}" in
-                "file")
-                        str="${ftype} ${name} ${location} ${str}"
-                        ;;
-                "nod")
-                        local dev=`LC_ALL=C ls -l "${location}"`
-                        local maj=`field 5 ${dev}`
-                        local min=`field 6 ${dev}`
-                        maj=${maj%,}
-
-                        [ -b "${location}" ] && dev="b" || dev="c"
-
-                        str="${ftype} ${name} ${str} ${dev} ${maj} ${min}"
-                        ;;
-                "slink")
-                        local target=`readlink "${location}"`
-                        str="${ftype} ${name} ${target} ${str}"
-                        ;;
-                *)
-                        str="${ftype} ${name} ${str}"
-                        ;;
-        esac
-
-        echo "${str}" >> ${output}
-
-        return 0
-}
-
-unknown_option() {
-        printf "ERROR: unknown option \"$arg\"\n" >&2
-        printf "If the filename validly begins with '-', " >&2
-        printf "then it must be prefixed\n" >&2
-        printf "by './' so that it won't be interpreted as an option." >&2
-        printf "\n" >&2
-        usage >&2
-        exit 1
-}
-
-list_header() {
-        :
-}
-
-header() {
-        printf "\n#####################\n# $1\n" >> ${output}
-}
-
-# process one directory (incl sub-directories)
-dir_filelist() {
-        ${dep_list}header "$1"
-
-        srcdir=$(echo "$1" | sed -e 's://*:/:g')
-        dirlist=$(find "${srcdir}" -printf "%p %m %U %G\n" | sort)
-
-        # If $dirlist is only one line, then the directory is empty
-        if [  "$(echo "${dirlist}" | wc -l)" -gt 1 ]; then
-                ${dep_list}print_mtime "$1"
-
-                echo "${dirlist}" | \
-                while read x; do
-                        ${dep_list}parse ${x}
-                done
-        fi
-}
-
-# if only one file is specified and it is .cpio file then use it direct as fs
-# if a directory is specified then add all files in given direcotry to fs
-# if a regular file is specified assume it is in gen_initramfs format
-input_file() {
-        source="$1"
-        if [ -f "$1" ]; then
-                ${dep_list}header "$1"
-                is_cpio="$(echo "$1" | sed 's/^.*\.cpio\(\..*\)\{0,1\}/cpio/')"
-                if [ $2 -eq 0 -a ${is_cpio} = "cpio" ]; then
-                        cpio_file=$1
-                        echo "$1" | grep -q '^.*\.cpio\..*' && is_cpio_compressed="compressed"
-                        [ ! -z ${dep_list} ] && echo "$1"
-                        return 0
-                fi
-                if [ -z ${dep_list} ]; then
-                        print_mtime "$1" >> ${output}
-                        cat "$1"         >> ${output}
-                else
-                        echo "$1 \\"
-                        cat "$1" | while read type dir file perm ; do
-                                if [ "$type" = "file" ]; then
-                                        echo "$file \\";
-                                fi
-                        done
-                fi
-        elif [ -d "$1" ]; then
-                dir_filelist "$1"
-        else
-                echo "  ${prog}: Cannot open '$1'" >&2
-                exit 1
-        fi
-}
-
-prog=$0
-root_uid=0
-root_gid=0
-dep_list=
-cpio_file=
-cpio_list=
-output="/dev/stdout"
-output_file=""
-is_cpio_compressed=
-compr="gzip -n -9 -f"
-
-arg="$1"
-case "$arg" in
-        "-l")   # files included in initramfs - used by kbuild
-                dep_list="list_"
-                echo "deps_initramfs := $0 \\"
-                shift
-                ;;
-        "-o")   # generate compressed cpio image named $1
-                shift
-                output_file="$1"
-                cpio_list="$(mktemp ${TMPDIR:-/tmp}/cpiolist.XXXXXX)"
-                output=${cpio_list}
-                echo "$output_file" | grep -q "\.gz$" \
-                && [ -x "`which gzip 2> /dev/null`" ] \
-                && compr="gzip -n -9 -f"
-                echo "$output_file" | grep -q "\.bz2$" \
-                && [ -x "`which bzip2 2> /dev/null`" ] \
-                && compr="bzip2 -9 -f"
-                echo "$output_file" | grep -q "\.lzma$" \
-                && [ -x "`which lzma 2> /dev/null`" ] \
-                && compr="lzma -9 -f"
-                echo "$output_file" | grep -q "\.xz$" \
-                && [ -x "`which xz 2> /dev/null`" ] \
-                && compr="xz --check=crc32 --lzma2=dict=1MiB"
-                echo "$output_file" | grep -q "\.lzo$" \
-                && [ -x "`which lzop 2> /dev/null`" ] \
-                && compr="lzop -9 -f"
-                echo "$output_file" | grep -q "\.lz4$" \
-                && [ -x "`which lz4 2> /dev/null`" ] \
-                && compr="lz4 -l -9 -f"
-                echo "$output_file" | grep -q "\.cpio$" && compr="cat"
-                shift
-                ;;
-esac
-while [ $# -gt 0 ]; do
-        arg="$1"
-        shift
-        case "$arg" in
-                "-u")   # map $1 to uid=0 (root)
-                        root_uid="$1"
-                        [ "$root_uid" = "-1" ] && root_uid=$(id -u || echo 0)
-                        shift
-                        ;;
-                "-g")   # map $1 to gid=0 (root)
-                        root_gid="$1"
-                        [ "$root_gid" = "-1" ] && root_gid=$(id -g || echo 0)
-                        shift
-                        ;;
-                "-d")   # display default initramfs list
-                        default_list="$arg"
-                        ${dep_list}default_initramfs
-                        ;;
-                "-h")
-                        usage
-                        exit 0
-                        ;;
-                *)
-                        case "$arg" in
-                                "-"*)
-                                        unknown_option
-                                        ;;
-                                *)      # input file/dir - process it
-                                        input_file "$arg" "$#"
-                                        ;;
-                        esac
-                        ;;
-        esac
-done
-
-# If output_file is set we will generate cpio archive and compress it
-# we are careful to delete tmp files
-if [ ! -z ${output_file} ]; then
-        if [ -z ${cpio_file} ]; then
-                timestamp=
-                if test -n "$KBUILD_BUILD_TIMESTAMP"; then
-                        timestamp="$(date -d"$KBUILD_BUILD_TIMESTAMP" +%s || :)"
-                        if test -n "$timestamp"; then
-                                timestamp="-t $timestamp"
-                        fi
-                fi
-                cpio_tfile="$(mktemp ${TMPDIR:-/tmp}/cpiofile.XXXXXX)"
-                usr/gen_init_cpio $timestamp ${cpio_list} > ${cpio_tfile}
-        else
-                cpio_tfile=${cpio_file}
-        fi
-        rm ${cpio_list}
-        if [ "${is_cpio_compressed}" = "compressed" ]; then
-                cat ${cpio_tfile} > ${output_file}
-        else
-                (cat ${cpio_tfile} | ${compr}  - > ${output_file}) \
-                || (rm -f ${output_file} ; false)
-        fi
-        [ -z ${cpio_file} ] && rm ${cpio_tfile}
-fi
-exit 0
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index c87fa734e3e1..c1c088ef1420 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -48,6 +48,7 @@ my $output_roles = 0;
 my $output_rolestats = 1;
 my $output_section_maxlen = 50;
 my $scm = 0;
+my $tree = 1;
 my $web = 0;
 my $subsystem = 0;
 my $status = 0;
@@ -61,7 +62,7 @@ my $self_test = undef;
 my $version = 0;
 my $help = 0;
 my $find_maintainer_files = 0;
-
+my $maintainer_path;
 my $vcs_used = 0;
 
 my $exit = 0;
@@ -255,6 +256,7 @@ if (!GetOptions(
                 'subsystem!' => \$subsystem,
                 'status!' => \$status,
                 'scm!' => \$scm,
+                'tree!' => \$tree,
                 'web!' => \$web,
                 'letters=s' => \$letters,
                 'pattern-depth=i' => \$pattern_depth,
@@ -263,6 +265,7 @@ if (!GetOptions(
                 'fe|file-emails!' => \$file_emails,
                 'f|file' => \$from_filename,
                 'find-maintainer-files' => \$find_maintainer_files,
+                'mpath|maintainer-path=s' => \$maintainer_path,
                 'self-test:s' => \$self_test,
                 'v|version' => \$version,
                 'h|help|usage' => \$help,
@@ -319,7 +322,7 @@ if ($email &&
     die "$P: Please select at least 1 email option\n";
 }
 
-if (!top_of_kernel_tree($lk_path)) {
+if ($tree && !top_of_kernel_tree($lk_path)) {
     die "$P: The current directory does not appear to be "
         . "a linux kernel source tree.\n";
 }
@@ -384,26 +387,36 @@ sub find_ignore_git {
 read_all_maintainer_files();
 
 sub read_all_maintainer_files {
-    if (-d "${lk_path}MAINTAINERS") {
-        opendir(DIR, "${lk_path}MAINTAINERS") or die $!;
-        my @files = readdir(DIR);
-        closedir(DIR);
-        foreach my $file (@files) {
-            push(@mfiles, "${lk_path}MAINTAINERS/$file") if ($file !~ /^\./);
-        }
-    }
-
-    if ($find_maintainer_files) {
-        find( { wanted => \&find_is_maintainer_file,
-                preprocess => \&find_ignore_git,
-                no_chdir => 1,
-        }, "${lk_path}");
+    my $path = "${lk_path}MAINTAINERS";
+    if (defined $maintainer_path) {
+        $path = $maintainer_path;
+        # Perl Cookbook tilde expansion if necessary
+        $path =~ s@^~([^/]*)@ $1 ? (getpwnam($1))[7] : ( $ENV{HOME} || $ENV{LOGDIR} || (getpwuid($<))[7])@ex;
+    }
+
+    if (-d $path) {
+        $path .= '/' if ($path !~ m@/$@);
+        if ($find_maintainer_files) {
+            find( { wanted => \&find_is_maintainer_file,
+                    preprocess => \&find_ignore_git,
+                    no_chdir => 1,
+                }, "$path");
+        } else {
+            opendir(DIR, "$path") or die $!;
+            my @files = readdir(DIR);
+            closedir(DIR);
+            foreach my $file (@files) {
+                push(@mfiles, "$path$file") if ($file !~ /^\./);
+            }
+        }
+    } elsif (-f "$path") {
+        push(@mfiles, "$path");
     } else {
-        push(@mfiles, "${lk_path}MAINTAINERS") if -f "${lk_path}MAINTAINERS";
+        die "$P: MAINTAINER file not found '$path'\n";
     }
-
+    die "$P: No MAINTAINER files found in '$path'\n" if (scalar(@mfiles) == 0);
     foreach my $file (@mfiles) {
-        read_maintainer_file("$file");
+        read_maintainer_file("$file");
     }
 }
 
@@ -1031,13 +1044,14 @@ Other options:
   --sections => print all of the subsystem sections with pattern matches
   --letters => print all matching 'letter' types from all matching sections
   --mailmap => use .mailmap file (default: $email_use_mailmap)
+  --no-tree => run without a kernel tree
   --self-test => show potential issues with MAINTAINERS file content
   --version => show version
   --help => show this help information
 
 Default options:
-  [--email --nogit --git-fallback --m --r --n --l --multiline --pattern-depth=0
-   --remove-duplicates --rolestats]
+  [--email --tree --nogit --git-fallback --m --r --n --l --multiline
+   --pattern-depth=0 --remove-duplicates --rolestats]
 
 Notes:
   Using "-f directory" may give unexpected results:
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index a3ac2c91331c..4a7bd2192073 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -3,8 +3,8 @@
 # Kernel configuration targets
 # These targets are used from top-level makefile
 
-PHONY += xconfig gconfig menuconfig config syncconfig \
-        localmodconfig localyesconfig
+PHONY += xconfig gconfig menuconfig config localmodconfig localyesconfig \
+        build_menuconfig build_nconfig build_gconfig build_xconfig
 
 ifdef KBUILD_KCONFIG
 Kconfig := $(KBUILD_KCONFIG)
@@ -34,14 +34,15 @@ config: $(obj)/conf
 nconfig: $(obj)/nconf
         $< $(silent) $(Kconfig)
 
-# This has become an internal implementation detail and is now deprecated
-# for external use.
-syncconfig: $(obj)/conf
-        $(Q)mkdir -p include/config include/generated
-        $< $(silent) --$@ $(Kconfig)
+build_menuconfig: $(obj)/mconf
+
+build_nconfig: $(obj)/nconf
+
+build_gconfig: $(obj)/gconf
+
+build_xconfig: $(obj)/qconf
 
 localyesconfig localmodconfig: $(obj)/conf
-        $(Q)mkdir -p include/config include/generated
         $(Q)perl $(srctree)/$(src)/streamline_config.pl --$@ $(srctree) $(Kconfig) > .tmp.config
         $(Q)if [ -f .config ]; then                                     \
                         cmp -s .tmp.config .config ||                   \
@@ -56,8 +57,12 @@ localyesconfig localmodconfig: $(obj)/conf
         $(Q)rm -f .tmp.config
 
 # These targets map 1:1 to the commandline options of 'conf'
+#
+# Note:
+#  syncconfig has become an internal implementation detail and is now
+#  deprecated for external use
 simple-targets := oldconfig allnoconfig allyesconfig allmodconfig \
-        alldefconfig randconfig listnewconfig olddefconfig
+        alldefconfig randconfig listnewconfig olddefconfig syncconfig
 PHONY += $(simple-targets)
 
 $(simple-targets): $(obj)/conf
@@ -169,29 +174,30 @@ HOSTCFLAGS_zconf.tab.o	:= -I$(src)
 hostprogs-y     += nconf
 nconf-objs      := nconf.o zconf.tab.o nconf.gui.o
 
-HOSTLOADLIBES_nconf     = $(shell . $(obj)/.nconf-cfg && echo $$libs)
+HOSTLDLIBS_nconf        = $(shell . $(obj)/.nconf-cfg && echo $$libs)
 HOSTCFLAGS_nconf.o      = $(shell . $(obj)/.nconf-cfg && echo $$cflags)
 HOSTCFLAGS_nconf.gui.o  = $(shell . $(obj)/.nconf-cfg && echo $$cflags)
 
-$(obj)/nconf.o: $(obj)/.nconf-cfg
+$(obj)/nconf.o $(obj)/nconf.gui.o: $(obj)/.nconf-cfg
 
 # mconf: Used for the menuconfig target based on lxdialog
 hostprogs-y     += mconf
 lxdialog        := checklist.o inputbox.o menubox.o textbox.o util.o yesno.o
 mconf-objs      := mconf.o zconf.tab.o $(addprefix lxdialog/, $(lxdialog))
 
-HOSTLOADLIBES_mconf = $(shell . $(obj)/.mconf-cfg && echo $$libs)
+HOSTLDLIBS_mconf = $(shell . $(obj)/.mconf-cfg && echo $$libs)
 $(foreach f, mconf.o $(lxdialog), \
   $(eval HOSTCFLAGS_$f = $$(shell . $(obj)/.mconf-cfg && echo $$$$cflags)))
 
-$(addprefix $(obj)/, mconf.o $(lxdialog)): $(obj)/.mconf-cfg
+$(obj)/mconf.o: $(obj)/.mconf-cfg
+$(addprefix $(obj)/lxdialog/, $(lxdialog)): $(obj)/.mconf-cfg
 
 # qconf: Used for the xconfig target based on Qt
 hostprogs-y     += qconf
 qconf-cxxobjs   := qconf.o
 qconf-objs      := zconf.tab.o
 
-HOSTLOADLIBES_qconf     = $(shell . $(obj)/.qconf-cfg && echo $$libs)
+HOSTLDLIBS_qconf        = $(shell . $(obj)/.qconf-cfg && echo $$libs)
 HOSTCXXFLAGS_qconf.o    = $(shell . $(obj)/.qconf-cfg && echo $$cflags)
 
 $(obj)/qconf.o: $(obj)/.qconf-cfg $(obj)/qconf.moc
@@ -206,7 +212,7 @@ $(obj)/%.moc: $(src)/%.h $(obj)/.qconf-cfg
 hostprogs-y     += gconf
 gconf-objs      := gconf.o zconf.tab.o
 
-HOSTLOADLIBES_gconf = $(shell . $(obj)/.gconf-cfg && echo $$libs)
+HOSTLDLIBS_gconf    = $(shell . $(obj)/.gconf-cfg && echo $$libs)
 HOSTCFLAGS_gconf.o  = $(shell . $(obj)/.gconf-cfg && echo $$cflags)
 
 $(obj)/gconf.o: $(obj)/.gconf-cfg
@@ -215,6 +221,7 @@ $(obj)/zconf.tab.o: $(obj)/zconf.lex.c
 
 # check if necessary packages are available, and configure build flags
 define filechk_conf_cfg
+        $(CONFIG_SHELL) $(srctree)/scripts/kconfig/check-pkgconfig.sh; \
         $(CONFIG_SHELL) $<
 endef
 
diff --git a/scripts/kconfig/check-pkgconfig.sh b/scripts/kconfig/check-pkgconfig.sh
new file mode 100644
index 000000000000..7a1c40bfb58c
--- /dev/null
+++ b/scripts/kconfig/check-pkgconfig.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+# Check for pkg-config presence
+
+if [ -z $(command -v pkg-config) ]; then
+        echo "'make *config' requires 'pkg-config'. Please install it." 1>&2
+        exit 1
+fi
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 671ff5364497..7b2b37260669 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -496,6 +496,7 @@ int main(int ac, char **av)
         int opt;
         const char *name, *defconfig_file = NULL /* gcc uninit */;
         struct stat tmpstat;
+        int no_conf_write = 0;
 
         tty_stdio = isatty(0) && isatty(1);
 
@@ -507,6 +508,11 @@ int main(int ac, char **av)
                 input_mode = (enum input_mode)opt;
                 switch (opt) {
                 case syncconfig:
+                        /*
+                         * syncconfig is invoked during the build stage.
+                         * Suppress distracting "configuration written to ..."
+                         */
+                        conf_set_message_callback(NULL);
                         sync_kconfig = 1;
                         break;
                 case defconfig:
@@ -633,13 +639,14 @@ int main(int ac, char **av)
         }
 
         if (sync_kconfig) {
-                if (conf_get_changed()) {
-                        name = getenv("KCONFIG_NOSILENTUPDATE");
-                        if (name && *name) {
+                name = getenv("KCONFIG_NOSILENTUPDATE");
+                if (name && *name) {
+                        if (conf_get_changed()) {
                                 fprintf(stderr,
                                         "\n*** The configuration requires explicit update.\n\n");
                                 return 1;
                         }
+                        no_conf_write = 1;
                 }
         }
 
@@ -684,29 +691,32 @@ int main(int ac, char **av)
                 break;
         }
 
-        if (sync_kconfig) {
-                /* syncconfig is used during the build so we shall update autoconf.
-                 * All other commands are only used to generate a config.
-                 */
-                if (conf_get_changed() && conf_write(NULL)) {
-                        fprintf(stderr, "\n*** Error during writing of the configuration.\n\n");
-                        exit(1);
-                }
-                if (conf_write_autoconf()) {
-                        fprintf(stderr, "\n*** Error during update of the configuration.\n\n");
-                        return 1;
-                }
-        } else if (input_mode == savedefconfig) {
+        if (input_mode == savedefconfig) {
                 if (conf_write_defconfig(defconfig_file)) {
                         fprintf(stderr, "n*** Error while saving defconfig to: %s\n\n",
                                 defconfig_file);
                         return 1;
                 }
         } else if (input_mode != listnewconfig) {
-                if (conf_write(NULL)) {
+                if (!no_conf_write && conf_write(NULL)) {
                         fprintf(stderr, "\n*** Error during writing of the configuration.\n\n");
                         exit(1);
                 }
+
+                /*
+                 * Create auto.conf if it does not exist.
+                 * This prevents GNU Make 4.1 or older from emitting
+                 * "include/config/auto.conf: No such file or directory"
+                 * in the top-level Makefile
+                 *
+                 * syncconfig always creates or updates auto.conf because it is
+                 * used during the build.
+                 */
+                if (conf_write_autoconf(sync_kconfig) && sync_kconfig) {
+                        fprintf(stderr,
+                                "\n*** Error during sync of the configuration.\n\n");
+                        return 1;
+                }
         }
         return 0;
 }
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 39e20974f4a3..91d0a5c014ac 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -16,6 +16,64 @@
 
 #include "lkc.h"
 
+/* return true if 'path' exists, false otherwise */
+static bool is_present(const char *path)
+{
+        struct stat st;
+
+        return !stat(path, &st);
+}
+
+/* return true if 'path' exists and it is a directory, false otherwise */
+static bool is_dir(const char *path)
+{
+        struct stat st;
+
+        if (stat(path, &st))
+                return 0;
+
+        return S_ISDIR(st.st_mode);
+}
+
+/*
+ * Create the parent directory of the given path.
+ *
+ * For example, if 'include/config/auto.conf' is given, create 'include/config'.
+ */
+static int make_parent_dir(const char *path)
+{
+        char tmp[PATH_MAX + 1];
+        char *p;
+
+        strncpy(tmp, path, sizeof(tmp));
+        tmp[sizeof(tmp) - 1] = 0;
+
+        /* Remove the base name. Just return if nothing is left */
+        p = strrchr(tmp, '/');
+        if (!p)
+                return 0;
+        *(p + 1) = 0;
+
+        /* Just in case it is an absolute path */
+        p = tmp;
+        while (*p == '/')
+                p++;
+
+        while ((p = strchr(p, '/'))) {
+                *p = 0;
+
+                /* skip if the directory exists */
+                if (!is_dir(tmp) && mkdir(tmp, 0755))
+                        return -1;
+
+                *p = '/';
+                while (*p == '/')
+                        p++;
+        }
+
+        return 0;
+}
+
 struct conf_printer {
         void (*print_symbol)(FILE *, struct symbol *, const char *, void *);
         void (*print_comment)(FILE *, const char *, void *);
@@ -43,16 +101,16 @@ static void conf_warning(const char *fmt, ...)
         conf_warnings++;
 }
 
-static void conf_default_message_callback(const char *fmt, va_list ap)
+static void conf_default_message_callback(const char *s)
 {
         printf("#\n# ");
-        vprintf(fmt, ap);
+        printf("%s", s);
         printf("\n#\n");
 }
 
-static void (*conf_message_callback) (const char *fmt, va_list ap) =
+static void (*conf_message_callback)(const char *s) =
         conf_default_message_callback;
-void conf_set_message_callback(void (*fn) (const char *fmt, va_list ap))
+void conf_set_message_callback(void (*fn)(const char *s))
 {
         conf_message_callback = fn;
 }
@@ -60,10 +118,15 @@ void conf_set_message_callback(void (*fn) (const char *fmt, va_list ap))
 static void conf_message(const char *fmt, ...)
 {
         va_list ap;
+        char buf[4096];
+
+        if (!conf_message_callback)
+                return;
 
         va_start(ap, fmt);
-        if (conf_message_callback)
-                conf_message_callback(fmt, ap);
+
+        vsnprintf(buf, sizeof(buf), fmt, ap);
+        conf_message_callback(buf);
         va_end(ap);
 }
 
@@ -83,7 +146,6 @@ const char *conf_get_autoconfig_name(void)
 
 char *conf_get_default_confname(void)
 {
-        struct stat buf;
         static char fullname[PATH_MAX+1];
         char *env, *name;
 
@@ -91,7 +153,7 @@ char *conf_get_default_confname(void)
         env = getenv(SRCTREE);
         if (env) {
                 sprintf(fullname, "%s/%s", env, name);
-                if (!stat(fullname, &buf))
+                if (is_present(fullname))
                         return fullname;
         }
         return name;
@@ -397,7 +459,7 @@ int conf_read(const char *name)
 
         for_all_symbols(i, sym) {
                 sym_calc_value(sym);
-                if (sym_is_choice(sym) || (sym->flags & SYMBOL_AUTO))
+                if (sym_is_choice(sym) || (sym->flags & SYMBOL_NO_WRITE))
                         continue;
                 if (sym_has_value(sym) && (sym->flags & SYMBOL_WRITE)) {
                         /* check that calculated value agrees with saved value */
@@ -725,10 +787,9 @@ int conf_write(const char *name)
 
         dirname[0] = 0;
         if (name && name[0]) {
-                struct stat st;
                 char *slash;
 
-                if (!stat(name, &st) && S_ISDIR(st.st_mode)) {
+                if (is_dir(name)) {
                         strcpy(dirname, name);
                         strcat(dirname, "/");
                         basename = conf_get_configname();
@@ -813,26 +874,59 @@ next:
         return 0;
 }
 
+/* write a dependency file as used by kbuild to track dependencies */
+static int conf_write_dep(const char *name)
+{
+        struct file *file;
+        FILE *out;
+
+        if (!name)
+                name = ".kconfig.d";
+        out = fopen("..config.tmp", "w");
+        if (!out)
+                return 1;
+        fprintf(out, "deps_config := \\\n");
+        for (file = file_list; file; file = file->next) {
+                if (file->next)
+                        fprintf(out, "\t%s \\\n", file->name);
+                else
+                        fprintf(out, "\t%s\n", file->name);
+        }
+        fprintf(out, "\n%s: \\\n"
+                     "\t$(deps_config)\n\n", conf_get_autoconfig_name());
+
+        env_write_dep(out, conf_get_autoconfig_name());
+
+        fprintf(out, "\n$(deps_config): ;\n");
+        fclose(out);
+
+        if (make_parent_dir(name))
+                return 1;
+        rename("..config.tmp", name);
+        return 0;
+}
+
 static int conf_split_config(void)
 {
         const char *name;
         char path[PATH_MAX+1];
         char *s, *d, c;
         struct symbol *sym;
-        struct stat sb;
         int res, i, fd;
 
         name = conf_get_autoconfig_name();
         conf_read_simple(name, S_DEF_AUTO);
         sym_calc_value(modules_sym);
 
+        if (make_parent_dir("include/config/foo.h"))
+                return 1;
         if (chdir("include/config"))
                 return 1;
 
         res = 0;
         for_all_symbols(i, sym) {
                 sym_calc_value(sym);
-                if ((sym->flags & SYMBOL_AUTO) || !sym->name)
+                if ((sym->flags & SYMBOL_NO_WRITE) || !sym->name)
                         continue;
                 if (sym->flags & SYMBOL_WRITE) {
                         if (sym->flags & SYMBOL_DEF_AUTO) {
@@ -897,19 +991,12 @@ static int conf_split_config(void)
                                 res = 1;
                                 break;
                         }
-                        /*
-                         * Create directory components,
-                         * unless they exist already.
-                         */
-                        d = path;
-                        while ((d = strchr(d, '/'))) {
-                                *d = 0;
-                                if (stat(path, &sb) && mkdir(path, 0755)) {
-                                        res = 1;
-                                        goto out;
-                                }
-                                *d++ = '/';
+
+                        if (make_parent_dir(path)) {
+                                res = 1;
+                                goto out;
                         }
+
                         /* Try it again. */
                         fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0644);
                         if (fd == -1) {
@@ -926,16 +1013,20 @@ out:
         return res;
 }
 
-int conf_write_autoconf(void)
+int conf_write_autoconf(int overwrite)
 {
         struct symbol *sym;
         const char *name;
+        const char *autoconf_name = conf_get_autoconfig_name();
         FILE *out, *tristate, *out_h;
         int i;
 
+        if (!overwrite && is_present(autoconf_name))
+                return 0;
+
         sym_clear_all_valid();
 
-        file_write_dep("include/config/auto.conf.cmd");
+        conf_write_dep("include/config/auto.conf.cmd");
 
         if (conf_split_config())
                 return 1;
@@ -982,19 +1073,26 @@ int conf_write_autoconf(void)
         name = getenv("KCONFIG_AUTOHEADER");
         if (!name)
                 name = "include/generated/autoconf.h";
+        if (make_parent_dir(name))
+                return 1;
         if (rename(".tmpconfig.h", name))
                 return 1;
+
         name = getenv("KCONFIG_TRISTATE");
         if (!name)
                 name = "include/config/tristate.conf";
+        if (make_parent_dir(name))
+                return 1;
         if (rename(".tmpconfig_tristate", name))
                 return 1;
-        name = conf_get_autoconfig_name();
+
+        if (make_parent_dir(autoconf_name))
+                return 1;
         /*
          * This must be the last step, kbuild has a dependency on auto.conf
          * and this marks the successful completion of the previous steps.
          */
-        if (rename(".tmpconfig", name))
+        if (rename(".tmpconfig", autoconf_name))
                 return 1;
 
         return 0;
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index 94a383b21df6..7c329e179007 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -141,7 +141,7 @@ struct symbol {
 #define SYMBOL_OPTIONAL   0x0100  /* choice is optional - values can be 'n' */
 #define SYMBOL_WRITE      0x0200  /* write symbol to file (KCONFIG_CONFIG) */
 #define SYMBOL_CHANGED    0x0400  /* ? */
-#define SYMBOL_AUTO       0x1000  /* value from environment variable */
+#define SYMBOL_NO_WRITE   0x1000  /* Symbol for internal use only; it will not be written */
 #define SYMBOL_CHECKED    0x2000  /* used during dependency checking */
 #define SYMBOL_WARNED     0x8000  /* warning has been issued */
 
@@ -171,6 +171,9 @@ struct symbol {
  * config BAZ
  *         int "BAZ Value"
  *         range 1..255
+ *
+ * Please, also check zconf.y:print_symbol() when modifying the
+ * list of property types!
  */
 enum prop_type {
         P_UNKNOWN,
@@ -182,7 +185,6 @@ enum prop_type {
         P_SELECT,   /* select BAR */
         P_IMPLY,    /* imply BAR */
         P_RANGE,    /* range 7..100 (for a symbol) */
-        P_ENV,      /* value from environment variable */
         P_SYMBOL,   /* where a symbol is defined */
 };
 
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
index 610c4ab54d76..36f578415c4a 100644
--- a/scripts/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -101,8 +101,8 @@ const char *dbg_sym_flags(int val)
                 strcat(buf, "write/");
         if (val & SYMBOL_CHANGED)
                 strcat(buf, "changed/");
-        if (val & SYMBOL_AUTO)
-                strcat(buf, "auto/");
+        if (val & SYMBOL_NO_WRITE)
+                strcat(buf, "no_write/");
 
         buf[strlen(buf) - 1] = '\0';
 
@@ -525,6 +525,7 @@ void on_save_activate(GtkMenuItem * menuitem, gpointer user_data)
 {
         if (conf_write(NULL))
                 text_insert_msg("Error", "Unable to save configuration !");
+        conf_write_autoconf(0);
 }
 
 
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
index ed3ff88e60ba..9eb7c837cd8f 100644
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -97,7 +97,6 @@ void menu_set_type(int type);
 
 /* util.c */
 struct file *file_lookup(const char *name);
-int file_write_dep(const char *name);
 void *xmalloc(size_t size);
 void *xcalloc(size_t nmemb, size_t size);
 void *xrealloc(void *p, size_t size);
@@ -126,7 +125,6 @@ const char *sym_get_string_default(struct symbol *sym);
 struct symbol *sym_check_deps(struct symbol *sym);
 struct property *prop_alloc(enum prop_type type, struct symbol *sym);
 struct symbol *prop_get_symbol(struct property *prop);
-struct property *sym_get_env_prop(struct symbol *sym);
 
 static inline tristate sym_get_tristate_value(struct symbol *sym)
 {
diff --git a/scripts/kconfig/lkc_proto.h b/scripts/kconfig/lkc_proto.h
index a8b7a330587e..86c267540ccc 100644
--- a/scripts/kconfig/lkc_proto.h
+++ b/scripts/kconfig/lkc_proto.h
@@ -7,10 +7,10 @@ int conf_read(const char *name);
 int conf_read_simple(const char *name, int);
 int conf_write_defconfig(const char *name);
 int conf_write(const char *name);
-int conf_write_autoconf(void);
+int conf_write_autoconf(int overwrite);
 bool conf_get_changed(void);
 void conf_set_changed_callback(void (*fn)(void));
-void conf_set_message_callback(void (*fn)(const char *fmt, va_list ap));
+void conf_set_message_callback(void (*fn)(const char *s));
 
 /* menu.c */
 extern struct menu rootmenu;
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 5294ed159b98..83b5836615fb 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -772,16 +772,13 @@ static void show_helptext(const char *title, const char *text)
         show_textbox(title, text, 0, 0);
 }
 
-static void conf_message_callback(const char *fmt, va_list ap)
+static void conf_message_callback(const char *s)
 {
-        char buf[PATH_MAX+1];
-
-        vsnprintf(buf, sizeof(buf), fmt, ap);
         if (save_and_exit) {
                 if (!silent)
-                        printf("%s", buf);
+                        printf("%s", s);
         } else {
-                show_textbox(NULL, buf, 6, 60);
+                show_textbox(NULL, s, 6, 60);
         }
 }
 
@@ -977,6 +974,7 @@ static int handle_exit(void)
                                           "\n\n");
                         return 1;
                 }
+                conf_write_autoconf(0);
                 /* fall through */
         case -1:
                 if (!silent)
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 379a119dcd1e..4cf15d449c05 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -212,7 +212,7 @@ void menu_add_option(int token, char *arg)
                         sym_defconfig_list = current_entry->sym;
                 else if (sym_defconfig_list != current_entry->sym)
                         zconf_error("trying to redefine defconfig symbol");
-                sym_defconfig_list->flags |= SYMBOL_AUTO;
+                sym_defconfig_list->flags |= SYMBOL_NO_WRITE;
                 break;
         case T_OPT_ALLNOCONFIG_Y:
                 current_entry->sym->flags |= SYMBOL_ALLNOCONFIG_Y;
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
index 97b78445584b..1ef232ae5ab9 100644
--- a/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
@@ -674,6 +674,7 @@ static int do_exit(void)
                                   "Your configuration changes were NOT saved.",
                                   1,
                                   "<OK>");
+                conf_write_autoconf(0);
                 break;
         default:
                 btn_dialog(
@@ -1210,12 +1211,9 @@ static void conf(struct menu *menu)
         }
 }
 
-static void conf_message_callback(const char *fmt, va_list ap)
+static void conf_message_callback(const char *s)
 {
-        char buf[1024];
-
-        vsnprintf(buf, sizeof(buf), fmt, ap);
-        btn_dialog(main_window, buf, 1, "<OK>");
+        btn_dialog(main_window, s, 1, "<OK>");
 }
 
 static void show_help(struct menu *menu)
diff --git a/scripts/kconfig/preprocess.c b/scripts/kconfig/preprocess.c
index 65da87fce907..5ca2df790d3c 100644
--- a/scripts/kconfig/preprocess.c
+++ b/scripts/kconfig/preprocess.c
@@ -156,7 +156,7 @@ static char *do_shell(int argc, char *argv[])
                 nread--;
 
         /* remove trailing new lines */
-        while (buf[nread - 1] == '\n')
+        while (nread > 0 && buf[nread - 1] == '\n')
                 nread--;
 
         buf[nread] = 0;
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index ad9c22dd04f5..ef4310f2558b 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -1149,7 +1149,6 @@ QString ConfigInfoView::debug_info(struct symbol *sym)
                 case P_DEFAULT:
                 case P_SELECT:
                 case P_RANGE:
-                case P_ENV:
                         debug += prop_get_type_name(prop->type);
                         debug += ": ";
                         expr_print(prop->expr, expr_print_help, &debug, E_NONE);
@@ -1535,6 +1534,8 @@ bool ConfigMainWindow::saveConfig(void)
                 QMessageBox::information(this, "qconf", "Unable to save configuration!");
                 return false;
         }
+        conf_write_autoconf(0);
+
         return true;
 }
 
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 7c9a88e91cfa..703b9b899ee9 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -76,15 +76,6 @@ struct property *sym_get_choice_prop(struct symbol *sym)
         return NULL;
 }
 
-struct property *sym_get_env_prop(struct symbol *sym)
-{
-        struct property *prop;
-
-        for_all_properties(sym, prop, P_ENV)
-                return prop;
-        return NULL;
-}
-
 static struct property *sym_get_default_prop(struct symbol *sym)
 {
         struct property *prop;
@@ -463,7 +454,7 @@ void sym_calc_value(struct symbol *sym)
                 }
         }
 
-        if (sym->flags & SYMBOL_AUTO)
+        if (sym->flags & SYMBOL_NO_WRITE)
                 sym->flags &= ~SYMBOL_WRITE;
 
         if (sym->flags & SYMBOL_NEED_SET_CHOICE_VALUES)
@@ -1020,7 +1011,7 @@ static struct dep_stack {
         struct dep_stack *prev, *next;
         struct symbol *sym;
         struct property *prop;
-        struct expr *expr;
+        struct expr **expr;
 } *check_top;
 
 static void dep_stack_insert(struct dep_stack *stack, struct symbol *sym)
@@ -1085,31 +1076,42 @@ static void sym_check_print_recursive(struct symbol *last_sym)
                         fprintf(stderr, "%s:%d:error: recursive dependency detected!\n",
                                 prop->file->name, prop->lineno);
 
-                if (stack->expr) {
-                        fprintf(stderr, "%s:%d:\tsymbol %s %s value contains %s\n",
-                                prop->file->name, prop->lineno,
+                if (sym_is_choice(sym)) {
+                        fprintf(stderr, "%s:%d:\tchoice %s contains symbol %s\n",
+                                menu->file->name, menu->lineno,
+                                sym->name ? sym->name : "<choice>",
+                                next_sym->name ? next_sym->name : "<choice>");
+                } else if (sym_is_choice_value(sym)) {
+                        fprintf(stderr, "%s:%d:\tsymbol %s is part of choice %s\n",
+                                menu->file->name, menu->lineno,
                                 sym->name ? sym->name : "<choice>",
-                                prop_get_type_name(prop->type),
                                 next_sym->name ? next_sym->name : "<choice>");
-                } else if (stack->prop) {
+                } else if (stack->expr == &sym->dir_dep.expr) {
                         fprintf(stderr, "%s:%d:\tsymbol %s depends on %s\n",
                                 prop->file->name, prop->lineno,
                                 sym->name ? sym->name : "<choice>",
                                 next_sym->name ? next_sym->name : "<choice>");
-                } else if (sym_is_choice(sym)) {
-                        fprintf(stderr, "%s:%d:\tchoice %s contains symbol %s\n",
-                                menu->file->name, menu->lineno,
+                } else if (stack->expr == &sym->rev_dep.expr) {
+                        fprintf(stderr, "%s:%d:\tsymbol %s is selected by %s\n",
+                                prop->file->name, prop->lineno,
                                 sym->name ? sym->name : "<choice>",
                                 next_sym->name ? next_sym->name : "<choice>");
-                } else if (sym_is_choice_value(sym)) {
-                        fprintf(stderr, "%s:%d:\tsymbol %s is part of choice %s\n",
-                                menu->file->name, menu->lineno,
+                } else if (stack->expr == &sym->implied.expr) {
+                        fprintf(stderr, "%s:%d:\tsymbol %s is implied by %s\n",
+                                prop->file->name, prop->lineno,
                                 sym->name ? sym->name : "<choice>",
                                 next_sym->name ? next_sym->name : "<choice>");
+                } else if (stack->expr) {
+                        fprintf(stderr, "%s:%d:\tsymbol %s %s value contains %s\n",
+                                prop->file->name, prop->lineno,
+                                sym->name ? sym->name : "<choice>",
+                                prop_get_type_name(prop->type),
+                                next_sym->name ? next_sym->name : "<choice>");
                 } else {
-                        fprintf(stderr, "%s:%d:\tsymbol %s is selected by %s\n",
+                        fprintf(stderr, "%s:%d:\tsymbol %s %s is visible depending on %s\n",
                                 prop->file->name, prop->lineno,
                                 sym->name ? sym->name : "<choice>",
+                                prop_get_type_name(prop->type),
                                 next_sym->name ? next_sym->name : "<choice>");
                 }
         }
@@ -1166,12 +1168,26 @@ static struct symbol *sym_check_sym_deps(struct symbol *sym)
 
         dep_stack_insert(&stack, sym);
 
+        stack.expr = &sym->dir_dep.expr;
+        sym2 = sym_check_expr_deps(sym->dir_dep.expr);
+        if (sym2)
+                goto out;
+
+        stack.expr = &sym->rev_dep.expr;
         sym2 = sym_check_expr_deps(sym->rev_dep.expr);
         if (sym2)
                 goto out;
 
+        stack.expr = &sym->implied.expr;
+        sym2 = sym_check_expr_deps(sym->implied.expr);
+        if (sym2)
+                goto out;
+
+        stack.expr = NULL;
+
         for (prop = sym->prop; prop; prop = prop->next) {
-                if (prop->type == P_CHOICE || prop->type == P_SELECT)
+                if (prop->type == P_CHOICE || prop->type == P_SELECT ||
+                    prop->type == P_IMPLY)
                         continue;
                 stack.prop = prop;
                 sym2 = sym_check_expr_deps(prop->visible.expr);
@@ -1179,7 +1195,7 @@ static struct symbol *sym_check_sym_deps(struct symbol *sym)
                         break;
                 if (prop->type != P_DEFAULT || sym_is_choice(sym))
                         continue;
-                stack.expr = prop->expr;
+                stack.expr = &prop->expr;
                 sym2 = sym_check_expr_deps(prop->expr);
                 if (sym2)
                         break;
@@ -1257,9 +1273,6 @@ struct symbol *sym_check_deps(struct symbol *sym)
                 sym->flags &= ~SYMBOL_CHECK;
         }
 
-        if (sym2 && sym2 == sym)
-                sym2 = NULL;
-
         return sym2;
 }
 
@@ -1298,8 +1311,6 @@ const char *prop_get_type_name(enum prop_type type)
         switch (type) {
         case P_PROMPT:
                 return "prompt";
-        case P_ENV:
-                return "env";
         case P_COMMENT:
                 return "comment";
         case P_MENU:
diff --git a/scripts/kconfig/tests/warn_recursive_dep/Kconfig b/scripts/kconfig/tests/err_recursive_dep/Kconfig
index a65bfcb7137e..ebdb3ffd8717 100644
--- a/scripts/kconfig/tests/warn_recursive_dep/Kconfig
+++ b/scripts/kconfig/tests/err_recursive_dep/Kconfig
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+
 # depends on itself
 
 config A
@@ -31,7 +33,6 @@ config D2
         bool
 
 # depends on and imply
-# This is not recursive dependency
 
 config E1
         bool "E1"
diff --git a/scripts/kconfig/tests/err_recursive_dep/__init__.py b/scripts/kconfig/tests/err_recursive_dep/__init__.py
new file mode 100644
index 000000000000..5f3821b43ce6
--- /dev/null
+++ b/scripts/kconfig/tests/err_recursive_dep/__init__.py
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0
+"""
+Detect recursive dependency error.
+
+Recursive dependency should be treated as an error.
+"""
+
+def test(conf):
+    assert conf.oldaskconfig() == 1
+    assert conf.stderr_contains('expected_stderr')
diff --git a/scripts/kconfig/tests/err_recursive_dep/expected_stderr b/scripts/kconfig/tests/err_recursive_dep/expected_stderr
new file mode 100644
index 000000000000..84679b104655
--- /dev/null
+++ b/scripts/kconfig/tests/err_recursive_dep/expected_stderr
@@ -0,0 +1,38 @@
+Kconfig:11:error: recursive dependency detected!
+Kconfig:11:     symbol B is selected by B
+For a resolution refer to Documentation/kbuild/kconfig-language.txt
+subsection "Kconfig recursive dependency limitations"
+
+Kconfig:5:error: recursive dependency detected!
+Kconfig:5:      symbol A depends on A
+For a resolution refer to Documentation/kbuild/kconfig-language.txt
+subsection "Kconfig recursive dependency limitations"
+
+Kconfig:17:error: recursive dependency detected!
+Kconfig:17:     symbol C1 depends on C2
+Kconfig:21:     symbol C2 depends on C1
+For a resolution refer to Documentation/kbuild/kconfig-language.txt
+subsection "Kconfig recursive dependency limitations"
+
+Kconfig:32:error: recursive dependency detected!
+Kconfig:32:     symbol D2 is selected by D1
+Kconfig:27:     symbol D1 depends on D2
+For a resolution refer to Documentation/kbuild/kconfig-language.txt
+subsection "Kconfig recursive dependency limitations"
+
+Kconfig:37:error: recursive dependency detected!
+Kconfig:37:     symbol E1 depends on E2
+Kconfig:42:     symbol E2 is implied by E1
+For a resolution refer to Documentation/kbuild/kconfig-language.txt
+subsection "Kconfig recursive dependency limitations"
+
+Kconfig:60:error: recursive dependency detected!
+Kconfig:60:     symbol G depends on G
+For a resolution refer to Documentation/kbuild/kconfig-language.txt
+subsection "Kconfig recursive dependency limitations"
+
+Kconfig:51:error: recursive dependency detected!
+Kconfig:51:     symbol F2 depends on F1
+Kconfig:49:     symbol F1 default value contains F2
+For a resolution refer to Documentation/kbuild/kconfig-language.txt
+subsection "Kconfig recursive dependency limitations"
diff --git a/scripts/kconfig/tests/warn_recursive_dep/__init__.py b/scripts/kconfig/tests/warn_recursive_dep/__init__.py
deleted file mode 100644
index adb21951ba41..000000000000
--- a/scripts/kconfig/tests/warn_recursive_dep/__init__.py
+++ /dev/null
@@ -1,9 +0,0 @@
-"""
-Warn recursive inclusion.
-
-Recursive dependency should be warned.
-"""
-
-def test(conf):
-    assert conf.oldaskconfig() == 0
-    assert conf.stderr_contains('expected_stderr')
diff --git a/scripts/kconfig/tests/warn_recursive_dep/expected_stderr b/scripts/kconfig/tests/warn_recursive_dep/expected_stderr
deleted file mode 100644
index 3de807dd9cb2..000000000000
--- a/scripts/kconfig/tests/warn_recursive_dep/expected_stderr
+++ /dev/null
@@ -1,30 +0,0 @@
-Kconfig:9:error: recursive dependency detected!
-Kconfig:9:      symbol B is selected by B
-For a resolution refer to Documentation/kbuild/kconfig-language.txt
-subsection "Kconfig recursive dependency limitations"
-
-Kconfig:3:error: recursive dependency detected!
-Kconfig:3:      symbol A depends on A
-For a resolution refer to Documentation/kbuild/kconfig-language.txt
-subsection "Kconfig recursive dependency limitations"
-
-Kconfig:15:error: recursive dependency detected!
-Kconfig:15:     symbol C1 depends on C2
-Kconfig:19:     symbol C2 depends on C1
-For a resolution refer to Documentation/kbuild/kconfig-language.txt
-subsection "Kconfig recursive dependency limitations"
-
-Kconfig:30:error: recursive dependency detected!
-Kconfig:30:     symbol D2 is selected by D1
-Kconfig:25:     symbol D1 depends on D2
-For a resolution refer to Documentation/kbuild/kconfig-language.txt
-subsection "Kconfig recursive dependency limitations"
-
-Kconfig:59:error: recursive dependency detected!
-Kconfig:59:     symbol G depends on G
-For a resolution refer to Documentation/kbuild/kconfig-language.txt
-subsection "Kconfig recursive dependency limitations"
-
-Kconfig:50:error: recursive dependency detected!
-Kconfig:50:     symbol F2 depends on F1
-Kconfig:48:     symbol F1 default value contains F2
diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c
index a365594770d9..d999683bb2a7 100644
--- a/scripts/kconfig/util.c
+++ b/scripts/kconfig/util.c
@@ -29,36 +29,6 @@ struct file *file_lookup(const char *name)
         return file;
 }
 
-/* write a dependency file as used by kbuild to track dependencies */
-int file_write_dep(const char *name)
-{
-        struct file *file;
-        FILE *out;
-
-        if (!name)
-                name = ".kconfig.d";
-        out = fopen("..config.tmp", "w");
-        if (!out)
-                return 1;
-        fprintf(out, "deps_config := \\\n");
-        for (file = file_list; file; file = file->next) {
-                if (file->next)
-                        fprintf(out, "\t%s \\\n", file->name);
-                else
-                        fprintf(out, "\t%s\n", file->name);
-        }
-        fprintf(out, "\n%s: \\\n"
-                     "\t$(deps_config)\n\n", conf_get_autoconfig_name());
-
-        env_write_dep(out, conf_get_autoconfig_name());
-
-        fprintf(out, "\n$(deps_config): ;\n");
-        fclose(out);
-        rename("..config.tmp", name);
-        return 0;
-}
-
-
 /* Allocate initial growable string */
 struct gstr str_new(void)
 {
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y
index 6f9b0aa32a82..22fceb264cf5 100644
--- a/scripts/kconfig/zconf.y
+++ b/scripts/kconfig/zconf.y
@@ -31,7 +31,7 @@ struct symbol *symbol_hash[SYMBOL_HASHSIZE];
 static struct menu *current_menu, *current_entry;
 
 %}
-%expect 32
+%expect 30
 
 %union
 {
@@ -117,7 +117,7 @@ start: mainmenu_stmt stmt_list | stmt_list;
 
 /* mainmenu entry */
 
-mainmenu_stmt: T_MAINMENU prompt nl
+mainmenu_stmt: T_MAINMENU prompt T_EOL
 {
         menu_add_prompt(P_MENU, $2, NULL);
 };
@@ -265,7 +265,7 @@ symbol_option_arg:
 choice: T_CHOICE word_opt T_EOL
 {
         struct symbol *sym = sym_lookup($2, SYMBOL_CHOICE);
-        sym->flags |= SYMBOL_AUTO;
+        sym->flags |= SYMBOL_NO_WRITE;
         menu_add_entry(sym);
         menu_add_expr(P_CHOICE, NULL, NULL);
         free($2);
@@ -337,7 +337,7 @@ choice_block:
 
 /* if entry */
 
-if_entry: T_IF expr nl
+if_entry: T_IF expr T_EOL
 {
         printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno());
         menu_add_entry(NULL);
@@ -717,6 +717,10 @@ static void print_symbol(FILE *out, struct menu *menu)
                         print_quoted_string(out, prop->text);
                         fputc('\n', out);
                         break;
+                case P_SYMBOL:
+                        fputs( "  symbol ", out);
+                        fprintf(out, "%s\n", prop->sym->name);
+                        break;
                 default:
                         fprintf(out, "  unknown prop %d!\n", prop->type);
                         break;
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 0057d8eafcc1..8f0f508a78e9 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1062,7 +1062,7 @@ sub dump_struct($$) {
     my $x = shift;
     my $file = shift;
 
-    if ($x =~ /(struct|union)\s+(\w+)\s*{(.*)}/) {
+    if ($x =~ /(struct|union)\s+(\w+)\s*\{(.*)\}/) {
         my $decl_type = $1;
         $declaration_name = $2;
         my $members = $3;
@@ -1148,20 +1148,20 @@ sub dump_struct($$) {
                                 }
                         }
                 }
-                $members =~ s/(struct|union)([^\{\};]+)\{([^\{\}]*)}([^\{\}\;]*)\;/$newmember/;
+                $members =~ s/(struct|union)([^\{\};]+)\{([^\{\}]*)\}([^\{\}\;]*)\;/$newmember/;
         }
 
         # Ignore other nested elements, like enums
-        $members =~ s/({[^\{\}]*})//g;
+        $members =~ s/(\{[^\{\}]*\})//g;
 
         create_parameterlist($members, ';', $file, $declaration_name);
         check_sections($file, $declaration_name, $decl_type, $sectcheck, $struct_actual);
 
         # Adjust declaration for better display
-        $declaration =~ s/([{;])/$1\n/g;
-        $declaration =~ s/}\s+;/};/g;
+        $declaration =~ s/([\{;])/$1\n/g;
+        $declaration =~ s/\}\s+;/};/g;
         # Better handle inlined enums
-        do {} while ($declaration =~ s/(enum\s+{[^}]+),([^\n])/$1,\n$2/);
+        do {} while ($declaration =~ s/(enum\s+\{[^\}]+),([^\n])/$1,\n$2/);
 
         my @def_args = split /\n/, $declaration;
         my $level = 1;
@@ -1171,12 +1171,12 @@ sub dump_struct($$) {
                 $clause =~ s/\s+$//;
                 $clause =~ s/\s+/ /;
                 next if (!$clause);
-                $level-- if ($clause =~ m/(})/ && $level > 1);
+                $level-- if ($clause =~ m/(\})/ && $level > 1);
                 if (!($clause =~ m/^\s*#/)) {
                         $declaration .= "\t" x $level;
                 }
                 $declaration .= "\t" . $clause . "\n";
-                $level++ if ($clause =~ m/({)/ && !($clause =~m/}/));
+                $level++ if ($clause =~ m/(\{)/ && !($clause =~m/\}/));
         }
         output_declaration($declaration_name,
                            'struct',
@@ -1244,7 +1244,7 @@ sub dump_enum($$) {
     # strip #define macros inside enums
     $x =~ s@#\s*((define|ifdef)\s+|endif)[^;]*;@@gos;
 
-    if ($x =~ /enum\s+(\w+)\s*{(.*)}/) {
+    if ($x =~ /enum\s+(\w+)\s*\{(.*)\}/) {
         $declaration_name = $1;
         my $members = $2;
         my %_members;
@@ -1785,7 +1785,7 @@ sub process_proto_type($$) {
     }
 
     while (1) {
-        if ( $x =~ /([^{};]*)([{};])(.*)/ ) {
+        if ( $x =~ /([^\{\};]*)([\{\};])(.*)/ ) {
             if( length $prototype ) {
                 $prototype .= " "
             }
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index 4bf811c09f59..c8cf45362bd6 100755
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -75,7 +75,7 @@ modpost_link()
                 ${KBUILD_VMLINUX_LIBS}                          \
                 --end-group"
 
-        ${LD} ${LDFLAGS} -r -o ${1} ${objects}
+        ${LD} ${KBUILD_LDFLAGS} -r -o ${1} ${objects}
 }
 
 # Link of vmlinux
@@ -95,7 +95,7 @@ vmlinux_link()
                         --end-group                             \
                         ${1}"
 
-                ${LD} ${LDFLAGS} ${LDFLAGS_vmlinux} -o ${2}     \
+                ${LD} ${KBUILD_LDFLAGS} ${LDFLAGS_vmlinux} -o ${2}      \
                         -T ${lds} ${objects}
         else
                 objects="-Wl,--whole-archive                    \
diff --git a/scripts/mod/devicetable-offsets.c b/scripts/mod/devicetable-offsets.c
index 6667f7b491d6..293004499b4d 100644
--- a/scripts/mod/devicetable-offsets.c
+++ b/scripts/mod/devicetable-offsets.c
@@ -221,5 +221,9 @@ int main(void)
         DEVID_FIELD(tb_service_id, protocol_version);
         DEVID_FIELD(tb_service_id, protocol_revision);
 
+        DEVID(typec_device_id);
+        DEVID_FIELD(typec_device_id, svid);
+        DEVID_FIELD(typec_device_id, mode);
+
         return 0;
 }
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 52fd54a8fe39..7be43697ff84 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -1352,6 +1352,19 @@ static int do_tbsvc_entry(const char *filename, void *symval, char *alias)
 }
 ADD_TO_DEVTABLE("tbsvc", tb_service_id, do_tbsvc_entry);
 
+/* Looks like: typec:idNmN */
+static int do_typec_entry(const char *filename, void *symval, char *alias)
+{
+        DEF_FIELD(symval, typec_device_id, svid);
+        DEF_FIELD(symval, typec_device_id, mode);
+
+        sprintf(alias, "typec:id%04X", svid);
+        ADD(alias, "m", mode != TYPEC_ANY_MODE, mode);
+
+        return 1;
+}
+ADD_TO_DEVTABLE("typec", typec_device_id, do_typec_entry);
+
 /* Does namelen bytes of name exactly match the symbol? */
 static bool sym_is(const char *name, unsigned namelen, const char *symbol)
 {
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 1663fb19343a..0d998c54564d 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -672,7 +672,7 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
                         if (ELF_ST_TYPE(sym->st_info) == STT_SPARC_REGISTER)
                                 break;
                         if (symname[0] == '.') {
-                                char *munged = strdup(symname);
+                                char *munged = NOFAIL(strdup(symname));
                                 munged[0] = '_';
                                 munged[1] = toupper(munged[1]);
                                 symname = munged;
@@ -1318,7 +1318,7 @@ static Elf_Sym *find_elf_symbol2(struct elf_info *elf, Elf_Addr addr,
 static char *sec2annotation(const char *s)
 {
         if (match(s, init_exit_sections)) {
-                char *p = malloc(20);
+                char *p = NOFAIL(malloc(20));
                 char *r = p;
 
                 *p++ = '_';
@@ -1338,7 +1338,7 @@ static char *sec2annotation(const char *s)
                         strcat(p, " ");
                 return r;
         } else {
-                return strdup("");
+                return NOFAIL(strdup(""));
         }
 }
 
@@ -2036,7 +2036,7 @@ void buf_write(struct buffer *buf, const char *s, int len)
 {
         if (buf->size - buf->pos < len) {
                 buf->size += len + SZ;
-                buf->p = realloc(buf->p, buf->size);
+                buf->p = NOFAIL(realloc(buf->p, buf->size));
         }
         strncpy(buf->p + buf->pos, s, len);
         buf->pos += len;
@@ -2125,10 +2125,13 @@ static int check_modname_len(struct module *mod)
  **/
 static void add_header(struct buffer *b, struct module *mod)
 {
+        buf_printf(b, "#include <linux/build-salt.h>\n");
         buf_printf(b, "#include <linux/module.h>\n");
         buf_printf(b, "#include <linux/vermagic.h>\n");
         buf_printf(b, "#include <linux/compiler.h>\n");
         buf_printf(b, "\n");
+        buf_printf(b, "BUILD_SALT;\n");
+        buf_printf(b, "\n");
         buf_printf(b, "MODULE_INFO(vermagic, VERMAGIC_STRING);\n");
         buf_printf(b, "MODULE_INFO(name, KBUILD_MODNAME);\n");
         buf_printf(b, "\n");
diff --git a/scripts/package/buildtar b/scripts/package/buildtar
index e8cc72a51b32..d624a07a4e77 100755
--- a/scripts/package/buildtar
+++ b/scripts/package/buildtar
@@ -84,10 +84,6 @@ case "${ARCH}" in
                 [ -f "${KBUILD_IMAGE}" ] && cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"
                 [ -f "${objtree}/lifimage" ] && cp -v -- "${objtree}/lifimage" "${tmpdir}/boot/lifimage-${KERNELRELEASE}"
                 ;;
-        vax)
-                [ -f "${objtree}/vmlinux.SYS" ] && cp -v -- "${objtree}/vmlinux.SYS" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}.SYS"
-                [ -f "${objtree}/vmlinux.dsk" ] && cp -v -- "${objtree}/vmlinux.dsk" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}.dsk"
-                ;;
         mips)
                 if [ -f "${objtree}/arch/mips/boot/compressed/vmlinux.bin" ]; then
                         cp -v -- "${objtree}/arch/mips/boot/compressed/vmlinux.bin" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
@@ -109,6 +105,14 @@ case "${ARCH}" in
                         cp -v -- "${objtree}/vmlinux" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"
                 fi
                 ;;
+        arm64)
+                for i in Image.bz2 Image.gz Image.lz4 Image.lzma Image.lzo ; do
+                        if [ -f "${objtree}/arch/arm64/boot/${i}" ] ; then
+                                cp -v -- "${objtree}/arch/arm64/boot/${i}" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
+                                break
+                        fi
+                done
+                ;;
         *)
                 [ -f "${KBUILD_IMAGE}" ] && cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinux-kbuild-${KERNELRELEASE}"
                 echo "" >&2
diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
index 985d72d1ab34..663a7f343b42 100755
--- a/scripts/package/mkdebian
+++ b/scripts/package/mkdebian
@@ -6,49 +6,81 @@
 
 set -e
 
+is_enabled() {
+        grep -q "^CONFIG_$1=y" $KCONFIG_CONFIG
+}
+
+if_enabled_echo() {
+        if is_enabled "$1"; then
+                echo -n "$2"
+        elif [ $# -ge 3 ]; then
+                echo -n "$3"
+        fi
+}
+
 set_debarch() {
+        if [ -n "$KBUILD_DEBARCH" ] ; then
+                debarch="$KBUILD_DEBARCH"
+                return
+        fi
+
         # Attempt to find the correct Debian architecture
         case "$UTS_MACHINE" in
-        i386|ia64|alpha)
+        i386|ia64|alpha|m68k|riscv*)
                 debarch="$UTS_MACHINE" ;;
         x86_64)
                 debarch=amd64 ;;
         sparc*)
-                debarch=sparc ;;
+                debarch=sparc$(if_enabled_echo 64BIT 64) ;;
         s390*)
-                debarch=s390$(grep -q CONFIG_64BIT=y $KCONFIG_CONFIG && echo x || true) ;;
+                debarch=s390x ;;
         ppc*)
-                debarch=$(grep -q CPU_LITTLE_ENDIAN=y $KCONFIG_CONFIG && echo ppc64el || echo powerpc) ;;
+                if is_enabled 64BIT; then
+                        debarch=ppc64$(if_enabled_echo CPU_LITTLE_ENDIAN el)
+                else
+                        debarch=powerpc$(if_enabled_echo SPE spe)
+                fi
+                ;;
         parisc*)
                 debarch=hppa ;;
         mips*)
-                debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y $KCONFIG_CONFIG && echo el || true) ;;
+                if is_enabled CPU_LITTLE_ENDIAN; then
+                        debarch=mips$(if_enabled_echo 64BIT 64)$(if_enabled_echo CPU_MIPSR6 r6)el
+                elif is_enabled CPU_MIPSR6; then
+                        debarch=mips$(if_enabled_echo 64BIT 64)r6
+                else
+                        debarch=mips
+                fi
+                ;;
         aarch64|arm64)
                 debarch=arm64 ;;
         arm*)
-                if grep -q CONFIG_AEABI=y $KCONFIG_CONFIG; then
-                    if grep -q CONFIG_VFP=y $KCONFIG_CONFIG; then
-                        debarch=armhf
-                    else
-                        debarch=armel
-                    fi
+                if is_enabled AEABI; then
+                        debarch=arm$(if_enabled_echo VFP hf el)
                 else
-                    debarch=arm
+                        debarch=arm
+                fi
+                ;;
+        openrisc)
+                debarch=or1k ;;
+        sh)
+                if is_enabled CPU_SH3; then
+                        debarch=sh3$(if_enabled_echo CPU_BIG_ENDIAN eb)
+                elif is_enabled CPU_SH4; then
+                        debarch=sh4$(if_enabled_echo CPU_BIG_ENDIAN eb)
                 fi
                 ;;
-        *)
-                debarch=$(dpkg --print-architecture)
+        esac
+        if [ -z "$debarch" ]; then
+                debarch=$(dpkg-architecture -qDEB_HOST_ARCH)
                 echo "" >&2
                 echo "** ** **  WARNING  ** ** **" >&2
                 echo "" >&2
                 echo "Your architecture doesn't have its equivalent" >&2
                 echo "Debian userspace architecture defined!" >&2
-                echo "Falling back to using your current userspace instead!" >&2
+                echo "Falling back to the current host architecture ($debarch)." >&2
                 echo "Please add support for $UTS_MACHINE to ${0} ..." >&2
                 echo "" >&2
-        esac
-        if [ -n "$KBUILD_DEBARCH" ] ; then
-                debarch="$KBUILD_DEBARCH"
         fi
 }
 
diff --git a/scripts/spdxcheck.py b/scripts/spdxcheck.py
index 7deaef297f52..839e190bbd7a 100755
--- a/scripts/spdxcheck.py
+++ b/scripts/spdxcheck.py
@@ -4,6 +4,7 @@
 
 from argparse import ArgumentParser
 from ply import lex, yacc
+import locale
 import traceback
 import sys
 import git
@@ -32,7 +33,7 @@ def read_spdxdata(repo):
 
     # The subdirectories of LICENSES in the kernel source
     license_dirs = [ "preferred", "other", "exceptions" ]
-    lictree = repo.heads.master.commit.tree['LICENSES']
+    lictree = repo.head.commit.tree['LICENSES']
 
     spdx = SPDXdata()
 
@@ -102,7 +103,7 @@ class id_parser(object):
                 raise ParserException(tok, 'Invalid License ID')
             self.lastid = id
         elif tok.type == 'EXC':
-            if not self.spdx.exceptions.has_key(id):
+            if id not in self.spdx.exceptions:
                 raise ParserException(tok, 'Invalid Exception ID')
             if self.lastid not in self.spdx.exceptions[id]:
                 raise ParserException(tok, 'Exception not valid for license %s' %self.lastid)
@@ -167,6 +168,7 @@ class id_parser(object):
         self.curline = 0
         try:
             for line in fd:
+                line = line.decode(locale.getpreferredencoding(False), errors='ignore')
                 self.curline += 1
                 if self.curline > maxlines:
                     break
@@ -199,11 +201,10 @@ def scan_git_tree(tree):
             continue
         if el.path.find("license-rules.rst") >= 0:
             continue
-        if el.path == 'scripts/checkpatch.pl':
-            continue
         if not os.path.isfile(el.path):
             continue
-        parser.parse_lines(open(el.path), args.maxlines, el.path)
+        with open(el.path, 'rb') as fd:
+            parser.parse_lines(fd, args.maxlines, el.path)
 
 def scan_git_subtree(tree, path):
     for p in path.strip('/').split('/'):
diff --git a/scripts/spelling.txt b/scripts/spelling.txt
index 9a058cff49d4..517d0c3f83df 100644
--- a/scripts/spelling.txt
+++ b/scripts/spelling.txt
@@ -10,6 +10,8 @@
 abandonning||abandoning
 abigious||ambiguous
 abitrate||arbitrate
+abord||abort
+aboslute||absolute
 abov||above
 abreviated||abbreviated
 absense||absence
@@ -25,6 +27,7 @@ accessable||accessible
 accesss||access
 accidentaly||accidentally
 accidentually||accidentally
+acclerated||accelerated
 accoding||according
 accomodate||accommodate
 accomodates||accommodates
@@ -58,12 +61,15 @@ addres||address
 adddress||address
 addreses||addresses
 addresss||address
+addrress||address
 aditional||additional
 aditionally||additionally
 aditionaly||additionally
 adminstrative||administrative
 adress||address
 adresses||addresses
+adrresses||addresses
+advertisment||advertisement
 adviced||advised
 afecting||affecting
 againt||against
@@ -100,6 +106,7 @@ alue||value
 ambigious||ambiguous
 amoung||among
 amout||amount
+amplifer||amplifier
 an union||a union
 an user||a user
 an userspace||a userspace
@@ -145,11 +152,15 @@ assistent||assistant
 assocation||association
 associcated||associated
 assotiated||associated
+asssert||assert
 assum||assume
 assumtpion||assumption
 asuming||assuming
 asycronous||asynchronous
 asynchnous||asynchronous
+asynchromous||asynchronous
+asymetric||asymmetric
+asymmeric||asymmetric
 atomatically||automatically
 atomicly||atomically
 atempt||attempt
@@ -172,6 +183,7 @@ avaible||available
 availabe||available
 availabled||available
 availablity||availability
+availaible||available
 availale||available
 availavility||availability
 availble||available
@@ -206,8 +218,11 @@ borad||board
 boundry||boundary
 brievely||briefly
 broadcat||broadcast
+bufufer||buffer
 cacluated||calculated
+caculate||calculate
 caculation||calculation
+cadidate||candidate
 calender||calendar
 calescing||coalescing
 calle||called
@@ -221,12 +236,14 @@ capabilty||capability
 capabitilies||capabilities
 capatibilities||capabilities
 capapbilities||capabilities
+caputure||capture
 carefuly||carefully
 cariage||carriage
 catagory||category
 cehck||check
 challange||challenge
 challanges||challenges
+chache||cache
 chanell||channel
 changable||changeable
 chanined||chained
@@ -240,6 +257,7 @@ charaters||characters
 charcter||character
 chcek||check
 chck||check
+checksumed||checksummed
 checksuming||checksumming
 childern||children
 childs||children
@@ -292,8 +310,10 @@ comunication||communication
 conbination||combination
 conditionaly||conditionally
 conected||connected
+conector||connector
 connecetd||connected
 configuartion||configuration
+configuation||configuration
 configuratoin||configuration
 configuraton||configuration
 configuretion||configuration
@@ -315,6 +335,7 @@ continous||continuous
 continously||continuously
 continueing||continuing
 contraints||constraints
+contruct||construct
 contol||control
 contoller||controller
 controled||controlled
@@ -343,6 +364,7 @@ dafault||default
 deafult||default
 deamon||daemon
 decompres||decompress
+decsribed||described
 decription||description
 dectected||detected
 defailt||default
@@ -379,6 +401,7 @@ desctiptor||descriptor
 desriptor||descriptor
 desriptors||descriptors
 destionation||destination
+destoried||destroyed
 destory||destroy
 destoryed||destroyed
 destorys||destroys
@@ -400,22 +423,30 @@ didnt||didn't
 diferent||different
 differrence||difference
 diffrent||different
+differenciate||differentiate
 diffrentiate||differentiate
 difinition||definition
 dimesions||dimensions
 diplay||display
+directon||direction
 direectly||directly
+diregard||disregard
 disassocation||disassociation
 disapear||disappear
 disapeared||disappeared
 disappared||disappeared
+disbale||disable
+disbaled||disabled
 disble||disable
 disbled||disabled
 disconnet||disconnect
 discontinous||discontinuous
+disharge||discharge
 dispertion||dispersion
 dissapears||disappears
 distiction||distinction
+divisable||divisible
+divsiors||divisors
 docuentation||documentation
 documantation||documentation
 documentaion||documentation
@@ -427,6 +458,7 @@ downlad||download
 downlads||downloads
 druing||during
 dynmaic||dynamic
+eanable||enable
 easilly||easily
 ecspecially||especially
 edditable||editable
@@ -484,9 +516,12 @@ exprimental||experimental
 extened||extended
 extensability||extensibility
 extention||extension
+extenstion||extension
 extracter||extractor
+faield||failed
 falied||failed
 faild||failed
+failer||failure
 faill||fail
 failied||failed
 faillure||failure
@@ -520,6 +555,7 @@ forseeable||foreseeable
 forse||force
 fortan||fortran
 forwardig||forwarding
+frambuffer||framebuffer
 framming||framing
 framwork||framework
 frequncy||frequency
@@ -527,6 +563,7 @@ frome||from
 fucntion||function
 fuction||function
 fuctions||functions
+funcation||function
 funcion||function
 functionallity||functionality
 functionaly||functionally
@@ -540,6 +577,7 @@ futrue||future
 gaurenteed||guaranteed
 generiously||generously
 genereate||generate
+genereted||generated
 genric||generic
 globel||global
 grabing||grabbing
@@ -553,6 +591,7 @@ guarentee||guarantee
 halfs||halves
 hander||handler
 handfull||handful
+hanlde||handle
 hanled||handled
 happend||happened
 harware||hardware
@@ -561,6 +600,7 @@ helpfull||helpful
 hybernate||hibernate
 hierachy||hierarchy
 hierarchie||hierarchy
+homogenous||homogeneous
 howver||however
 hsould||should
 hypervior||hypervisor
@@ -568,6 +608,8 @@ hypter||hyper
 identidier||identifier
 iligal||illegal
 illigal||illegal
+illgal||illegal
+iomaped||iomapped
 imblance||imbalance
 immeadiately||immediately
 immedaite||immediate
@@ -618,12 +660,15 @@ initation||initiation
 initators||initiators
 initialiazation||initialization
 initializiation||initialization
+initialze||initialize
 initialzed||initialized
 initilization||initialization
 initilize||initialize
 inofficial||unofficial
+inrerface||interface
 insititute||institute
 instal||install
+instanciate||instantiate
 instanciated||instantiated
 inteface||interface
 integreated||integrated
@@ -657,6 +702,7 @@ intregral||integral
 intrrupt||interrupt
 intterrupt||interrupt
 intuative||intuitive
+inavlid||invalid
 invaid||invalid
 invald||invalid
 invalde||invalid
@@ -683,6 +729,7 @@ langauge||language
 langugage||language
 lauch||launch
 layed||laid
+legnth||length
 leightweight||lightweight
 lengh||length
 lenght||length
@@ -696,6 +743,7 @@ licenceing||licencing
 loggging||logging
 loggin||login
 logile||logfile
+loobpack||loopback
 loosing||losing
 losted||lost
 machinary||machinery
@@ -703,6 +751,7 @@ maintainance||maintenance
 maintainence||maintenance
 maintan||maintain
 makeing||making
+mailformed||malformed
 malplaced||misplaced
 malplace||misplace
 managable||manageable
@@ -710,6 +759,7 @@ managment||management
 mangement||management
 manoeuvering||maneuvering
 mappping||mapping
+matchs||matches
 mathimatical||mathematical
 mathimatic||mathematic
 mathimatics||mathematics
@@ -725,6 +775,7 @@ messsage||message
 messsages||messages
 micropone||microphone
 microprocesspr||microprocessor
+migrateable||migratable
 milliseonds||milliseconds
 minium||minimum
 minimam||minimum
@@ -741,6 +792,7 @@ missmatch||mismatch
 miximum||maximum
 mmnemonic||mnemonic
 mnay||many
+modfiy||modify
 modulues||modules
 momery||memory
 memomry||memory
@@ -777,6 +829,7 @@ notifed||notified
 numebr||number
 numner||number
 obtaion||obtain
+obusing||abusing
 occassionally||occasionally
 occationally||occasionally
 occurance||occurrence
@@ -787,6 +840,7 @@ occure||occurred
 occured||occurred
 occuring||occurring
 offet||offset
+offloded||offloaded
 omited||omitted
 omiting||omitting
 omitt||omit
@@ -829,6 +883,7 @@ parametes||parameters
 parametised||parametrised
 paramter||parameter
 paramters||parameters
+parmaters||parameters
 particuarly||particularly
 particularily||particularly
 partiton||partition
@@ -837,6 +892,7 @@ passin||passing
 pathes||paths
 pecularities||peculiarities
 peformance||performance
+peforming||performing
 peice||piece
 pendantic||pedantic
 peprocessor||preprocessor
@@ -846,6 +902,7 @@ peroid||period
 persistance||persistence
 persistant||persistent
 plalform||platform
+platfoem||platform
 platfrom||platform
 plattform||platform
 pleaes||please
@@ -858,6 +915,7 @@ posible||possible
 positon||position
 possibilites||possibilities
 powerfull||powerful
+preamle||preamble
 preample||preamble
 preapre||prepare
 preceeded||preceded
@@ -870,6 +928,7 @@ prefered||preferred
 prefferably||preferably
 premption||preemption
 prepaired||prepared
+preperation||preparation
 pressre||pressure
 primative||primitive
 princliple||principle
@@ -935,6 +994,7 @@ recommanded||recommended
 recyle||recycle
 redircet||redirect
 redirectrion||redirection
+redundacy||redundancy
 reename||rename
 refcounf||refcount
 refence||reference
@@ -945,6 +1005,7 @@ refernces||references
 refernnce||reference
 refrence||reference
 registerd||registered
+registeration||registration
 registeresd||registered
 registerred||registered
 registes||registers
@@ -973,7 +1034,9 @@ requirment||requirement
 requred||required
 requried||required
 requst||request
+reregisteration||reregistration
 reseting||resetting
+reseverd||reserved
 resizeable||resizable
 resouce||resource
 resouces||resources
@@ -982,6 +1045,7 @@ responce||response
 ressizes||resizes
 ressource||resource
 ressources||resources
+restesting||retesting
 retransmited||retransmitted
 retreived||retrieved
 retreive||retrieve
@@ -1006,6 +1070,7 @@ sacrifying||sacrificing
 safly||safely
 safty||safety
 savable||saveable
+scaleing||scaling
 scaned||scanned
 scaning||scanning
 scarch||search
@@ -1014,6 +1079,8 @@ searchs||searches
 secquence||sequence
 secund||second
 segement||segment
+semaphone||semaphore
+senario||scenario
 senarios||scenarios
 sentivite||sensitive
 separatly||separately
@@ -1025,9 +1092,13 @@ seperate||separate
 seperatly||separately
 seperator||separator
 sepperate||separate
+seqeunce||sequence
+seqeuncer||sequencer
+seqeuencer||sequencer
 sequece||sequence
 sequencial||sequential
 serveral||several
+servive||service
 setts||sets
 settting||setting
 shotdown||shutdown
@@ -1073,6 +1144,7 @@ standartization||standardization
 standart||standard
 staticly||statically
 stoped||stopped
+stoping||stopping
 stoppped||stopped
 straming||streaming
 struc||struct
@@ -1085,6 +1157,7 @@ subdirectoires||subdirectories
 suble||subtle
 substract||subtract
 submition||submission
+suceed||succeed
 succesfully||successfully
 succesful||successful
 successed||succeeded
@@ -1108,6 +1181,7 @@ surpressed||suppressed
 surpresses||suppresses
 susbsystem||subsystem
 suspeneded||suspended
+suspsend||suspend
 suspicously||suspiciously
 swaping||swapping
 switchs||switches
@@ -1122,6 +1196,7 @@ swtich||switch
 symetric||symmetric
 synax||syntax
 synchonized||synchronized
+synchronuously||synchronously
 syncronize||synchronize
 syncronized||synchronized
 syncronizing||synchronizing
@@ -1130,11 +1205,14 @@ syste||system
 sytem||system
 sythesis||synthesis
 taht||that
+tansmit||transmit
 targetted||targeted
 targetting||targeting
+taskelt||tasklet
 teh||the
 temorary||temporary
 temproarily||temporarily
+thead||thread
 therfore||therefore
 thier||their
 threds||threads
@@ -1143,11 +1221,14 @@ thresold||threshold
 throught||through
 troughput||throughput
 thses||these
+tiggers||triggers
 tiggered||triggered
 tipically||typically
+timeing||timing
 timout||timeout
 tmis||this
 torerable||tolerable
+traking||tracking
 tramsmitted||transmitted
 tramsmit||transmit
 tranasction||transaction
@@ -1162,6 +1243,7 @@ transormed||transformed
 trasfer||transfer
 trasmission||transmission
 treshold||threshold
+trigerred||triggered
 trigerring||triggering
 trun||turn
 tunning||tuning
@@ -1169,6 +1251,8 @@ ture||true
 tyep||type
 udpate||update
 uesd||used
+uknown||unknown
+usupported||unsupported
 uncommited||uncommitted
 unconditionaly||unconditionally
 underun||underrun
@@ -1181,11 +1265,14 @@ unexpeted||unexpected
 unexpexted||unexpected
 unfortunatelly||unfortunately
 unifiy||unify
+uniterrupted||uninterrupted
 unintialized||uninitialized
 unkmown||unknown
 unknonw||unknown
 unknow||unknown
 unkown||unknown
+unamed||unnamed
+uneeded||unneeded
 unneded||unneeded
 unneccecary||unnecessary
 unneccesary||unnecessary
@@ -1210,6 +1297,7 @@ usefull||useful
 usege||usage
 usera||users
 usualy||usually
+usupported||unsupported
 utilites||utilities
 utillities||utilities
 utilties||utilities
@@ -1233,7 +1321,9 @@ virtaul||virtual
 virtiual||virtual
 visiters||visitors
 vitual||virtual
+vunerable||vulnerable
 wakeus||wakeups
+wathdog||watchdog
 wating||waiting
 wiat||wait
 wether||whether
diff --git a/scripts/tags.sh b/scripts/tags.sh
index 66f08bb1cce9..26de7d5aa5c8 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -152,6 +152,7 @@ regex_asm=(
 )
 regex_c=(
         '/^SYSCALL_DEFINE[0-9](\([[:alnum:]_]*\).*/sys_\1/'
+        '/^BPF_CALL_[0-9](\([[:alnum:]_]*\).*/\1/'
         '/^COMPAT_SYSCALL_DEFINE[0-9](\([[:alnum:]_]*\).*/compat_sys_\1/'
         '/^TRACE_EVENT(\([[:alnum:]_]*\).*/trace_\1/'
         '/^TRACE_EVENT(\([[:alnum:]_]*\).*/trace_\1_rcuidle/'
@@ -245,7 +246,7 @@ exuberant()
 {
         setup_regex exuberant asm c
         all_target_sources | xargs $1 -a                        \
-        -I __initdata,__exitdata,__initconst,                   \
+        -I __initdata,__exitdata,__initconst,__ro_after_init    \
         -I __initdata_memblock                                  \
         -I __refdata,__attribute,__maybe_unused,__always_unused \
         -I __acquires,__releases,__deprecated                   \
diff --git a/scripts/tracing/draw_functrace.py b/scripts/tracing/draw_functrace.py
index db40fa04cd51..9b6dd4f36335 100755
--- a/scripts/tracing/draw_functrace.py
+++ b/scripts/tracing/draw_functrace.py
@@ -123,7 +123,7 @@ def main():
                 tree = tree.getParent(caller)
                 tree = tree.calls(callee, calltime)
 
-        print CallTree.ROOT
+        print(CallTree.ROOT)
 
 if __name__ == "__main__":
         main()
diff --git a/scripts/ver_linux b/scripts/ver_linux
index 7227994ccf63..a6c728db05ce 100755
--- a/scripts/ver_linux
+++ b/scripts/ver_linux
@@ -32,11 +32,13 @@ BEGIN {
         printversion("Nfs-utils", version("showmount --version"))
 
         while (getline <"/proc/self/maps" > 0) {
-                n = split($0, procmaps, "/")
-                if (/libc.*so$/ && match(procmaps[n], /[0-9]+([.]?[0-9]+)+/)) {
-                        ver = substr(procmaps[n], RSTART, RLENGTH)
-                        printversion("Linux C Library", ver)
-                        break
+                if (/libc.*\.so$/) {
+                        n = split($0, procmaps, "/")
+                        if (match(procmaps[n], /[0-9]+([.]?[0-9]+)+/)) {
+                                ver = substr(procmaps[n], RSTART, RLENGTH)
+                                printversion("Linux C Library", ver)
+                                break
+                        }
                 }
         }
 
@@ -68,7 +70,7 @@ BEGIN {
 function version(cmd,    ver) {
         cmd = cmd " 2>&1"
         while (cmd | getline > 0) {
-                if (!/ver_linux/ && match($0, /[0-9]+([.]?[0-9]+)+/)) {
+                if (match($0, /[0-9]+([.]?[0-9]+)+/)) {
                         ver = substr($0, RSTART, RLENGTH)
                         break
                 }