106 files changed, 1717 insertions, 1287 deletions
diff --git a/scripts/.gitignore b/scripts/.gitignore
index 12d302d70128..17f8cef88fa8 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -6,9 +6,7 @@ conmakehash
 kallsyms
 pnmtologo
 unifdef
-ihex2fw
 recordmcount
-check-lc_ctype
 sortextable
 asn1_compiler
 extract-cert
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index bb015551c2d9..30816037036e 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -24,10 +24,6 @@ depfile = $(subst $(comma),_,$(dot-target).d)
 basetarget = $(basename $(notdir $@))
 ###
-# filename of first prerequisite with directory and extension stripped
-baseprereq = $(basename $(notdir $<))
-###
 # Escape single quote for use in echo statements
 escsq = $(subst $(squote),'\$(squote)',$1)
@@ -41,11 +37,11 @@ kecho := $($(quiet)kecho)
 ###
 # filechk is used to check if the content of a generated file is updated.
 # Sample usage:
-# define filechk_sample
+#
-#       echo $KERNELRELEASE
+# filechk_sample = echo $(KERNELRELEASE)
-# endef
+# version.h: FORCE
-# version.h : Makefile
 #       $(call filechk,sample)
+#
 # The rule defined shall write to stdout the content of the new file.
 # The existing file will be compared with the new one.
 # - If no file exist it is created
@@ -56,7 +52,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                                    \
@@ -115,9 +111,7 @@ __cc-option = $(call try-run,\
 # Do not attempt to build with gcc plugins during cc-option tests.
 # (And this uses delayed resolution so the flags will be up to date.)
-# In addition, do not include the asm macros which are built later.
+CC_OPTION_CFLAGS = $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
-CC_OPTION_FILTERED = $(GCC_PLUGINS_CFLAGS) $(ASM_MACRO_FLAGS)
-CC_OPTION_CFLAGS = $(filter-out $(CC_OPTION_FILTERED),$(KBUILD_CFLAGS))
 # cc-option
 # Usage: cflags-y += $(call cc-option,-march=winchip-c6,-march=i586)
@@ -215,7 +209,7 @@ echo-cmd = $(if $($(quiet)cmd_$(1)),\
        echo '  $(call escsq,$($(quiet)cmd_$(1)))$(echo-why)';)
 # printing commands
-cmd = @$(echo-cmd) $(cmd_$(1))
+cmd = @set -e; $(echo-cmd) $(cmd_$(1))
 # Add $(obj)/ for paths that are not absolute
 objectify = $(foreach o,$(1),$(if $(filter /%,$(o)),$(o),$(obj)/$(o)))
@@ -251,56 +245,21 @@ any-prereq = $(filter-out $(PHONY),$?) $(filter-out $(PHONY) $(wildcard $^),$^)
 # Execute command if command has changed or prerequisite(s) are updated.
 if_changed = $(if $(strip $(any-prereq) $(arg-check)),                       \
-        @set -e;                                                             \
+        $(cmd);                                                              \
-        $(echo-cmd) $(cmd_$(1));                                             \
        printf '%s\n' 'cmd_$@ := $(make-cmd)' > $(dot-target).cmd, @:)
 # Execute the command and also postprocess generated .d dependencies file.
-if_changed_dep = $(if $(strip $(any-prereq) $(arg-check) ),                  \
+if_changed_dep = $(if $(strip $(any-prereq) $(arg-check)),$(cmd_and_fixdep),@:)
-        @set -e;                                                             \
-        $(cmd_and_fixdep), @:)
-ifndef CONFIG_TRIM_UNUSED_KSYMS
 cmd_and_fixdep =                                                             \
-        $(echo-cmd) $(cmd_$(1));                                             \
+        $(cmd);                                                              \
-        scripts/basic/fixdep $(depfile) $@ '$(make-cmd)' > $(dot-target).tmp;\
+        scripts/basic/fixdep $(depfile) $@ '$(make-cmd)' > $(dot-target).cmd;\
-        rm -f $(depfile);                                                    \
+        rm -f $(depfile)
-        mv -f $(dot-target).tmp $(dot-target).cmd;
-else
-# Filter out exported kernel symbol names from the preprocessor output.
-# See also __KSYM_DEPS__ in include/linux/export.h.
-# We disable the depfile generation here, so as not to overwrite the existing
-# depfile while fixdep is parsing it.
-flags_nodeps = $(filter-out -Wp$(comma)-M%, $($(1)))
-ksym_dep_filter =                                                            \
-        case "$(1)" in                                                       \
-          cc_*_c|cpp_i_c)                                                    \
-            $(CPP) $(call flags_nodeps,c_flags) -D__KSYM_DEPS__ $< ;;        \
-          as_*_S|cpp_s_S)                                                    \
-            $(CPP) $(call flags_nodeps,a_flags) -D__KSYM_DEPS__ $< ;;        \
-          boot*|build*|cpp_its_S|*cpp_lds_S|dtc|host*|vdso*) : ;;            \
-          *) echo "Don't know how to preprocess $(1)" >&2; false ;;          \
-        esac | tr ";" "\n" | sed -n 's/^.*=== __KSYM_\(.*\) ===.*$$/_\1/p'
-cmd_and_fixdep =                                                             \
-        $(echo-cmd) $(cmd_$(1));                                             \
-        $(ksym_dep_filter) |                                                 \
-                scripts/basic/fixdep -e $(depfile) $@ '$(make-cmd)'          \
-                        > $(dot-target).tmp;                                 \
-        rm -f $(depfile);                                                    \
-        mv -f $(dot-target).tmp $(dot-target).cmd;
-endif
 # Usage: $(call if_changed_rule,foo)
 # Will check if $(cmd_foo) or any of the prerequisites changed,
 # and if so will execute $(rule_foo).
-if_changed_rule = $(if $(strip $(any-prereq) $(arg-check) ),                 \
+if_changed_rule = $(if $(strip $(any-prereq) $(arg-check)),$(rule_$(1)),@:)
-        @set -e;                                                             \
-        $(rule_$(1)), @:)
 ###
 # why - tell why a target got built
@@ -393,3 +352,6 @@ endef
 # delete partially updated (i.e. corrupted) files on error
 .DELETE_ON_ERROR:
+# do not delete intermediate files automatically
+.SECONDARY:
diff --git a/scripts/Makefile b/scripts/Makefile
index ece52ff20171..feb1f71381d7 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -36,10 +36,10 @@ PHONY += build_unifdef
 build_unifdef: $(obj)/unifdef
        @:
+subdir-$(CONFIG_GCC_PLUGINS) += gcc-plugins
 subdir-$(CONFIG_MODVERSIONS) += genksyms
-subdir-y                     += mod
 subdir-$(CONFIG_SECURITY_SELINUX) += selinux
 subdir-$(CONFIG_GDB_SCRIPTS) += gdb
 # Let clean descend into subdirs
-subdir- += basic dtc kconfig package gcc-plugins
+subdir- += basic dtc kconfig mod package
diff --git a/scripts/Makefile.asm-generic b/scripts/Makefile.asm-generic
index 32ad8e93fbe1..a62d2823f6cf 100644
--- a/scripts/Makefile.asm-generic
+++ b/scripts/Makefile.asm-generic
@@ -2,41 +2,46 @@
 # include/asm-generic contains a lot of files that are used
 # verbatim by several architectures.
 #
-# This Makefile reads the file arch/$(SRCARCH)/include/$(src)/Kbuild
+# This Makefile reads the file arch/$(SRCARCH)/include/(uapi/)/asm/Kbuild
 # and for each file listed in this file with generic-y creates
-# a small wrapper file in $(obj) (arch/$(SRCARCH)/include/generated/$(src))
+# a small wrapper file in arch/$(SRCARCH)/include/generated/(uapi/)/asm.
 PHONY := all
 all:
-kbuild-file := $(srctree)/arch/$(SRCARCH)/include/$(src)/Kbuild
+src := $(subst /generated,,$(obj))
-include $(kbuild-file)
+-include $(src)/Kbuild
 include scripts/Kbuild.include
-# Create output directory if not already present
+# If arch does not implement mandatory headers, fallback to asm-generic ones.
-_dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj))
+mandatory-y := $(filter-out $(generated-y), $(mandatory-y))
+generic-y   += $(foreach f, $(mandatory-y), $(if $(wildcard $(srctree)/$(src)/$(f)),,$(f)))
-# Stale wrappers when the corresponding files are removed from generic-y
+generic-y   := $(addprefix $(obj)/, $(generic-y))
-# need removing.
+generated-y := $(addprefix $(obj)/, $(generated-y))
-generated-y   := $(generic-y) $(generated-y)
-all-files     := $(patsubst %, $(obj)/%, $(generated-y))
+# Remove stale wrappers when the corresponding files are removed from generic-y
-old-headers   := $(wildcard $(obj)/*.h)
+old-headers := $(wildcard $(obj)/*.h)
-unwanted      := $(filter-out $(all-files),$(old-headers))
+unwanted    := $(filter-out $(generic-y) $(generated-y),$(old-headers))
 quiet_cmd_wrap = WRAP    $@
-cmd_wrap = echo "\#include <asm-generic/$*.h>" >$@
+      cmd_wrap = echo "\#include <asm-generic/$*.h>" > $@
 quiet_cmd_remove = REMOVE  $(unwanted)
-cmd_remove = rm -f $(unwanted)
+      cmd_remove = rm -f $(unwanted)
-all: $(patsubst %, $(obj)/%, $(generic-y)) FORCE
+all: $(generic-y)
-        $(if $(unwanted),$(call cmd,remove),)
+        $(if $(unwanted),$(call cmd,remove))
        @:
 $(obj)/%.h:
        $(call cmd,wrap)
-PHONY += FORCE
+# Create output directory. Skip it if at least one old header exists
+# since we know the output directory already exists.
+ifeq ($(old-headers),)
+$(shell mkdir -p $(obj))
+endif
 .PHONY: $(PHONY)
-FORCE: ;
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index a8e7ba9f73e8..fd03d60f6c5a 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -75,14 +75,14 @@ __build: $(if $(KBUILD_BUILTIN),$(builtin-target) $(lib-target) $(extra-y)) \
 # Linus' kernel sanity checking tool
 ifeq ($(KBUILD_CHECKSRC),1)
  quiet_cmd_checksrc       = CHECK   $<
-        cmd_checksrc       = $(CHECK) $(CHECKFLAGS) $(c_flags) $< ;
+        cmd_checksrc       = $(CHECK) $(CHECKFLAGS) $(c_flags) $<
 else ifeq ($(KBUILD_CHECKSRC),2)
  quiet_cmd_force_checksrc = CHECK   $<
-        cmd_force_checksrc = $(CHECK) $(CHECKFLAGS) $(c_flags) $< ;
+        cmd_force_checksrc = $(CHECK) $(CHECKFLAGS) $(c_flags) $<
 endif
 ifneq ($(KBUILD_ENABLE_EXTRA_GCC_CHECKS),)
-  cmd_checkdoc = $(srctree)/scripts/kernel-doc -none $< ;
+  cmd_checkdoc = $(srctree)/scripts/kernel-doc -none $<
 endif
 # Do section mismatch analysis for each module/built-in.a
@@ -94,23 +94,14 @@ endif
 # ---------------------------------------------------------------------------
 # Default is built-in, unless we know otherwise
+$(foreach x, i ll lst o s symtypes, $(patsubst %.o,%.$(x),$(real-obj-m))): \
+        part-of-module := y
 modkern_cflags =                                          \
        $(if $(part-of-module),                           \
                $(KBUILD_CFLAGS_MODULE) $(CFLAGS_MODULE), \
                $(KBUILD_CFLAGS_KERNEL) $(CFLAGS_KERNEL))
-quiet_modtag := $(empty)   $(empty)
+quiet_modtag = $(if $(part-of-module),[M],   )
-$(real-obj-m)        : part-of-module := y
-$(real-obj-m:.o=.i)  : part-of-module := y
-$(real-obj-m:.o=.s)  : part-of-module := y
-$(real-obj-m:.o=.lst): part-of-module := y
-$(real-obj-m)        : quiet_modtag := [M]
-$(real-obj-m:.o=.i)  : quiet_modtag := [M]
-$(real-obj-m:.o=.s)  : quiet_modtag := [M]
-$(real-obj-m:.o=.lst): quiet_modtag := [M]
-$(obj-m)             : quiet_modtag := [M]
 quiet_cmd_cc_s_c = CC $(quiet_modtag)  $@
 cmd_cc_s_c       = $(CC) $(c_flags) $(DISABLE_LTO) -fverbose-asm -S -o $@ $<
@@ -134,7 +125,6 @@ cmd_gensymtypes_c =                                                         \
 quiet_cmd_cc_symtypes_c = SYM $(quiet_modtag) $@
 cmd_cc_symtypes_c =                                                         \
-    set -e;                                                                 \
    $(call cmd_gensymtypes_c,true,$@) >/dev/null;                           \
    test -s $@ || rm -f $@
@@ -154,36 +144,31 @@ $(obj)/%.ll: $(src)/%.c FORCE
 # (See cmd_cc_o_c + relevant part of rule_cc_o_c)
 quiet_cmd_cc_o_c = CC $(quiet_modtag)  $@
+      cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $<
-ifndef CONFIG_MODVERSIONS
+ifdef CONFIG_MODVERSIONS
-cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $<
-else
 # When module versioning is enabled the following steps are executed:
-# o compile a .tmp_<file>.o from <file>.c
+# o compile a <file>.o from <file>.c
-# o if .tmp_<file>.o doesn't contain a __ksymtab version, i.e. does
+# o if <file>.o doesn't contain a __ksymtab version, i.e. does
-#   not export symbols, we just rename .tmp_<file>.o to <file>.o and
+#   not export symbols, it's done.
-#   are done.
 # o otherwise, we calculate symbol versions using the good old
 #   genksyms on the preprocessed source and postprocess them in a way
 #   that they are usable as a linker script
-# o generate <file>.o from .tmp_<file>.o using the linker to
+# o generate .tmp_<file>.o from <file>.o using the linker to
 #   replace the unresolved symbols __crc_exported_symbol with
 #   the actual value of the checksum generated by genksyms
+# o remove .tmp_<file>.o to <file>.o
-cmd_cc_o_c = $(CC) $(c_flags) -c -o $(@D)/.tmp_$(@F) $<
 cmd_modversions_c =                                                             \
-        if $(OBJDUMP) -h $(@D)/.tmp_$(@F) | grep -q __ksymtab; then             \
+        if $(OBJDUMP) -h $@ | grep -q __ksymtab; then                           \
                $(call cmd_gensymtypes_c,$(KBUILD_SYMTYPES),$(@:.o=.symtypes))  \
                    > $(@D)/.tmp_$(@F:.o=.ver);                                 \
                                                                                \
-                $(LD) $(KBUILD_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                                                                    \
                mv -f $(@D)/.tmp_$(@F) $@;                                      \
-        fi;
+                rm -f $(@D)/.tmp_$(@F:.o=.ver);                                 \
+        fi
 endif
 ifdef CONFIG_FTRACE_MCOUNT_RECORD
@@ -204,7 +189,7 @@ sub_cmd_record_mcount =					\
 recordmcount_source := $(srctree)/scripts/recordmcount.c \
                    $(srctree)/scripts/recordmcount.h
 else
-sub_cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \
+sub_cmd_record_mcount = perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \
        "$(if $(CONFIG_CPU_BIG_ENDIAN),big,little)" \
        "$(if $(CONFIG_64BIT),64,32)" \
        "$(OBJDUMP)" "$(OBJCOPY)" "$(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS)" \
@@ -216,7 +201,7 @@ cmd_record_mcount =						\
        if [ "$(findstring $(CC_FLAGS_FTRACE),$(_c_flags))" =   \
             "$(CC_FLAGS_FTRACE)" ]; then                       \
                $(sub_cmd_record_mcount)                        \
-        fi;
+        fi
 endif # CC_USING_RECORD_MCOUNT
 endif # CONFIG_FTRACE_MCOUNT_RECORD
@@ -236,24 +221,15 @@ ifdef CONFIG_GCOV_KERNEL
 objtool_args += --no-unreachable
 endif
 ifdef CONFIG_RETPOLINE
-ifneq ($(RETPOLINE_CFLAGS),)
  objtool_args += --retpoline
 endif
-endif
-ifdef CONFIG_MODVERSIONS
-objtool_o = $(@D)/.tmp_$(@F)
-else
-objtool_o = $(@)
-endif
 # 'OBJECT_FILES_NON_STANDARD := y': skip objtool checking for a directory
 # 'OBJECT_FILES_NON_STANDARD_foo.o := 'y': skip objtool checking for a file
 # 'OBJECT_FILES_NON_STANDARD_foo.o := 'n': override directory skip for a file
 cmd_objtool = $(if $(patsubst y%,, \
        $(OBJECT_FILES_NON_STANDARD_$(basetarget).o)$(OBJECT_FILES_NON_STANDARD)n), \
-        $(__objtool_obj) $(objtool_args) "$(objtool_o)";)
+        $(__objtool_obj) $(objtool_args) $@)
 objtool_obj = $(if $(patsubst y%,, \
        $(OBJECT_FILES_NON_STANDARD_$(basetarget).o)$(OBJECT_FILES_NON_STANDARD)n), \
        $(__objtool_obj))
@@ -266,19 +242,26 @@ objtool_dep = $(objtool_obj)					\
              $(wildcard include/config/orc/unwinder.h          \
                         include/config/stack/validation.h)
+ifdef CONFIG_TRIM_UNUSED_KSYMS
+cmd_gen_ksymdeps = \
+        $(CONFIG_SHELL) $(srctree)/scripts/gen_ksymdeps.sh $@ >> $(dot-target).cmd
+endif
 define rule_cc_o_c
-        $(call echo-cmd,checksrc) $(cmd_checksrc)                         \
+        $(call cmd,checksrc)
-        $(call cmd_and_fixdep,cc_o_c)                                     \
+        $(call cmd_and_fixdep,cc_o_c)
-        $(cmd_checkdoc)                                                   \
+        $(call cmd,gen_ksymdeps)
-        $(call echo-cmd,objtool) $(cmd_objtool)                           \
+        $(call cmd,checkdoc)
-        $(cmd_modversions_c)                                              \
+        $(call cmd,objtool)
-        $(call echo-cmd,record_mcount) $(cmd_record_mcount)
+        $(call cmd,modversions_c)
+        $(call cmd,record_mcount)
 endef
 define rule_as_o_S
-        $(call cmd_and_fixdep,as_o_S)                                     \
+        $(call cmd_and_fixdep,as_o_S)
-        $(call echo-cmd,objtool) $(cmd_objtool)                           \
+        $(call cmd,gen_ksymdeps)
-        $(cmd_modversions_S)
+        $(call cmd,objtool)
+        $(call cmd,modversions_S)
 endef
 # List module undefined symbols (or empty line if not enabled)
@@ -342,7 +325,6 @@ cmd_gensymtypes_S =                                                         \
 quiet_cmd_cc_symtypes_S = SYM $(quiet_modtag) $@
 cmd_cc_symtypes_S =                                                         \
-    set -e;                                                                 \
    $(call cmd_gensymtypes_S,true,$@) >/dev/null;                           \
    test -s $@ || rm -f $@
@@ -357,35 +339,27 @@ $(obj)/%.s: $(src)/%.S FORCE
        $(call if_changed_dep,cpp_s_S)
 quiet_cmd_as_o_S = AS $(quiet_modtag)  $@
+      cmd_as_o_S = $(CC) $(a_flags) -c -o $@ $<
-ifndef CONFIG_MODVERSIONS
+ifdef CONFIG_MODVERSIONS
-cmd_as_o_S = $(CC) $(a_flags) -c -o $@ $<
-else
 ASM_PROTOTYPES := $(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/asm-prototypes.h)
-ifeq ($(ASM_PROTOTYPES),)
+ifneq ($(ASM_PROTOTYPES),)
-cmd_as_o_S = $(CC) $(a_flags) -c -o $@ $<
-else
 # versioning matches the C process described above, with difference that
 # we parse asm-prototypes.h C header to get function definitions.
-cmd_as_o_S = $(CC) $(a_flags) -c -o $(@D)/.tmp_$(@F) $<
 cmd_modversions_S =                                                             \
-        if $(OBJDUMP) -h $(@D)/.tmp_$(@F) | grep -q __ksymtab; then             \
+        if $(OBJDUMP) -h $@ | grep -q __ksymtab; then                           \
                $(call cmd_gensymtypes_S,$(KBUILD_SYMTYPES),$(@:.o=.symtypes))  \
                    > $(@D)/.tmp_$(@F:.o=.ver);                                 \
                                                                                \
-                $(LD) $(KBUILD_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                                                                    \
                mv -f $(@D)/.tmp_$(@F) $@;                                      \
-        fi;
+                rm -f $(@D)/.tmp_$(@F:.o=.ver);                                 \
+        fi
 endif
 endif
@@ -529,25 +503,19 @@ FORCE:
 # optimization, we don't need to read them if the target does not
 # exist, we will rebuild anyway in that case.
-cmd_files := $(wildcard $(foreach f,$(sort $(targets)),$(dir $(f)).$(notdir $(f)).cmd))
+existing-targets := $(wildcard $(sort $(targets)))
-ifneq ($(cmd_files),)
+-include $(foreach f,$(existing-targets),$(dir $(f)).$(notdir $(f)).cmd)
-  include $(cmd_files)
-endif
 ifneq ($(KBUILD_SRC),)
 # Create directories for object files if they do not exist
 obj-dirs := $(sort $(obj) $(patsubst %/,%, $(dir $(targets))))
-# If cmd_files exist, their directories apparently exist.  Skip mkdir.
+# If targets exist, their directories apparently exist. Skip mkdir.
-exist-dirs := $(sort $(patsubst %/,%, $(dir $(cmd_files))))
+existing-dirs := $(sort $(patsubst %/,%, $(dir $(existing-targets))))
-obj-dirs := $(strip $(filter-out $(exist-dirs), $(obj-dirs)))
+obj-dirs := $(strip $(filter-out $(existing-dirs), $(obj-dirs)))
 ifneq ($(obj-dirs),)
 $(shell mkdir -p $(obj-dirs))
 endif
 endif
-# Some files contained in $(targets) are intermediate artifacts.
-# We never want them to be removed automatically.
-.SECONDARY: $(targets)
 .PHONY: $(PHONY)
diff --git a/scripts/Makefile.gcc-plugins b/scripts/Makefile.gcc-plugins
index 46c5c6809806..35042d96cf5d 100644
--- a/scripts/Makefile.gcc-plugins
+++ b/scripts/Makefile.gcc-plugins
@@ -36,6 +36,12 @@ ifdef CONFIG_GCC_PLUGIN_STACKLEAK
 endif
 export DISABLE_STACKLEAK_PLUGIN
+gcc-plugin-$(CONFIG_GCC_PLUGIN_ARM_SSP_PER_TASK) += arm_ssp_per_task_plugin.so
+ifdef CONFIG_GCC_PLUGIN_ARM_SSP_PER_TASK
+    DISABLE_ARM_SSP_PER_TASK_PLUGIN += -fplugin-arg-arm_ssp_per_task_plugin-disable
+endif
+export DISABLE_ARM_SSP_PER_TASK_PLUGIN
 # 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))
@@ -49,11 +55,3 @@ KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
 # All enabled GCC plugins are collected here for building below.
 GCC_PLUGIN := $(gcc-plugin-y)
 export GCC_PLUGIN
-# Actually do the build, if requested.
-PHONY += gcc-plugins
-gcc-plugins: scripts_basic
-ifdef CONFIG_GCC_PLUGINS
-        $(Q)$(MAKE) $(build)=scripts/gcc-plugins
-endif
-        @:
diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
index d5e131471131..3d1ebaabd1b6 100644
--- a/scripts/Makefile.headersinst
+++ b/scripts/Makefile.headersinst
@@ -44,7 +44,6 @@ kbuild-file := $(srctree)/$(obj)/Kbuild
 installdir    := $(INSTALL_HDR_PATH)/$(dst)
 gendir        := $(objtree)/$(subst include/,include/generated/,$(obj))
 header-files  := $(notdir $(wildcard $(srcdir)/*.h))
-header-files  += $(notdir $(wildcard $(srcdir)/*.agh))
 header-files  := $(filter-out $(no-export-headers), $(header-files))
 genhdr-files  := $(notdir $(wildcard $(gendir)/*.h))
 genhdr-files  := $(filter-out $(header-files), $(genhdr-files))
@@ -57,13 +56,6 @@ check-file    := $(installdir)/.check
 all-files     := $(header-files) $(genhdr-files)
 output-files  := $(addprefix $(installdir)/, $(all-files))
-ifneq ($(mandatory-y),)
-missing       := $(filter-out $(all-files),$(mandatory-y))
-ifneq ($(missing),)
-$(error Some mandatory headers ($(missing)) are missing in $(obj))
-endif
-endif
 # Work out what needs to be removed
 oldheaders    := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h))
 unwanted      := $(filter-out $(all-files),$(oldheaders))
diff --git a/scripts/Makefile.kasan b/scripts/Makefile.kasan
index 69552a39951d..25c259df8ffa 100644
--- a/scripts/Makefile.kasan
+++ b/scripts/Makefile.kasan
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
-ifdef CONFIG_KASAN
+ifdef CONFIG_KASAN_GENERIC
 ifdef CONFIG_KASAN_INLINE
        call_threshold := 10000
 else
@@ -12,36 +13,44 @@ CFLAGS_KASAN_MINIMAL := -fsanitize=kernel-address
 cc-param = $(call cc-option, -mllvm -$(1), $(call cc-option, --param $(1)))
-ifeq ($(call cc-option, $(CFLAGS_KASAN_MINIMAL) -Werror),)
+# -fasan-shadow-offset fails without -fsanitize
-   ifneq ($(CONFIG_COMPILE_TEST),y)
+CFLAGS_KASAN_SHADOW := $(call cc-option, -fsanitize=kernel-address \
-        $(warning Cannot use CONFIG_KASAN: \
-            -fsanitize=kernel-address is not supported by compiler)
-   endif
-else
-   # -fasan-shadow-offset fails without -fsanitize
-   CFLAGS_KASAN_SHADOW := $(call cc-option, -fsanitize=kernel-address \
                        -fasan-shadow-offset=$(KASAN_SHADOW_OFFSET), \
                        $(call cc-option, -fsanitize=kernel-address \
                        -mllvm -asan-mapping-offset=$(KASAN_SHADOW_OFFSET)))
-   ifeq ($(strip $(CFLAGS_KASAN_SHADOW)),)
+ifeq ($(strip $(CFLAGS_KASAN_SHADOW)),)
-      CFLAGS_KASAN := $(CFLAGS_KASAN_MINIMAL)
+        CFLAGS_KASAN := $(CFLAGS_KASAN_MINIMAL)
-   else
+else
-      # Now add all the compiler specific options that are valid standalone
+        # Now add all the compiler specific options that are valid standalone
-      CFLAGS_KASAN := $(CFLAGS_KASAN_SHADOW) \
+        CFLAGS_KASAN := $(CFLAGS_KASAN_SHADOW) \
-        $(call cc-param,asan-globals=1) \
+         $(call cc-param,asan-globals=1) \
-        $(call cc-param,asan-instrumentation-with-call-threshold=$(call_threshold)) \
+         $(call cc-param,asan-instrumentation-with-call-threshold=$(call_threshold)) \
-        $(call cc-param,asan-stack=1) \
+         $(call cc-param,asan-stack=1) \
-        $(call cc-param,asan-use-after-scope=1) \
+         $(call cc-param,asan-use-after-scope=1) \
-        $(call cc-param,asan-instrument-allocas=1)
+         $(call cc-param,asan-instrument-allocas=1)
-   endif
 endif
 ifdef CONFIG_KASAN_EXTRA
 CFLAGS_KASAN += $(call cc-option, -fsanitize-address-use-after-scope)
 endif
-CFLAGS_KASAN_NOSANITIZE := -fno-builtin
+endif # CONFIG_KASAN_GENERIC
+ifdef CONFIG_KASAN_SW_TAGS
+ifdef CONFIG_KASAN_INLINE
+    instrumentation_flags := -mllvm -hwasan-mapping-offset=$(KASAN_SHADOW_OFFSET)
+else
+    instrumentation_flags := -mllvm -hwasan-instrument-with-calls=1
+endif
+CFLAGS_KASAN := -fsanitize=kernel-hwaddress \
+                -mllvm -hwasan-instrument-stack=0 \
+                $(instrumentation_flags)
+endif # CONFIG_KASAN_SW_TAGS
+ifdef CONFIG_KASAN
+CFLAGS_KASAN_NOSANITIZE := -fno-builtin
 endif
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 8fe4468f9bda..12b88d09c3a4 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -61,6 +61,11 @@ real-obj-m := $(foreach m, $(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))
 extra-y                         += $(dtb-y)
 extra-$(CONFIG_OF_ALL_DTBS)     += $(dtb-)
+ifneq ($(CHECK_DTBS),)
+extra-y += $(patsubst %.dtb,%.dt.yaml, $(dtb-y))
+extra-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtb,%.dt.yaml, $(dtb-))
+endif
 # Add subdir path
 extra-y         := $(addprefix $(obj)/,$(extra-y))
@@ -237,8 +242,7 @@ cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@
 # ---------------------------------------------------------------------------
 quiet_cmd_gzip = GZIP    $@
-cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -n -f -9 > $@) || \
+      cmd_gzip = cat $(filter-out FORCE,$^) | gzip -n -f -9 > $@
-        (rm -f $@ ; false)
 # DTC
 # ---------------------------------------------------------------------------
@@ -251,7 +255,7 @@ DTC_FLAGS += -Wno-unit_address_vs_reg \
        -Wno-avoid_unnecessary_addr_size \
        -Wno-alias_paths \
        -Wno-graph_child_address \
-        -Wno-graph_port \
+        -Wno-simple_bus_reg \
        -Wno-unique_unit_address \
        -Wno-pci_device_reg
 endif
@@ -284,13 +288,28 @@ $(obj)/%.dtb.S: $(obj)/%.dtb FORCE
 quiet_cmd_dtc = DTC     $@
 cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
        $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
-        $(DTC) -O dtb -o $@ -b 0 \
+        $(DTC) -O $(2) -o $@ -b 0 \
                $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(DTC_FLAGS) \
                -d $(depfile).dtc.tmp $(dtc-tmp) ; \
        cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile)
 $(obj)/%.dtb: $(src)/%.dts $(DTC) FORCE
-        $(call if_changed_dep,dtc)
+        $(call if_changed_dep,dtc,dtb)
+DT_CHECKER ?= dt-validate
+DT_BINDING_DIR := Documentation/devicetree/bindings
+DT_TMP_SCHEMA := $(objtree)/$(DT_BINDING_DIR)/processed-schema.yaml
+quiet_cmd_dtb_check =   CHECK   $@
+      cmd_dtb_check =   $(DT_CHECKER) -p $(DT_TMP_SCHEMA) $@ ;
+define rule_dtc_dt_yaml
+        $(call cmd_and_fixdep,dtc,yaml)
+        $(call cmd,dtb_check)
+endef
+$(obj)/%.dt.yaml: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE
+        $(call if_changed_rule,dtc_dt_yaml)
 dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
@@ -316,26 +335,22 @@ printf "%08x\n" $$dec_size |						\
 quiet_cmd_bzip2 = BZIP2   $@
 cmd_bzip2 = (cat $(filter-out FORCE,$^) | \
-        bzip2 -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
+        bzip2 -9 && $(call size_append, $(filter-out FORCE,$^))) > $@
-        (rm -f $@ ; false)
 # Lzma
 # ---------------------------------------------------------------------------
 quiet_cmd_lzma = LZMA    $@
 cmd_lzma = (cat $(filter-out FORCE,$^) | \
-        lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
+        lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@
-        (rm -f $@ ; false)
 quiet_cmd_lzo = LZO     $@
 cmd_lzo = (cat $(filter-out FORCE,$^) | \
-        lzop -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
+        lzop -9 && $(call size_append, $(filter-out FORCE,$^))) > $@
-        (rm -f $@ ; false)
 quiet_cmd_lz4 = LZ4     $@
 cmd_lz4 = (cat $(filter-out FORCE,$^) | \
-        lz4c -l -c1 stdin stdout && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
+        lz4c -l -c1 stdin stdout && $(call size_append, $(filter-out FORCE,$^))) > $@
-        (rm -f $@ ; false)
 # U-Boot mkimage
 # ---------------------------------------------------------------------------
@@ -351,15 +366,13 @@ UIMAGE_TYPE ?= kernel
 UIMAGE_LOADADDR ?= arch_must_set_this
 UIMAGE_ENTRYADDR ?= $(UIMAGE_LOADADDR)
 UIMAGE_NAME ?= 'Linux-$(KERNELRELEASE)'
-UIMAGE_IN ?= $<
-UIMAGE_OUT ?= $@
-quiet_cmd_uimage = UIMAGE  $(UIMAGE_OUT)
+quiet_cmd_uimage = UIMAGE  $@
      cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A $(UIMAGE_ARCH) -O linux \
                        -C $(UIMAGE_COMPRESSION) $(UIMAGE_OPTS-y) \
                        -T $(UIMAGE_TYPE) \
                        -a $(UIMAGE_LOADADDR) -e $(UIMAGE_ENTRYADDR) \
-                        -n $(UIMAGE_NAME) -d $(UIMAGE_IN) $(UIMAGE_OUT)
+                        -n $(UIMAGE_NAME) -d $< $@
 # XZ
 # ---------------------------------------------------------------------------
@@ -381,13 +394,11 @@ quiet_cmd_uimage = UIMAGE  $(UIMAGE_OUT)
 quiet_cmd_xzkern = XZKERN  $@
 cmd_xzkern = (cat $(filter-out FORCE,$^) | \
        sh $(srctree)/scripts/xz_wrap.sh && \
-        $(call size_append, $(filter-out FORCE,$^))) > $@ || \
+        $(call size_append, $(filter-out FORCE,$^))) > $@
-        (rm -f $@ ; false)
 quiet_cmd_xzmisc = XZMISC  $@
 cmd_xzmisc = (cat $(filter-out FORCE,$^) | \
-        xz --check=crc32 --lzma2=dict=1MiB) > $@ || \
+        xz --check=crc32 --lzma2=dict=1MiB) > $@
-        (rm -f $@ ; false)
 # ASM offsets
 # ---------------------------------------------------------------------------
@@ -406,7 +417,6 @@ endef
 # Use filechk to avoid rebuilds when a header changes, but the resulting file
 # does not
 define filechk_offsets
-        (set -e; \
         echo "#ifndef $2"; \
         echo "#define $2"; \
         echo "/*"; \
@@ -417,5 +427,5 @@ define filechk_offsets
         echo ""; \
         sed -ne $(sed-offsets) < $<; \
         echo ""; \
-         echo "#endif" )
+         echo "#endif"
 endef
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index 850966f3d602..facbd603adf6 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -105,8 +105,7 @@
 static void usage(void)
 {
-        fprintf(stderr, "Usage: fixdep [-e] <depfile> <target> <cmdline>\n");
+        fprintf(stderr, "Usage: fixdep <depfile> <target> <cmdline>\n");
-        fprintf(stderr, " -e  insert extra dependencies given on stdin\n");
        exit(1);
 }
@@ -131,21 +130,6 @@ static void print_dep(const char *m, int slen, const char *dir)
        printf(".h) \\\n");
 }
-static void do_extra_deps(void)
-{
-        char buf[80];
-        while (fgets(buf, sizeof(buf), stdin)) {
-                int len = strlen(buf);
-                if (len < 2 || buf[len - 1] != '\n') {
-                        fprintf(stderr, "fixdep: bad data on stdin\n");
-                        exit(1);
-                }
-                print_dep(buf, len - 1, "include/ksym");
-        }
-}
 struct item {
        struct item     *next;
        unsigned int    len;
@@ -293,7 +277,7 @@ static int is_ignored_file(const char *s, int len)
 * assignments are parsed not only by make, but also by the rather simple
 * parser in scripts/mod/sumversion.c.
 */
-static void parse_dep_file(char *m, const char *target, int insert_extra_deps)
+static void parse_dep_file(char *m, const char *target)
 {
        char *p;
        int is_last, is_target;
@@ -369,9 +353,6 @@ static void parse_dep_file(char *m, const char *target, int insert_extra_deps)
                exit(1);
        }
-        if (insert_extra_deps)
-                do_extra_deps();
        printf("\n%s: $(deps_%s)\n\n", target, target);
        printf("$(deps_%s):\n", target);
 }
@@ -379,13 +360,9 @@ static void parse_dep_file(char *m, const char *target, int insert_extra_deps)
 int main(int argc, char *argv[])
 {
        const char *depfile, *target, *cmdline;
-        int insert_extra_deps = 0;
        void *buf;
-        if (argc == 5 && !strcmp(argv[1], "-e")) {
+        if (argc != 4)
-                insert_extra_deps = 1;
-                argv++;
-        } else if (argc != 4)
                usage();
        depfile = argv[1];
@@ -395,7 +372,7 @@ int main(int argc, char *argv[])
        printf("cmd_%s := %s\n\n", target, cmdline);
        buf = read_file(depfile);
-        parse_dep_file(buf, target, insert_extra_deps);
+        parse_dep_file(buf, target);
        free(buf);
        return 0;
diff --git a/scripts/bloat-o-meter b/scripts/bloat-o-meter
index a923f05edb36..8c965f6a9881 100755
--- a/scripts/bloat-o-meter
+++ b/scripts/bloat-o-meter
@@ -32,6 +32,7 @@ def getsizes(file, format):
                if name.startswith("__mod_"): continue
                if name.startswith("__se_sys"): continue
                if name.startswith("__se_compat_sys"): continue
+                if name.startswith("__addressable_"): continue
                if name == "linux_banner": continue
                # statics and some other optimizations adds random .NUMBER
                name = re_NUMBER.sub('', name)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index c883ec55654f..b737ca9d7204 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -468,6 +468,7 @@ our $logFunctions = qr{(?x:
 our $signature_tags = qr{(?xi:
        Signed-off-by:|
+        Co-developed-by:|
        Acked-by:|
        Tested-by:|
        Reviewed-by:|
@@ -573,6 +574,27 @@ foreach my $entry (@mode_permission_funcs) {
 }
 $mode_perms_search = "(?:${mode_perms_search})";
+our %deprecated_apis = (
+        "synchronize_rcu_bh"                    => "synchronize_rcu",
+        "synchronize_rcu_bh_expedited"          => "synchronize_rcu_expedited",
+        "call_rcu_bh"                           => "call_rcu",
+        "rcu_barrier_bh"                        => "rcu_barrier",
+        "synchronize_sched"                     => "synchronize_rcu",
+        "synchronize_sched_expedited"           => "synchronize_rcu_expedited",
+        "call_rcu_sched"                        => "call_rcu",
+        "rcu_barrier_sched"                     => "rcu_barrier",
+        "get_state_synchronize_sched"           => "get_state_synchronize_rcu",
+        "cond_synchronize_sched"                => "cond_synchronize_rcu",
+);
+#Create a search pattern for all these strings to speed up a loop below
+our $deprecated_apis_search = "";
+foreach my $entry (keys %deprecated_apis) {
+        $deprecated_apis_search .= '|' if ($deprecated_apis_search ne "");
+        $deprecated_apis_search .= $entry;
+}
+$deprecated_apis_search = "(?:${deprecated_apis_search})";
 our $mode_perms_world_writable = qr{
        S_IWUGO         |
        S_IWOTH         |
@@ -3869,14 +3891,23 @@ sub process {
                        WARN("STATIC_CONST_CHAR_ARRAY",
                             "static const char * array should probably be static const char * const\n" .
                                $herecurr);
-               }
+                }
+# check for initialized const char arrays that should be static const
+                if ($line =~ /^\+\s*const\s+(char|unsigned\s+char|_*u8|(?:[us]_)?int8_t)\s+\w+\s*\[\s*(?:\w+\s*)?\]\s*=\s*"/) {
+                        if (WARN("STATIC_CONST_CHAR_ARRAY",
+                                 "const array should probably be static const\n" . $herecurr) &&
+                            $fix) {
+                                $fixed[$fixlinenr] =~ s/(^.\s*)const\b/${1}static const/;
+                        }
+                }
 # check for static char foo[] = "bar" declarations.
                if ($line =~ /\bstatic\s+char\s+(\w+)\s*\[\s*\]\s*=\s*"/) {
                        WARN("STATIC_CONST_CHAR_ARRAY",
                             "static char array declaration should probably be static const char\n" .
                                $herecurr);
-               }
+                }
 # check for const <foo> const where <foo> is not a pointer or array type
                if ($sline =~ /\bconst\s+($BasicType)\s+const\b/) {
@@ -6368,6 +6399,20 @@ sub process {
                             "please use device_initcall() or more appropriate function instead of __initcall() (see include/linux/init.h)\n" . $herecurr);
                }
+# check for spin_is_locked(), suggest lockdep instead
+                if ($line =~ /\bspin_is_locked\(/) {
+                        WARN("USE_LOCKDEP",
+                             "Where possible, use lockdep_assert_held instead of assertions based on spin_is_locked\n" . $herecurr);
+                }
+# check for deprecated apis
+                if ($line =~ /\b($deprecated_apis_search)\b\s*\(/) {
+                        my $deprecated_api = $1;
+                        my $new_api = $deprecated_apis{$deprecated_api};
+                        WARN("DEPRECATED_API",
+                             "Deprecated use of '$deprecated_api', prefer '$new_api' instead\n" . $herecurr);
+                }
 # check for various structs that are normally const (ops, kgdb, device_tree)
 # and avoid what seem like struct definitions 'struct foo {'
                if ($line !~ /\bconst\b/ &&
diff --git a/scripts/checkstack.pl b/scripts/checkstack.pl
index 8081b6cf67d2..122aef5e4e14 100755
--- a/scripts/checkstack.pl
+++ b/scripts/checkstack.pl
@@ -47,8 +47,10 @@ my (@stack, $re, $dre, $x, $xs, $funcre);
        $xs     = "[0-9a-f ]";  # hex character or space
        $funcre = qr/^$x* <(.*)>:$/;
        if ($arch eq 'aarch64') {
-                #ffffffc0006325cc:       a9bb7bfd        stp     x29, x30, [sp,#-80]!
+                #ffffffc0006325cc:       a9bb7bfd        stp     x29, x30, [sp, #-80]!
-                $re = qr/^.*stp.*sp,\#-([0-9]{1,8})\]\!/o;
+                #a110:       d11643ff        sub     sp, sp, #0x590
+                $re = qr/^.*stp.*sp, \#-([0-9]{1,8})\]\!/o;
+                $dre = qr/^.*sub.*sp, sp, #(0x$x{1,8})/o;
        } elsif ($arch eq 'arm') {
                #c0008ffc:      e24dd064        sub     sp, sp, #100    ; 0x64
                $re = qr/.*sub.*sp, sp, #(([0-9]{2}|[3-9])[0-9]{2})/o;
diff --git a/scripts/checksyscalls.sh b/scripts/checksyscalls.sh
index ee3dfb5be6cd..cf931003395f 100755
--- a/scripts/checksyscalls.sh
+++ b/scripts/checksyscalls.sh
@@ -150,6 +150,7 @@ cat << EOF
 #define __IGNORE_uselib
 #define __IGNORE__sysctl
 #define __IGNORE_arch_prctl
+#define __IGNORE_nfsservctl
 /* ... including the "new" 32-bit uid syscalls */
 #define __IGNORE_lchown32
diff --git a/scripts/coccinelle/api/alloc/alloc_cast.cocci b/scripts/coccinelle/api/alloc/alloc_cast.cocci
index 408ee3879f9b..18fedf7c60ed 100644
--- a/scripts/coccinelle/api/alloc/alloc_cast.cocci
+++ b/scripts/coccinelle/api/alloc/alloc_cast.cocci
@@ -32,7 +32,7 @@ type T;
  (T *)
  \(kmalloc\|kzalloc\|kcalloc\|kmem_cache_alloc\|kmem_cache_zalloc\|
   kmem_cache_alloc_node\|kmalloc_node\|kzalloc_node\|vmalloc\|vzalloc\|
-   dma_alloc_coherent\|dma_zalloc_coherent\|devm_kmalloc\|devm_kzalloc\|
+   dma_alloc_coherent\|devm_kmalloc\|devm_kzalloc\|
   kvmalloc\|kvzalloc\|kvmalloc_node\|kvzalloc_node\|pci_alloc_consistent\|
   pci_zalloc_consistent\|kmem_alloc\|kmem_zalloc\|kmem_zone_alloc\|
   kmem_zone_zalloc\|vmalloc_node\|vzalloc_node\)(...)
@@ -55,7 +55,7 @@ type r1.T;
 * (T *)
  \(kmalloc\|kzalloc\|kcalloc\|kmem_cache_alloc\|kmem_cache_zalloc\|
   kmem_cache_alloc_node\|kmalloc_node\|kzalloc_node\|vmalloc\|vzalloc\|
-   dma_alloc_coherent\|dma_zalloc_coherent\|devm_kmalloc\|devm_kzalloc\|
+   dma_alloc_coherent\|devm_kmalloc\|devm_kzalloc\|
   kvmalloc\|kvzalloc\|kvmalloc_node\|kvzalloc_node\|pci_alloc_consistent\|
   pci_zalloc_consistent\|kmem_alloc\|kmem_zalloc\|kmem_zone_alloc\|
   kmem_zone_zalloc\|vmalloc_node\|vzalloc_node\)(...)
@@ -78,7 +78,7 @@ type r1.T;
 - (T *)
  \(kmalloc\|kzalloc\|kcalloc\|kmem_cache_alloc\|kmem_cache_zalloc\|
   kmem_cache_alloc_node\|kmalloc_node\|kzalloc_node\|vmalloc\|vzalloc\|
-   dma_alloc_coherent\|dma_zalloc_coherent\|devm_kmalloc\|devm_kzalloc\|
+   dma_alloc_coherent\|devm_kmalloc\|devm_kzalloc\|
   kvmalloc\|kvzalloc\|kvmalloc_node\|kvzalloc_node\|pci_alloc_consistent\|
   pci_zalloc_consistent\|kmem_alloc\|kmem_zalloc\|kmem_zone_alloc\|
   kmem_zone_zalloc\|vmalloc_node\|vzalloc_node\)(...)
@@ -95,7 +95,7 @@ position p;
 (T@p *)
  \(kmalloc\|kzalloc\|kcalloc\|kmem_cache_alloc\|kmem_cache_zalloc\|
   kmem_cache_alloc_node\|kmalloc_node\|kzalloc_node\|vmalloc\|vzalloc\|
-   dma_alloc_coherent\|dma_zalloc_coherent\|devm_kmalloc\|devm_kzalloc\|
+   dma_alloc_coherent\|devm_kmalloc\|devm_kzalloc\|
   kvmalloc\|kvzalloc\|kvmalloc_node\|kvzalloc_node\|pci_alloc_consistent\|
   pci_zalloc_consistent\|kmem_alloc\|kmem_zalloc\|kmem_zone_alloc\|
   kmem_zone_zalloc\|vmalloc_node\|vzalloc_node\)(...)
diff --git a/scripts/coccinelle/api/alloc/zalloc-simple.cocci b/scripts/coccinelle/api/alloc/zalloc-simple.cocci
index d819275b7fde..5cd1991c582e 100644
--- a/scripts/coccinelle/api/alloc/zalloc-simple.cocci
+++ b/scripts/coccinelle/api/alloc/zalloc-simple.cocci
@@ -69,15 +69,6 @@ statement S;
 - x = (T)vmalloc(E1);
 + x = (T)vzalloc(E1);
 |
- x = dma_alloc_coherent(E2,E1,E3,E4);
-+ x = dma_zalloc_coherent(E2,E1,E3,E4);
-|
- x = (T *)dma_alloc_coherent(E2,E1,E3,E4);
-+ x = dma_zalloc_coherent(E2,E1,E3,E4);
-|
- x = (T)dma_alloc_coherent(E2,E1,E3,E4);
-+ x = (T)dma_zalloc_coherent(E2,E1,E3,E4);
-|
 - x = kmalloc_node(E1,E2,E3);
 + x = kzalloc_node(E1,E2,E3);
 |
@@ -225,7 +216,7 @@ p << r2.p;
 x << r2.x;
 @@
-msg="WARNING: dma_zalloc_coherent should be used for %s, instead of dma_alloc_coherent/memset" % (x)
+msg="WARNING: dma_alloc_coherent use in %s already zeroes out memory,  so memset is not needed" % (x)
 coccilib.report.print_report(p[0], msg)
 //-----------------------------------------------------------------
diff --git a/scripts/coccinelle/iterators/use_after_iter.cocci b/scripts/coccinelle/iterators/use_after_iter.cocci
index ce8cc9c006e5..66a1140474c8 100644
--- a/scripts/coccinelle/iterators/use_after_iter.cocci
+++ b/scripts/coccinelle/iterators/use_after_iter.cocci
@@ -35,6 +35,7 @@ iterator name hlist_for_each_entry_from;
 iterator name hlist_for_each_entry_safe;
 statement S;
 position p1,p2;
+type T;
 @@
 (
@@ -125,6 +126,8 @@ sizeof(<+...c...+>)
 |
 &c->member
 |
+T c;
+|
 c = E
 |
 *c@p2
diff --git a/scripts/coccinelle/misc/boolinit.cocci b/scripts/coccinelle/misc/boolinit.cocci
index b9abed49cd95..aabb581fab5c 100644
--- a/scripts/coccinelle/misc/boolinit.cocci
+++ b/scripts/coccinelle/misc/boolinit.cocci
@@ -13,10 +13,17 @@ virtual context
 virtual org
 virtual report
+@boolok@
+symbol true,false;
+@@
+(
+true
+|
+false
+)
 @depends on patch@
 bool t;
-symbol true;
-symbol false;
 @@
 (
@@ -63,7 +70,7 @@ bool t;
 + t
 )
-@depends on patch@
+@depends on patch && boolok@
 bool b;
 @@
 (
@@ -116,15 +123,24 @@ position p;
 * t@p != 0
 )
-@r3 depends on !patch@
+@r3 depends on !patch && boolok@
 bool b;
-position p1,p2;
+position p1;
-constant c;
 @@
 (
 *b@p1 = 0
 |
 *b@p1 = 1
+)
+@r4 depends on !patch@
+bool b;
+position p2;
+identifier i;
+constant c != {0,1};
+@@
+(
+ b = i
 |
 *b@p2 = c
 )
@@ -139,19 +155,19 @@ cocci.print_main("WARNING: Comparison to bool",p)
 p << r2.p;
 @@
-cocci.print_main("WARNING: Comparison of bool to 0/1",p)
+cocci.print_main("WARNING: Comparison of 0/1 to bool variable",p)
 @script:python depends on org@
 p1 << r3.p1;
 @@
-cocci.print_main("WARNING: Assignment of bool to 0/1",p1)
+cocci.print_main("WARNING: Assignment of 0/1 to bool variable",p1)
 @script:python depends on org@
-p2 << r3.p2;
+p2 << r4.p2;
 @@
-cocci.print_main("ERROR: Assignment of bool to non-0/1 constant",p2)
+cocci.print_main("ERROR: Assignment of non-0/1 constant to bool variable",p2)
 @script:python depends on report@
 p << r1.p;
@@ -163,16 +179,16 @@ coccilib.report.print_report(p[0],"WARNING: Comparison to bool")
 p << r2.p;
 @@
-coccilib.report.print_report(p[0],"WARNING: Comparison of bool to 0/1")
+coccilib.report.print_report(p[0],"WARNING: Comparison of 0/1 to bool variable")
 @script:python depends on report@
 p1 << r3.p1;
 @@
-coccilib.report.print_report(p1[0],"WARNING: Assignment of bool to 0/1")
+coccilib.report.print_report(p1[0],"WARNING: Assignment of 0/1 to bool variable")
 @script:python depends on report@
-p2 << r3.p2;
+p2 << r4.p2;
 @@
-coccilib.report.print_report(p2[0],"ERROR: Assignment of bool to non-0/1 constant")
+coccilib.report.print_report(p2[0],"ERROR: Assignment of non-0/1 constant to bool variable")
diff --git a/scripts/decode_stacktrace.sh b/scripts/decode_stacktrace.sh
index 64220e36ce3b..98a7d63a723e 100755
--- a/scripts/decode_stacktrace.sh
+++ b/scripts/decode_stacktrace.sh
@@ -78,7 +78,7 @@ parse_symbol() {
        fi
        # Strip out the base of the path
-        code=${code//$basepath/""}
+        code=${code//^$basepath/""}
        # In the case of inlines, move everything to same line
        code=${code//$'\n'/' '}
diff --git a/scripts/decodecode b/scripts/decodecode
index 9cef558528aa..ba8b8d5834e6 100755
--- a/scripts/decodecode
+++ b/scripts/decodecode
@@ -60,6 +60,13 @@ case $width in
 4) type=4byte ;;
 esac
+if [ -z "$ARCH" ]; then
+    case `uname -m` in
+        aarch64*) ARCH=arm64 ;;
+        arm*) ARCH=arm ;;
+    esac
+fi
 disas() {
        ${CROSS_COMPILE}as $AFLAGS -o $1.o $1.s > /dev/null 2>&1
diff --git a/scripts/dtc/Makefile b/scripts/dtc/Makefile
index 056d5da6c477..5f227d8d39d8 100644
--- a/scripts/dtc/Makefile
+++ b/scripts/dtc/Makefile
@@ -12,6 +12,10 @@ dtc-objs	+= dtc-lexer.lex.o dtc-parser.tab.o
 HOST_EXTRACFLAGS := -I$(src)/libfdt
 ifeq ($(wildcard /usr/include/yaml.h),)
+ifneq ($(CHECK_DTBS),)
+$(error dtc needs libyaml for DT schema validation support. \
+        Install the necessary libyaml development package.)
+endif
 HOST_EXTRACFLAGS += -DNO_YAML
 else
 dtc-objs        += yamltree.o
diff --git a/scripts/dtc/checks.c b/scripts/dtc/checks.c
index 9c9b0c328af6..4834e44b37b2 100644
--- a/scripts/dtc/checks.c
+++ b/scripts/dtc/checks.c
@@ -19,6 +19,7 @@
 */
 #include "dtc.h"
+#include "srcpos.h"
 #ifdef TRACE_CHECKS
 #define TRACE(c, ...) \
@@ -78,23 +79,56 @@ static inline void  PRINTF(5, 6) check_msg(struct check *c, struct dt_info *dti,
                                           const char *fmt, ...)
 {
        va_list ap;
-        va_start(ap, fmt);
+        char *str = NULL;
+        struct srcpos *pos = NULL;
+        char *file_str;
+        if (!(c->warn && (quiet < 1)) && !(c->error && (quiet < 2)))
+                return;
+        if (prop && prop->srcpos)
+                pos = prop->srcpos;
+        else if (node && node->srcpos)
+                pos = node->srcpos;
+        if (pos) {
+                file_str = srcpos_string(pos);
+                xasprintf(&str, "%s", file_str);
+                free(file_str);
+        } else if (streq(dti->outname, "-")) {
+                xasprintf(&str, "<stdout>");
+        } else {
+                xasprintf(&str, "%s", dti->outname);
+        }
-        if ((c->warn && (quiet < 1))
+        xasprintf_append(&str, ": %s (%s): ",
-            || (c->error && (quiet < 2))) {
-                fprintf(stderr, "%s: %s (%s): ",
-                        strcmp(dti->outname, "-") ? dti->outname : "<stdout>",
                        (c->error) ? "ERROR" : "Warning", c->name);
-                if (node) {
-                        fprintf(stderr, "%s", node->fullpath);
+        if (node) {
-                        if (prop)
+                if (prop)
-                                fprintf(stderr, ":%s", prop->name);
+                        xasprintf_append(&str, "%s:%s: ", node->fullpath, prop->name);
-                        fputs(": ", stderr);
+                else
-                }
+                        xasprintf_append(&str, "%s: ", node->fullpath);
-                vfprintf(stderr, fmt, ap);
-                fprintf(stderr, "\n");
        }
+        va_start(ap, fmt);
+        xavsprintf_append(&str, fmt, ap);
        va_end(ap);
+        xasprintf_append(&str, "\n");
+        if (!prop && pos) {
+                pos = node->srcpos;
+                while (pos->next) {
+                        pos = pos->next;
+                        file_str = srcpos_string(pos);
+                        xasprintf_append(&str, "  also defined at %s\n", file_str);
+                        free(file_str);
+                }
+        }
+        fputs(str, stderr);
 }
 #define FAIL(c, dti, node, ...)                                         \
@@ -910,7 +944,7 @@ static bool node_is_compatible(struct node *node, const char *compat)
        for (str = prop->val.val, end = str + prop->val.len; str < end;
             str += strnlen(str, end - str) + 1) {
-                if (strprefixeq(str, end - str, compat))
+                if (streq(str, compat))
                        return true;
        }
        return false;
@@ -921,7 +955,8 @@ static void check_simple_bus_bridge(struct check *c, struct dt_info *dti, struct
        if (node_is_compatible(node, "simple-bus"))
                node->bus = &simple_bus;
 }
-WARNING(simple_bus_bridge, check_simple_bus_bridge, NULL, &addr_size_cells);
+WARNING(simple_bus_bridge, check_simple_bus_bridge, NULL,
+        &addr_size_cells, &compatible_is_string_list);
 static void check_simple_bus_reg(struct check *c, struct dt_info *dti, struct node *node)
 {
@@ -1035,6 +1070,7 @@ static const struct bus_type spi_bus = {
 static void check_spi_bus_bridge(struct check *c, struct dt_info *dti, struct node *node)
 {
+        int spi_addr_cells = 1;
        if (strprefixeq(node->name, node->basenamelen, "spi")) {
                node->bus = &spi_bus;
@@ -1063,7 +1099,9 @@ static void check_spi_bus_bridge(struct check *c, struct dt_info *dti, struct no
        if (node->bus != &spi_bus || !node->children)
                return;
-        if (node_addr_cells(node) != 1)
+        if (get_property(node, "spi-slave"))
+                spi_addr_cells = 0;
+        if (node_addr_cells(node) != spi_addr_cells)
                FAIL(c, dti, node, "incorrect #address-cells for SPI bus");
        if (node_size_cells(node) != 0)
                FAIL(c, dti, node, "incorrect #size-cells for SPI bus");
@@ -1082,6 +1120,9 @@ static void check_spi_bus_reg(struct check *c, struct dt_info *dti, struct node
        if (!node->parent || (node->parent->bus != &spi_bus))
                return;
+        if (get_property(node->parent, "spi-slave"))
+                return;
        prop = get_property(node, "reg");
        if (prop)
                cells = (cell_t *)prop->val.val;
diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
index 615b7ec6588f..06c040902444 100644
--- a/scripts/dtc/dtc-lexer.l
+++ b/scripts/dtc/dtc-lexer.l
@@ -213,14 +213,14 @@ static void PRINTF(1, 2) lexical_error(const char *fmt, ...);
 <*>\&{LABEL}    {       /* label reference */
                        DPRINT("Ref: %s\n", yytext+1);
                        yylval.labelref = xstrdup(yytext+1);
-                        return DT_REF;
+                        return DT_LABEL_REF;
                }
 <*>"&{/"{PATHCHAR}*\}   {       /* new-style path reference */
                        yytext[yyleng-1] = '\0';
                        DPRINT("Ref: %s\n", yytext+2);
                        yylval.labelref = xstrdup(yytext+2);
-                        return DT_REF;
+                        return DT_PATH_REF;
                }
 <BYTESTRING>[0-9a-fA-F]{2} {
diff --git a/scripts/dtc/dtc-parser.y b/scripts/dtc/dtc-parser.y
index dd70ebf386f4..2ec981e86111 100644
--- a/scripts/dtc/dtc-parser.y
+++ b/scripts/dtc/dtc-parser.y
@@ -70,7 +70,8 @@ extern bool treesource_error;
 %token <byte> DT_BYTE
 %token <data> DT_STRING
 %token <labelref> DT_LABEL
-%token <labelref> DT_REF
+%token <labelref> DT_LABEL_REF
+%token <labelref> DT_PATH_REF
 %token DT_INCBIN
 %type <data> propdata
@@ -83,6 +84,7 @@ extern bool treesource_error;
 %type <data> bytestring
 %type <prop> propdef
 %type <proplist> proplist
+%type <labelref> dt_ref
 %type <node> devicetree
 %type <node> nodedef
@@ -158,6 +160,8 @@ memreserve:
                }
        ;
+dt_ref: DT_LABEL_REF | DT_PATH_REF;
 devicetree:
          '/' nodedef
                {
@@ -167,7 +171,7 @@ devicetree:
                {
                        $$ = merge_nodes($1, $3);
                }
-        | DT_REF nodedef
+        | dt_ref nodedef
                {
                        /*
                         * We rely on the rule being always:
@@ -176,9 +180,12 @@ devicetree:
                         */
                        if (!($<flags>-1 & DTSF_PLUGIN))
                                ERROR(&@2, "Label or path %s not found", $1);
-                        $$ = add_orphan_node(name_node(build_node(NULL, NULL), ""), $2, $1);
+                        $$ = add_orphan_node(
+                                        name_node(build_node(NULL, NULL, NULL),
+                                                  ""),
+                                        $2, $1);
                }
-        | devicetree DT_LABEL DT_REF nodedef
+        | devicetree DT_LABEL dt_ref nodedef
                {
                        struct node *target = get_node_by_ref($1, $3);
@@ -189,7 +196,7 @@ devicetree:
                                ERROR(&@3, "Label or path %s not found", $3);
                        $$ = $1;
                }
-        | devicetree DT_REF nodedef
+        | devicetree DT_PATH_REF nodedef
                {
                        /*
                         * We rely on the rule being always:
@@ -208,7 +215,26 @@ devicetree:
                        }
                        $$ = $1;
                }
-        | devicetree DT_DEL_NODE DT_REF ';'
+        | devicetree DT_LABEL_REF nodedef
+                {
+                        struct node *target = get_node_by_ref($1, $2);
+                        if (target) {
+                                merge_nodes(target, $3);
+                        } else {
+                                /*
+                                 * We rely on the rule being always:
+                                 *   versioninfo plugindecl memreserves devicetree
+                                 * so $-1 is what we want (plugindecl)
+                                 */
+                                if ($<flags>-1 & DTSF_PLUGIN)
+                                        add_orphan_node($1, $3, $2);
+                                else
+                                        ERROR(&@2, "Label or path %s not found", $2);
+                        }
+                        $$ = $1;
+                }
+        | devicetree DT_DEL_NODE dt_ref ';'
                {
                        struct node *target = get_node_by_ref($1, $3);
@@ -220,7 +246,7 @@ devicetree:
                        $$ = $1;
                }
-        | devicetree DT_OMIT_NO_REF DT_REF ';'
+        | devicetree DT_OMIT_NO_REF dt_ref ';'
                {
                        struct node *target = get_node_by_ref($1, $3);
@@ -237,7 +263,7 @@ devicetree:
 nodedef:
          '{' proplist subnodes '}' ';'
                {
-                        $$ = build_node($2, $3);
+                        $$ = build_node($2, $3, &@$);
                }
        ;
@@ -255,11 +281,11 @@ proplist:
 propdef:
          DT_PROPNODENAME '=' propdata ';'
                {
-                        $$ = build_property($1, $3);
+                        $$ = build_property($1, $3, &@$);
                }
        | DT_PROPNODENAME ';'
                {
-                        $$ = build_property($1, empty_data);
+                        $$ = build_property($1, empty_data, &@$);
                }
        | DT_DEL_PROP DT_PROPNODENAME ';'
                {
@@ -285,7 +311,7 @@ propdata:
                {
                        $$ = data_merge($1, $3);
                }
-        | propdataprefix DT_REF
+        | propdataprefix dt_ref
                {
                        $1 = data_add_marker($1, TYPE_STRING, $2);
                        $$ = data_add_marker($1, REF_PATH, $2);
@@ -383,7 +409,7 @@ arrayprefix:
                        $$.data = data_append_integer($1.data, $2, $1.bits);
                }
-        | arrayprefix DT_REF
+        | arrayprefix dt_ref
                {
                        uint64_t val = ~0ULL >> (64 - $1.bits);
@@ -540,7 +566,7 @@ subnode:
                }
        | DT_DEL_NODE DT_PROPNODENAME ';'
                {
-                        $$ = name_node(build_node_delete(), $2);
+                        $$ = name_node(build_node_delete(&@$), $2);
                }
        | DT_OMIT_NO_REF subnode
                {
diff --git a/scripts/dtc/dtc.c b/scripts/dtc/dtc.c
index 64134aadb997..695e1f789fc7 100644
--- a/scripts/dtc/dtc.c
+++ b/scripts/dtc/dtc.c
@@ -35,6 +35,8 @@ int phandle_format = PHANDLE_EPAPR;	/* Use linux,phandle or phandle properties *
 int generate_symbols;   /* enable symbols & fixup support */
 int generate_fixups;            /* suppress generation of fixups on symbol support */
 int auto_label_aliases;         /* auto generate labels -> aliases */
+int annotate;           /* Level of annotation: 1 for input source location
+                           >1 for full input source location. */
 static int is_power_of_2(int x)
 {
@@ -60,7 +62,7 @@ static void fill_fullpaths(struct node *tree, const char *prefix)
 /* Usage related data. */
 static const char usage_synopsis[] = "dtc [options] <input file>";
-static const char usage_short_opts[] = "qI:O:o:V:d:R:S:p:a:fb:i:H:sW:E:@Ahv";
+static const char usage_short_opts[] = "qI:O:o:V:d:R:S:p:a:fb:i:H:sW:E:@AThv";
 static struct option const usage_long_opts[] = {
        {"quiet",            no_argument, NULL, 'q'},
        {"in-format",         a_argument, NULL, 'I'},
@@ -81,6 +83,7 @@ static struct option const usage_long_opts[] = {
        {"error",             a_argument, NULL, 'E'},
        {"symbols",          no_argument, NULL, '@'},
        {"auto-alias",       no_argument, NULL, 'A'},
+        {"annotate",         no_argument, NULL, 'T'},
        {"help",             no_argument, NULL, 'h'},
        {"version",          no_argument, NULL, 'v'},
        {NULL,               no_argument, NULL, 0x0},
@@ -117,6 +120,7 @@ static const char * const usage_opts_help[] = {
        "\n\tEnable/disable errors (prefix with \"no-\")",
        "\n\tEnable generation of symbols",
        "\n\tEnable auto-alias of labels",
+        "\n\tAnnotate output .dts with input source file and line (-T -T for more details)",
        "\n\tPrint this help and exit",
        "\n\tPrint version and exit",
        NULL,
@@ -264,6 +268,9 @@ int main(int argc, char *argv[])
                case 'A':
                        auto_label_aliases = 1;
                        break;
+                case 'T':
+                        annotate++;
+                        break;
                case 'h':
                        usage(NULL);
@@ -302,6 +309,8 @@ int main(int argc, char *argv[])
                                outform = "dts";
                }
        }
+        if (annotate && (!streq(inform, "dts") || !streq(outform, "dts")))
+                die("--annotate requires -I dts -O dts\n");
        if (streq(inform, "dts"))
                dti = dt_from_source(arg);
        else if (streq(inform, "fs"))
diff --git a/scripts/dtc/dtc.h b/scripts/dtc/dtc.h
index cbe541525c2c..789e0b1bc057 100644
--- a/scripts/dtc/dtc.h
+++ b/scripts/dtc/dtc.h
@@ -58,6 +58,7 @@ extern int phandle_format;	/* Use linux,phandle or phandle properties */
 extern int generate_symbols;    /* generate symbols for nodes with labels */
 extern int generate_fixups;     /* generate fixups */
 extern int auto_label_aliases;  /* auto generate labels -> aliases */
+extern int annotate;            /* annotate .dts with input source location */
 #define PHANDLE_LEGACY  0x1
 #define PHANDLE_EPAPR   0x2
@@ -158,6 +159,7 @@ struct property {
        struct property *next;
        struct label *labels;
+        struct srcpos *srcpos;
 };
 struct node {
@@ -177,6 +179,7 @@ struct node {
        struct label *labels;
        const struct bus_type *bus;
+        struct srcpos *srcpos;
        bool omit_if_unused, is_referenced;
 };
@@ -205,13 +208,15 @@ struct node {
 void add_label(struct label **labels, char *label);
 void delete_labels(struct label **labels);
-struct property *build_property(char *name, struct data val);
+struct property *build_property(char *name, struct data val,
+                                struct srcpos *srcpos);
 struct property *build_property_delete(char *name);
 struct property *chain_property(struct property *first, struct property *list);
 struct property *reverse_properties(struct property *first);
-struct node *build_node(struct property *proplist, struct node *children);
+struct node *build_node(struct property *proplist, struct node *children,
-struct node *build_node_delete(void);
+                        struct srcpos *srcpos);
+struct node *build_node_delete(struct srcpos *srcpos);
 struct node *name_node(struct node *node, char *name);
 struct node *omit_node_if_unused(struct node *node);
 struct node *reference_node(struct node *node);
diff --git a/scripts/dtc/flattree.c b/scripts/dtc/flattree.c
index 851ea87dbc0f..acf04c30669f 100644
--- a/scripts/dtc/flattree.c
+++ b/scripts/dtc/flattree.c
@@ -692,7 +692,7 @@ static struct property *flat_read_property(struct inbuf *dtbuf,
        val = flat_read_data(dtbuf, proplen);
-        return build_property(name, val);
+        return build_property(name, val, NULL);
 }
@@ -750,7 +750,7 @@ static struct node *unflatten_tree(struct inbuf *dtbuf,
        char *flatname;
        uint32_t val;
-        node = build_node(NULL, NULL);
+        node = build_node(NULL, NULL, NULL);
        flatname = flat_read_string(dtbuf);
diff --git a/scripts/dtc/fstree.c b/scripts/dtc/fstree.c
index ae7d06c3c492..1e7eeba47ff6 100644
--- a/scripts/dtc/fstree.c
+++ b/scripts/dtc/fstree.c
@@ -34,7 +34,7 @@ static struct node *read_fstree(const char *dirname)
        if (!d)
                die("Couldn't opendir() \"%s\": %s\n", dirname, strerror(errno));
-        tree = build_node(NULL, NULL);
+        tree = build_node(NULL, NULL, NULL);
        while ((de = readdir(d)) != NULL) {
                char *tmpname;
@@ -60,7 +60,8 @@ static struct node *read_fstree(const char *dirname)
                        } else {
                                prop = build_property(xstrdup(de->d_name),
                                                      data_copy_file(pfile,
-                                                                     st.st_size));
+                                                                     st.st_size),
+                                                      NULL);
                                add_property(tree, prop);
                                fclose(pfile);
                        }
diff --git a/scripts/dtc/libfdt/Makefile.libfdt b/scripts/dtc/libfdt/Makefile.libfdt
index 098b3f36e668..3af3656df801 100644
--- a/scripts/dtc/libfdt/Makefile.libfdt
+++ b/scripts/dtc/libfdt/Makefile.libfdt
@@ -9,3 +9,7 @@ LIBFDT_VERSION = version.lds
 LIBFDT_SRCS = fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c fdt_empty_tree.c \
        fdt_addresses.c fdt_overlay.c
 LIBFDT_OBJS = $(LIBFDT_SRCS:%.c=%.o)
+libfdt_clean:
+        @$(VECHO) CLEAN "(libfdt)"
+        rm -f $(STD_CLEANFILES:%=$(LIBFDT_dir)/%)
diff --git a/scripts/dtc/libfdt/fdt_addresses.c b/scripts/dtc/libfdt/fdt_addresses.c
index 49537b578d03..f13a87dfa068 100644
--- a/scripts/dtc/libfdt/fdt_addresses.c
+++ b/scripts/dtc/libfdt/fdt_addresses.c
@@ -64,7 +64,7 @@ static int fdt_cells(const void *fdt, int nodeoffset, const char *name)
        c = fdt_getprop(fdt, nodeoffset, name, &len);
        if (!c)
-                return 2;
+                return len;
        if (len != sizeof(*c))
                return -FDT_ERR_BADNCELLS;
@@ -78,10 +78,20 @@ static int fdt_cells(const void *fdt, int nodeoffset, const char *name)
 int fdt_address_cells(const void *fdt, int nodeoffset)
 {
-        return fdt_cells(fdt, nodeoffset, "#address-cells");
+        int val;
+        val = fdt_cells(fdt, nodeoffset, "#address-cells");
+        if (val == -FDT_ERR_NOTFOUND)
+                return 2;
+        return val;
 }
 int fdt_size_cells(const void *fdt, int nodeoffset)
 {
-        return fdt_cells(fdt, nodeoffset, "#size-cells");
+        int val;
+        val = fdt_cells(fdt, nodeoffset, "#size-cells");
+        if (val == -FDT_ERR_NOTFOUND)
+                return 1;
+        return val;
 }
diff --git a/scripts/dtc/libfdt/libfdt.h b/scripts/dtc/libfdt/libfdt.h
index 2bd151dd355f..627da2e079c9 100644
--- a/scripts/dtc/libfdt/libfdt.h
+++ b/scripts/dtc/libfdt/libfdt.h
@@ -163,18 +163,26 @@ uint32_t fdt_next_tag(const void *fdt, int offset, int *nextoffset);
 static inline uint32_t fdt32_ld(const fdt32_t *p)
 {
-        fdt32_t v;
+        const uint8_t *bp = (const uint8_t *)p;
-        memcpy(&v, p, sizeof(v));
+        return ((uint32_t)bp[0] << 24)
-        return fdt32_to_cpu(v);
+                | ((uint32_t)bp[1] << 16)
+                | ((uint32_t)bp[2] << 8)
+                | bp[3];
 }
 static inline uint64_t fdt64_ld(const fdt64_t *p)
 {
-        fdt64_t v;
+        const uint8_t *bp = (const uint8_t *)p;
-        memcpy(&v, p, sizeof(v));
+        return ((uint64_t)bp[0] << 56)
-        return fdt64_to_cpu(v);
+                | ((uint64_t)bp[1] << 48)
+                | ((uint64_t)bp[2] << 40)
+                | ((uint64_t)bp[3] << 32)
+                | ((uint64_t)bp[4] << 24)
+                | ((uint64_t)bp[5] << 16)
+                | ((uint64_t)bp[6] << 8)
+                | bp[7];
 }
 /**********************************************************************/
@@ -1145,7 +1153,7 @@ int fdt_address_cells(const void *fdt, int nodeoffset);
 *
 * returns:
 *      0 <= n < FDT_MAX_NCELLS, on success
- *      2, if the node has no #size-cells property
+ *      1, if the node has no #size-cells property
 *      -FDT_ERR_BADNCELLS, if the node has a badly formatted or invalid
 *              #size-cells property
 *      -FDT_ERR_BADMAGIC,
diff --git a/scripts/dtc/livetree.c b/scripts/dtc/livetree.c
index 4ff0679e0062..7a2e6446a17b 100644
--- a/scripts/dtc/livetree.c
+++ b/scripts/dtc/livetree.c
@@ -19,6 +19,7 @@
 */
 #include "dtc.h"
+#include "srcpos.h"
 /*
 * Tree building functions
@@ -50,7 +51,8 @@ void delete_labels(struct label **labels)
                label->deleted = 1;
 }
-struct property *build_property(char *name, struct data val)
+struct property *build_property(char *name, struct data val,
+                                struct srcpos *srcpos)
 {
        struct property *new = xmalloc(sizeof(*new));
@@ -58,6 +60,7 @@ struct property *build_property(char *name, struct data val)
        new->name = name;
        new->val = val;
+        new->srcpos = srcpos_copy(srcpos);
        return new;
 }
@@ -97,7 +100,8 @@ struct property *reverse_properties(struct property *first)
        return head;
 }
-struct node *build_node(struct property *proplist, struct node *children)
+struct node *build_node(struct property *proplist, struct node *children,
+                        struct srcpos *srcpos)
 {
        struct node *new = xmalloc(sizeof(*new));
        struct node *child;
@@ -106,6 +110,7 @@ struct node *build_node(struct property *proplist, struct node *children)
        new->proplist = reverse_properties(proplist);
        new->children = children;
+        new->srcpos = srcpos_copy(srcpos);
        for_each_child(new, child) {
                child->parent = new;
@@ -114,13 +119,14 @@ struct node *build_node(struct property *proplist, struct node *children)
        return new;
 }
-struct node *build_node_delete(void)
+struct node *build_node_delete(struct srcpos *srcpos)
 {
        struct node *new = xmalloc(sizeof(*new));
        memset(new, 0, sizeof(*new));
        new->deleted = 1;
+        new->srcpos = srcpos_copy(srcpos);
        return new;
 }
@@ -183,6 +189,8 @@ struct node *merge_nodes(struct node *old_node, struct node *new_node)
                                old_prop->val = new_prop->val;
                                old_prop->deleted = 0;
+                                free(old_prop->srcpos);
+                                old_prop->srcpos = new_prop->srcpos;
                                free(new_prop);
                                new_prop = NULL;
                                break;
@@ -223,6 +231,8 @@ struct node *merge_nodes(struct node *old_node, struct node *new_node)
                        add_child(old_node, new_child);
        }
+        old_node->srcpos = srcpos_extend(old_node->srcpos, new_node->srcpos);
        /* The new node contents are now merged into the old node.  Free
         * the new node. */
        free(new_node);
@@ -241,18 +251,18 @@ struct node * add_orphan_node(struct node *dt, struct node *new_node, char *ref)
        if (ref[0] == '/') {
                d = data_append_data(d, ref, strlen(ref) + 1);
-                p = build_property("target-path", d);
+                p = build_property("target-path", d, NULL);
        } else {
                d = data_add_marker(d, REF_PHANDLE, ref);
                d = data_append_integer(d, 0xffffffff, 32);
-                p = build_property("target", d);
+                p = build_property("target", d, NULL);
        }
        xasprintf(&name, "fragment@%u",
                        next_orphan_fragment++);
        name_node(new_node, "__overlay__");
-        node = build_node(p, new_node);
+        node = build_node(p, new_node, NULL);
        name_node(node, name);
        add_child(dt, node);
@@ -351,7 +361,7 @@ void append_to_property(struct node *node,
                p->val = d;
        } else {
                d = data_append_data(empty_data, data, len);
-                p = build_property(name, d);
+                p = build_property(name, d, NULL);
                add_property(node, p);
        }
 }
@@ -609,11 +619,11 @@ cell_t get_node_phandle(struct node *root, struct node *node)
        if (!get_property(node, "linux,phandle")
            && (phandle_format & PHANDLE_LEGACY))
-                add_property(node, build_property("linux,phandle", d));
+                add_property(node, build_property("linux,phandle", d, NULL));
        if (!get_property(node, "phandle")
            && (phandle_format & PHANDLE_EPAPR))
-                add_property(node, build_property("phandle", d));
+                add_property(node, build_property("phandle", d, NULL));
        /* If the node *does* have a phandle property, we must
         * be dealing with a self-referencing phandle, which will be
@@ -787,7 +797,7 @@ static struct node *build_and_name_child_node(struct node *parent, char *name)
 {
        struct node *node;
-        node = build_node(NULL, NULL);
+        node = build_node(NULL, NULL, NULL);
        name_node(node, xstrdup(name));
        add_child(parent, node);
@@ -849,7 +859,8 @@ static void generate_label_tree_internal(struct dt_info *dti,
                        /* insert it */
                        p = build_property(l->label,
                                data_copy_mem(node->fullpath,
-                                                strlen(node->fullpath) + 1));
+                                                strlen(node->fullpath) + 1),
+                                NULL);
                        add_property(an, p);
                }
diff --git a/scripts/dtc/srcpos.c b/scripts/dtc/srcpos.c
index cb6ed0e3e5e4..41f83700ee91 100644
--- a/scripts/dtc/srcpos.c
+++ b/scripts/dtc/srcpos.c
@@ -33,6 +33,9 @@ struct search_path {
 /* This is the list of directories that we search for source files */
 static struct search_path *search_path_head, **search_path_tail;
+/* Detect infinite include recursion. */
+#define MAX_SRCFILE_DEPTH     (100)
+static int srcfile_depth; /* = 0 */
 static char *get_dirname(const char *path)
 {
@@ -51,11 +54,51 @@ static char *get_dirname(const char *path)
 FILE *depfile; /* = NULL */
 struct srcfile_state *current_srcfile; /* = NULL */
+static char *initial_path; /* = NULL */
+static int initial_pathlen; /* = 0 */
+static bool initial_cpp = true;
-/* Detect infinite include recursion. */
+static void set_initial_path(char *fname)
-#define MAX_SRCFILE_DEPTH     (100)
+{
-static int srcfile_depth; /* = 0 */
+        int i, len = strlen(fname);
+        xasprintf(&initial_path, "%s", fname);
+        initial_pathlen = 0;
+        for (i = 0; i != len; i++)
+                if (initial_path[i] == '/')
+                        initial_pathlen++;
+}
+static char *shorten_to_initial_path(char *fname)
+{
+        char *p1, *p2, *prevslash1 = NULL;
+        int slashes = 0;
+        for (p1 = fname, p2 = initial_path; *p1 && *p2; p1++, p2++) {
+                if (*p1 != *p2)
+                        break;
+                if (*p1 == '/') {
+                        prevslash1 = p1;
+                        slashes++;
+                }
+        }
+        p1 = prevslash1 + 1;
+        if (prevslash1) {
+                int diff = initial_pathlen - slashes, i, j;
+                int restlen = strlen(fname) - (p1 - fname);
+                char *res;
+                res = xmalloc((3 * diff) + restlen + 1);
+                for (i = 0, j = 0; i != diff; i++) {
+                        res[j++] = '.';
+                        res[j++] = '.';
+                        res[j++] = '/';
+                }
+                strcpy(res + j, p1);
+                return res;
+        }
+        return NULL;
+}
 /**
 * Try to open a file in a given directory.
@@ -157,6 +200,9 @@ void srcfile_push(const char *fname)
        srcfile->colno = 1;
        current_srcfile = srcfile;
+        if (srcfile_depth == 1)
+                set_initial_path(srcfile->name);
 }
 bool srcfile_pop(void)
@@ -197,18 +243,6 @@ void srcfile_add_search_path(const char *dirname)
        search_path_tail = &node->next;
 }
-/*
- * The empty source position.
- */
-struct srcpos srcpos_empty = {
-        .first_line = 0,
-        .first_column = 0,
-        .last_line = 0,
-        .last_column = 0,
-        .file = NULL,
-};
 void srcpos_update(struct srcpos *pos, const char *text, int len)
 {
        int i;
@@ -234,13 +268,35 @@ struct srcpos *
 srcpos_copy(struct srcpos *pos)
 {
        struct srcpos *pos_new;
+        struct srcfile_state *srcfile_state;
+        if (!pos)
+                return NULL;
        pos_new = xmalloc(sizeof(struct srcpos));
+        assert(pos->next == NULL);
        memcpy(pos_new, pos, sizeof(struct srcpos));
+        /* allocate without free */
+        srcfile_state = xmalloc(sizeof(struct srcfile_state));
+        memcpy(srcfile_state, pos->file, sizeof(struct srcfile_state));
+        pos_new->file = srcfile_state;
        return pos_new;
 }
+struct srcpos *srcpos_extend(struct srcpos *pos, struct srcpos *newtail)
+{
+        struct srcpos *p;
+        if (!pos)
+                return newtail;
+        for (p = pos; p->next != NULL; p = p->next);
+        p->next = newtail;
+        return pos;
+}
 char *
 srcpos_string(struct srcpos *pos)
 {
@@ -266,6 +322,68 @@ srcpos_string(struct srcpos *pos)
        return pos_str;
 }
+static char *
+srcpos_string_comment(struct srcpos *pos, bool first_line, int level)
+{
+        char *pos_str, *fname, *first, *rest;
+        bool fresh_fname = false;
+        if (!pos) {
+                if (level > 1) {
+                        xasprintf(&pos_str, "<no-file>:<no-line>");
+                        return pos_str;
+                } else {
+                        return NULL;
+                }
+        }
+        if (!pos->file)
+                fname = "<no-file>";
+        else if (!pos->file->name)
+                fname = "<no-filename>";
+        else if (level > 1)
+                fname = pos->file->name;
+        else {
+                fname = shorten_to_initial_path(pos->file->name);
+                if (fname)
+                        fresh_fname = true;
+                else
+                        fname = pos->file->name;
+        }
+        if (level > 1)
+                xasprintf(&first, "%s:%d:%d-%d:%d", fname,
+                          pos->first_line, pos->first_column,
+                          pos->last_line, pos->last_column);
+        else
+                xasprintf(&first, "%s:%d", fname,
+                          first_line ? pos->first_line : pos->last_line);
+        if (fresh_fname)
+                free(fname);
+        if (pos->next != NULL) {
+                rest = srcpos_string_comment(pos->next, first_line, level);
+                xasprintf(&pos_str, "%s, %s", first, rest);
+                free(first);
+                free(rest);
+        } else {
+                pos_str = first;
+        }
+        return pos_str;
+}
+char *srcpos_string_first(struct srcpos *pos, int level)
+{
+        return srcpos_string_comment(pos, true, level);
+}
+char *srcpos_string_last(struct srcpos *pos, int level)
+{
+        return srcpos_string_comment(pos, false, level);
+}
 void srcpos_verror(struct srcpos *pos, const char *prefix,
                   const char *fmt, va_list va)
 {
@@ -294,4 +412,9 @@ void srcpos_set_line(char *f, int l)
 {
        current_srcfile->name = f;
        current_srcfile->lineno = l;
+        if (initial_cpp) {
+                initial_cpp = false;
+                set_initial_path(f);
+        }
 }
diff --git a/scripts/dtc/srcpos.h b/scripts/dtc/srcpos.h
index 9ded12a3830a..6326a952c40e 100644
--- a/scripts/dtc/srcpos.h
+++ b/scripts/dtc/srcpos.h
@@ -74,6 +74,7 @@ struct srcpos {
    int last_line;
    int last_column;
    struct srcfile_state *file;
+    struct srcpos *next;
 };
 #define YYLTYPE struct srcpos
@@ -93,19 +94,18 @@ struct srcpos {
                                YYRHSLOC(Rhs, 0).last_column;                   \
                        (Current).file = YYRHSLOC (Rhs, 0).file;                \
                }                                                               \
+                (Current).next = NULL;                                          \
        } while (0)
-/*
- * Fictional source position used for IR nodes that are
- * created without otherwise knowing a true source position.
- * For example,constant definitions from the command line.
- */
-extern struct srcpos srcpos_empty;
 extern void srcpos_update(struct srcpos *pos, const char *text, int len);
 extern struct srcpos *srcpos_copy(struct srcpos *pos);
+extern struct srcpos *srcpos_extend(struct srcpos *new_srcpos,
+                                    struct srcpos *old_srcpos);
 extern char *srcpos_string(struct srcpos *pos);
+extern char *srcpos_string_first(struct srcpos *pos, int level);
+extern char *srcpos_string_last(struct srcpos *pos, int level);
 extern void PRINTF(3, 0) srcpos_verror(struct srcpos *pos, const char *prefix,
                                        const char *fmt, va_list va);
diff --git a/scripts/dtc/treesource.c b/scripts/dtc/treesource.c
index f2874f1d1465..1af36628b75f 100644
--- a/scripts/dtc/treesource.c
+++ b/scripts/dtc/treesource.c
@@ -64,6 +64,10 @@ static bool isstring(char c)
 static void write_propval_string(FILE *f, const char *s, size_t len)
 {
        const char *end = s + len - 1;
+        if (!len)
+                return;
        assert(*end == '\0');
        fprintf(f, "\"");
@@ -118,18 +122,20 @@ static void write_propval_int(FILE *f, const char *p, size_t len, size_t width)
        for (; p < end; p += width) {
                switch (width) {
                case 1:
-                        fprintf(f, " %02"PRIx8, *(const uint8_t*)p);
+                        fprintf(f, "%02"PRIx8, *(const uint8_t*)p);
                        break;
                case 2:
-                        fprintf(f, " 0x%02"PRIx16, fdt16_to_cpu(*(const fdt16_t*)p));
+                        fprintf(f, "0x%02"PRIx16, fdt16_to_cpu(*(const fdt16_t*)p));
                        break;
                case 4:
-                        fprintf(f, " 0x%02"PRIx32, fdt32_to_cpu(*(const fdt32_t*)p));
+                        fprintf(f, "0x%02"PRIx32, fdt32_to_cpu(*(const fdt32_t*)p));
                        break;
                case 8:
-                        fprintf(f, " 0x%02"PRIx64, fdt64_to_cpu(*(const fdt64_t*)p));
+                        fprintf(f, "0x%02"PRIx64, fdt64_to_cpu(*(const fdt64_t*)p));
                        break;
                }
+                if (p + width < end)
+                        fputc(' ', f);
        }
 }
@@ -162,10 +168,10 @@ static const char *delim_start[] = {
        [TYPE_STRING] = "",
 };
 static const char *delim_end[] = {
-        [TYPE_UINT8] = " ]",
+        [TYPE_UINT8] = "]",
-        [TYPE_UINT16] = " >",
+        [TYPE_UINT16] = ">",
-        [TYPE_UINT32] = " >",
+        [TYPE_UINT32] = ">",
-        [TYPE_UINT64] = " >",
+        [TYPE_UINT64] = ">",
        [TYPE_STRING] = "",
 };
@@ -208,13 +214,22 @@ static void write_propval(FILE *f, struct property *prop)
        struct marker *m = prop->val.markers;
        struct marker dummy_marker;
        enum markertype emit_type = TYPE_NONE;
+        char *srcstr;
        if (len == 0) {
-                fprintf(f, ";\n");
+                fprintf(f, ";");
+                if (annotate) {
+                        srcstr = srcpos_string_first(prop->srcpos, annotate);
+                        if (srcstr) {
+                                fprintf(f, " /* %s */", srcstr);
+                                free(srcstr);
+                        }
+                }
+                fprintf(f, "\n");
                return;
        }
-        fprintf(f, " = ");
+        fprintf(f, " =");
        if (!next_type_marker(m)) {
                /* data type information missing, need to guess */
@@ -225,32 +240,23 @@ static void write_propval(FILE *f, struct property *prop)
                m = &dummy_marker;
        }
-        struct marker *m_label = prop->val.markers;
        for_each_marker(m) {
-                size_t chunk_len;
+                size_t chunk_len = (m->next ? m->next->offset : len) - m->offset;
+                size_t data_len = type_marker_length(m) ? : len - m->offset;
                const char *p = &prop->val.val[m->offset];
-                if (!has_data_type_information(m))
+                if (has_data_type_information(m)) {
-                        continue;
+                        emit_type = m->type;
+                        fprintf(f, " %s", delim_start[emit_type]);
-                chunk_len = type_marker_length(m);
+                } else if (m->type == LABEL)
-                if (!chunk_len)
+                        fprintf(f, " %s:", m->ref);
-                        chunk_len = len - m->offset;
+                else if (m->offset)
+                        fputc(' ', f);
-                if (emit_type != TYPE_NONE)
-                        fprintf(f, "%s, ", delim_end[emit_type]);
-                emit_type = m->type;
-                for_each_marker_of_type(m_label, LABEL) {
-                        if (m_label->offset > m->offset)
-                                break;
-                        fprintf(f, "%s: ", m_label->ref);
-                }
-                fprintf(f, "%s", delim_start[emit_type]);
-                if (chunk_len <= 0)
+                if (emit_type == TYPE_NONE) {
+                        assert(chunk_len == 0);
                        continue;
+                }
                switch(emit_type) {
                case TYPE_UINT16:
@@ -268,15 +274,23 @@ static void write_propval(FILE *f, struct property *prop)
                default:
                        write_propval_int(f, p, chunk_len, 1);
                }
-        }
-        /* Wrap up any labels at the end of the value */
+                if (chunk_len == data_len) {
-        for_each_marker_of_type(m_label, LABEL) {
+                        size_t pos = m->offset + chunk_len;
-                assert (m_label->offset == len);
+                        fprintf(f, pos == len ? "%s" : "%s,",
-                fprintf(f, " %s:", m_label->ref);
+                                delim_end[emit_type] ? : "");
+                        emit_type = TYPE_NONE;
+                }
        }
+        fprintf(f, ";");
-        fprintf(f, "%s;\n", delim_end[emit_type] ? : "");
+        if (annotate) {
+                srcstr = srcpos_string_first(prop->srcpos, annotate);
+                if (srcstr) {
+                        fprintf(f, " /* %s */", srcstr);
+                        free(srcstr);
+                }
+        }
+        fprintf(f, "\n");
 }
 static void write_tree_source_node(FILE *f, struct node *tree, int level)
@@ -284,14 +298,24 @@ static void write_tree_source_node(FILE *f, struct node *tree, int level)
        struct property *prop;
        struct node *child;
        struct label *l;
+        char *srcstr;
        write_prefix(f, level);
        for_each_label(tree->labels, l)
                fprintf(f, "%s: ", l->label);
        if (tree->name && (*tree->name))
-                fprintf(f, "%s {\n", tree->name);
+                fprintf(f, "%s {", tree->name);
        else
-                fprintf(f, "/ {\n");
+                fprintf(f, "/ {");
+        if (annotate) {
+                srcstr = srcpos_string_first(tree->srcpos, annotate);
+                if (srcstr) {
+                        fprintf(f, " /* %s */", srcstr);
+                        free(srcstr);
+                }
+        }
+        fprintf(f, "\n");
        for_each_property(tree, prop) {
                write_prefix(f, level+1);
@@ -305,10 +329,17 @@ static void write_tree_source_node(FILE *f, struct node *tree, int level)
                write_tree_source_node(f, child, level+1);
        }
        write_prefix(f, level);
-        fprintf(f, "};\n");
+        fprintf(f, "};");
+        if (annotate) {
+                srcstr = srcpos_string_last(tree->srcpos, annotate);
+                if (srcstr) {
+                        fprintf(f, " /* %s */", srcstr);
+                        free(srcstr);
+                }
+        }
+        fprintf(f, "\n");
 }
 void dt_to_source(FILE *f, struct dt_info *dti)
 {
        struct reserve_info *re;
diff --git a/scripts/dtc/util.c b/scripts/dtc/util.c
index a69b7a13463d..9c6fb5f286ae 100644
--- a/scripts/dtc/util.c
+++ b/scripts/dtc/util.c
@@ -46,36 +46,54 @@ char *xstrdup(const char *s)
        return d;
 }
-/* based in part from (3) vsnprintf */
+int xavsprintf_append(char **strp, const char *fmt, va_list ap)
-int xasprintf(char **strp, const char *fmt, ...)
 {
-        int n, size = 128;      /* start with 128 bytes */
+        int n, size = 0;        /* start with 128 bytes */
        char *p;
-        va_list ap;
+        va_list ap_copy;
-        /* initial pointer is NULL making the fist realloc to be malloc */
+        p = *strp;
-        p = NULL;
+        if (p)
-        while (1) {
+                size = strlen(p);
-                p = xrealloc(p, size);
-                /* Try to print in the allocated space. */
+        va_copy(ap_copy, ap);
-                va_start(ap, fmt);
+        n = vsnprintf(NULL, 0, fmt, ap_copy) + 1;
-                n = vsnprintf(p, size, fmt, ap);
+        va_end(ap_copy);
-                va_end(ap);
+        p = xrealloc(p, size + n);
+        n = vsnprintf(p + size, n, fmt, ap);
-                /* If that worked, return the string. */
-                if (n > -1 && n < size)
-                        break;
-                /* Else try again with more space. */
-                if (n > -1)     /* glibc 2.1 */
-                        size = n + 1; /* precisely what is needed */
-                else            /* glibc 2.0 */
-                        size *= 2; /* twice the old size */
-        }
        *strp = p;
        return strlen(p);
 }
+int xasprintf_append(char **strp, const char *fmt, ...)
+{
+        int n;
+        va_list ap;
+        va_start(ap, fmt);
+        n = xavsprintf_append(strp, fmt, ap);
+        va_end(ap);
+        return n;
+}
+int xasprintf(char **strp, const char *fmt, ...)
+{
+        int n;
+        va_list ap;
+        *strp = NULL;
+        va_start(ap, fmt);
+        n = xavsprintf_append(strp, fmt, ap);
+        va_end(ap);
+        return n;
+}
 char *join_path(const char *path, const char *name)
 {
        int lenp = strlen(path);
diff --git a/scripts/dtc/util.h b/scripts/dtc/util.h
index f6cea8274174..7658781a6200 100644
--- a/scripts/dtc/util.h
+++ b/scripts/dtc/util.h
@@ -72,6 +72,8 @@ static inline void *xrealloc(void *p, size_t len)
 extern char *xstrdup(const char *s);
 extern int PRINTF(2, 3) xasprintf(char **strp, const char *fmt, ...);
+extern int PRINTF(2, 3) xasprintf_append(char **strp, const char *fmt, ...);
+extern int xavsprintf_append(char **strp, const char *fmt, va_list ap);
 extern char *join_path(const char *path, const char *name);
 /**
diff --git a/scripts/dtc/version_gen.h b/scripts/dtc/version_gen.h
index 6d23fd095f16..75f383c0b9d3 100644
--- a/scripts/dtc/version_gen.h
+++ b/scripts/dtc/version_gen.h
@@ -1 +1 @@
-#define DTC_VERSION "DTC 1.4.7-gc86da84d"
+#define DTC_VERSION "DTC 1.4.7-gf267e674"
diff --git a/scripts/gcc-goto.sh b/scripts/gcc-goto.sh
index 083c526073ef..8b980fb2270a 100755
--- a/scripts/gcc-goto.sh
+++ b/scripts/gcc-goto.sh
@@ -3,7 +3,7 @@
 # Test for gcc 'asm goto' support
 # Copyright (C) 2010, Jason Baron <jbaron@redhat.com>
-cat << "END" | $@ -x c - -c -o /dev/null >/dev/null 2>&1 && echo "y"
+cat << "END" | $@ -x c - -fno-PIE -c -o /dev/null
 int main(void)
 {
 #if defined(__arm__) || defined(__aarch64__)
diff --git a/scripts/gcc-plugins/Kconfig b/scripts/gcc-plugins/Kconfig
index 0d5c799688f0..d45f7f36b859 100644
--- a/scripts/gcc-plugins/Kconfig
+++ b/scripts/gcc-plugins/Kconfig
@@ -190,4 +190,8 @@ config STACKLEAK_RUNTIME_DISABLE
          runtime to control kernel stack erasing for kernels built with
          CONFIG_GCC_PLUGIN_STACKLEAK.
+config GCC_PLUGIN_ARM_SSP_PER_TASK
+        bool
+        depends on GCC_PLUGINS && ARM
 endif
diff --git a/scripts/gcc-plugins/arm_ssp_per_task_plugin.c b/scripts/gcc-plugins/arm_ssp_per_task_plugin.c
new file mode 100644
index 000000000000..89c47f57d1ce
--- /dev/null
+++ b/scripts/gcc-plugins/arm_ssp_per_task_plugin.c
@@ -0,0 +1,122 @@
+// SPDX-License-Identifier: GPL-2.0
+#include "gcc-common.h"
+__visible int plugin_is_GPL_compatible;
+static unsigned int sp_mask, canary_offset;
+static unsigned int arm_pertask_ssp_rtl_execute(void)
+{
+        rtx_insn *insn;
+        for (insn = get_insns(); insn; insn = NEXT_INSN(insn)) {
+                const char *sym;
+                rtx body;
+                rtx mask, masked_sp;
+                /*
+                 * Find a SET insn involving a SYMBOL_REF to __stack_chk_guard
+                 */
+                if (!INSN_P(insn))
+                        continue;
+                body = PATTERN(insn);
+                if (GET_CODE(body) != SET ||
+                    GET_CODE(SET_SRC(body)) != SYMBOL_REF)
+                        continue;
+                sym = XSTR(SET_SRC(body), 0);
+                if (strcmp(sym, "__stack_chk_guard"))
+                        continue;
+                /*
+                 * Replace the source of the SET insn with an expression that
+                 * produces the address of the copy of the stack canary value
+                 * stored in struct thread_info
+                 */
+                mask = GEN_INT(sext_hwi(sp_mask, GET_MODE_PRECISION(Pmode)));
+                masked_sp = gen_reg_rtx(Pmode);
+                emit_insn_before(gen_rtx_SET(masked_sp,
+                                             gen_rtx_AND(Pmode,
+                                                         stack_pointer_rtx,
+                                                         mask)),
+                                 insn);
+                SET_SRC(body) = gen_rtx_PLUS(Pmode, masked_sp,
+                                             GEN_INT(canary_offset));
+        }
+        return 0;
+}
+#define PASS_NAME arm_pertask_ssp_rtl
+#define NO_GATE
+#include "gcc-generate-rtl-pass.h"
+#if BUILDING_GCC_VERSION >= 9000
+static bool no(void)
+{
+        return false;
+}
+static void arm_pertask_ssp_start_unit(void *gcc_data, void *user_data)
+{
+        targetm.have_stack_protect_combined_set = no;
+        targetm.have_stack_protect_combined_test = no;
+}
+#endif
+__visible int plugin_init(struct plugin_name_args *plugin_info,
+                          struct plugin_gcc_version *version)
+{
+        const char * const plugin_name = plugin_info->base_name;
+        const int argc = plugin_info->argc;
+        const struct plugin_argument *argv = plugin_info->argv;
+        int tso = 0;
+        int i;
+        if (!plugin_default_version_check(version, &gcc_version)) {
+                error(G_("incompatible gcc/plugin versions"));
+                return 1;
+        }
+        for (i = 0; i < argc; ++i) {
+                if (!strcmp(argv[i].key, "disable"))
+                        return 0;
+                /* all remaining options require a value */
+                if (!argv[i].value) {
+                        error(G_("no value supplied for option '-fplugin-arg-%s-%s'"),
+                              plugin_name, argv[i].key);
+                        return 1;
+                }
+                if (!strcmp(argv[i].key, "tso")) {
+                        tso = atoi(argv[i].value);
+                        continue;
+                }
+                if (!strcmp(argv[i].key, "offset")) {
+                        canary_offset = atoi(argv[i].value);
+                        continue;
+                }
+                error(G_("unknown option '-fplugin-arg-%s-%s'"),
+                      plugin_name, argv[i].key);
+                return 1;
+        }
+        /* create the mask that produces the base of the stack */
+        sp_mask = ~((1U << (12 + tso)) - 1);
+        PASS_INFO(arm_pertask_ssp_rtl, "expand", 1, PASS_POS_INSERT_AFTER);
+        register_callback(plugin_info->base_name, PLUGIN_PASS_MANAGER_SETUP,
+                          NULL, &arm_pertask_ssp_rtl_pass_info);
+#if BUILDING_GCC_VERSION >= 9000
+        register_callback(plugin_info->base_name, PLUGIN_START_UNIT,
+                          arm_pertask_ssp_start_unit, NULL);
+#endif
+        return 0;
+}
diff --git a/scripts/gcc-plugins/stackleak_plugin.c b/scripts/gcc-plugins/stackleak_plugin.c
index 2f48da98b5d4..dbd37460c573 100644
--- a/scripts/gcc-plugins/stackleak_plugin.c
+++ b/scripts/gcc-plugins/stackleak_plugin.c
@@ -363,10 +363,12 @@ __visible int plugin_init(struct plugin_name_args *plugin_info,
                                                PASS_POS_INSERT_BEFORE);
        /*
-         * The stackleak_cleanup pass should be executed after the
+         * The stackleak_cleanup pass should be executed before the "*free_cfg"
-         * "reload" pass, when the stack frame size is final.
+         * pass. It's the moment when the stack frame size is already final,
+         * function prologues and epilogues are generated, and the
+         * machine-dependent code transformations are not done.
         */
-        PASS_INFO(stackleak_cleanup, "reload", 1, PASS_POS_INSERT_AFTER);
+        PASS_INFO(stackleak_cleanup, "*free_cfg", 1, PASS_POS_INSERT_BEFORE);
        if (!plugin_default_version_check(version, &gcc_version)) {
                error(G_("incompatible gcc/plugin versions"));
diff --git a/scripts/gdb/linux/proc.py b/scripts/gdb/linux/proc.py
index 086d27223c0c..0aebd7565b03 100644
--- a/scripts/gdb/linux/proc.py
+++ b/scripts/gdb/linux/proc.py
@@ -41,7 +41,7 @@ class LxVersion(gdb.Command):
    def invoke(self, arg, from_tty):
        # linux_banner should contain a newline
-        gdb.write(gdb.parse_and_eval("linux_banner").string())
+        gdb.write(gdb.parse_and_eval("(char *)linux_banner").string())
 LxVersion()
diff --git a/scripts/gen_compile_commands.py b/scripts/gen_compile_commands.py
new file mode 100755
index 000000000000..7915823b92a5
--- /dev/null
+++ b/scripts/gen_compile_commands.py
@@ -0,0 +1,151 @@
+#!/usr/bin/env python
+# SPDX-License-Identifier: GPL-2.0
+#
+# Copyright (C) Google LLC, 2018
+#
+# Author: Tom Roeder <tmroeder@google.com>
+#
+"""A tool for generating compile_commands.json in the Linux kernel."""
+import argparse
+import json
+import logging
+import os
+import re
+_DEFAULT_OUTPUT = 'compile_commands.json'
+_DEFAULT_LOG_LEVEL = 'WARNING'
+_FILENAME_PATTERN = r'^\..*\.cmd$'
+_LINE_PATTERN = r'^cmd_[^ ]*\.o := (.* )([^ ]*\.c)$'
+_VALID_LOG_LEVELS = ['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL']
+# A kernel build generally has over 2000 entries in its compile_commands.json
+# database. If this code finds 500 or fewer, then warn the user that they might
+# not have all the .cmd files, and they might need to compile the kernel.
+_LOW_COUNT_THRESHOLD = 500
+def parse_arguments():
+    """Sets up and parses command-line arguments.
+    Returns:
+        log_level: A logging level to filter log output.
+        directory: The directory to search for .cmd files.
+        output: Where to write the compile-commands JSON file.
+    """
+    usage = 'Creates a compile_commands.json database from kernel .cmd files'
+    parser = argparse.ArgumentParser(description=usage)
+    directory_help = ('Path to the kernel source directory to search '
+                      '(defaults to the working directory)')
+    parser.add_argument('-d', '--directory', type=str, help=directory_help)
+    output_help = ('The location to write compile_commands.json (defaults to '
+                   'compile_commands.json in the search directory)')
+    parser.add_argument('-o', '--output', type=str, help=output_help)
+    log_level_help = ('The level of log messages to produce (one of ' +
+                      ', '.join(_VALID_LOG_LEVELS) + '; defaults to ' +
+                      _DEFAULT_LOG_LEVEL + ')')
+    parser.add_argument(
+        '--log_level', type=str, default=_DEFAULT_LOG_LEVEL,
+        help=log_level_help)
+    args = parser.parse_args()
+    log_level = args.log_level
+    if log_level not in _VALID_LOG_LEVELS:
+        raise ValueError('%s is not a valid log level' % log_level)
+    directory = args.directory or os.getcwd()
+    output = args.output or os.path.join(directory, _DEFAULT_OUTPUT)
+    directory = os.path.abspath(directory)
+    return log_level, directory, output
+def process_line(root_directory, file_directory, command_prefix, relative_path):
+    """Extracts information from a .cmd line and creates an entry from it.
+    Args:
+        root_directory: The directory that was searched for .cmd files. Usually
+            used directly in the "directory" entry in compile_commands.json.
+        file_directory: The path to the directory the .cmd file was found in.
+        command_prefix: The extracted command line, up to the last element.
+        relative_path: The .c file from the end of the extracted command.
+            Usually relative to root_directory, but sometimes relative to
+            file_directory and sometimes neither.
+    Returns:
+        An entry to append to compile_commands.
+    Raises:
+        ValueError: Could not find the extracted file based on relative_path and
+            root_directory or file_directory.
+    """
+    # The .cmd files are intended to be included directly by Make, so they
+    # escape the pound sign '#', either as '\#' or '$(pound)' (depending on the
+    # kernel version). The compile_commands.json file is not interepreted
+    # by Make, so this code replaces the escaped version with '#'.
+    prefix = command_prefix.replace('\#', '#').replace('$(pound)', '#')
+    cur_dir = root_directory
+    expected_path = os.path.join(cur_dir, relative_path)
+    if not os.path.exists(expected_path):
+        # Try using file_directory instead. Some of the tools have a different
+        # style of .cmd file than the kernel.
+        cur_dir = file_directory
+        expected_path = os.path.join(cur_dir, relative_path)
+        if not os.path.exists(expected_path):
+            raise ValueError('File %s not in %s or %s' %
+                             (relative_path, root_directory, file_directory))
+    return {
+        'directory': cur_dir,
+        'file': relative_path,
+        'command': prefix + relative_path,
+    }
+def main():
+    """Walks through the directory and finds and parses .cmd files."""
+    log_level, directory, output = parse_arguments()
+    level = getattr(logging, log_level)
+    logging.basicConfig(format='%(levelname)s: %(message)s', level=level)
+    filename_matcher = re.compile(_FILENAME_PATTERN)
+    line_matcher = re.compile(_LINE_PATTERN)
+    compile_commands = []
+    for dirpath, _, filenames in os.walk(directory):
+        for filename in filenames:
+            if not filename_matcher.match(filename):
+                continue
+            filepath = os.path.join(dirpath, filename)
+            with open(filepath, 'rt') as f:
+                for line in f:
+                    result = line_matcher.match(line)
+                    if not result:
+                        continue
+                    try:
+                        entry = process_line(directory, dirpath,
+                                             result.group(1), result.group(2))
+                        compile_commands.append(entry)
+                    except ValueError as err:
+                        logging.info('Could not add line from %s: %s',
+                                     filepath, err)
+    with open(output, 'wt') as f:
+        json.dump(compile_commands, f, indent=2, sort_keys=True)
+    count = len(compile_commands)
+    if count < _LOW_COUNT_THRESHOLD:
+        logging.warning(
+            'Found %s entries. Have you compiled the kernel?', count)
+if __name__ == '__main__':
+    main()
diff --git a/scripts/gen_ksymdeps.sh b/scripts/gen_ksymdeps.sh
new file mode 100755
index 000000000000..1324986e1362
--- /dev/null
+++ b/scripts/gen_ksymdeps.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+set -e
+# List of exported symbols
+ksyms=$($NM $1 | sed -n 's/.*__ksym_marker_\(.*\)/\1/p' | tr A-Z a-z)
+if [ -z "$ksyms" ]; then
+        exit 0
+fi
+echo
+echo "ksymdeps_$1 := \\"
+for s in $ksyms
+do
+        echo $s | sed -e 's:^_*:    $(wildcard include/ksym/:' \
+                        -e 's:__*:/:g' -e 's/$/.h) \\/'
+done
+echo
+echo "$1: \$(ksymdeps_$1)"
+echo
+echo "\$(ksymdeps_$1):"
diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
index 109a1af7e444..77cebad0474e 100644
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -334,10 +334,10 @@ static void write_src(void)
        printf("#include <asm/types.h>\n");
        printf("#if BITS_PER_LONG == 64\n");
        printf("#define PTR .quad\n");
-        printf("#define ALGN .align 8\n");
+        printf("#define ALGN .balign 8\n");
        printf("#else\n");
        printf("#define PTR .long\n");
-        printf("#define ALGN .align 4\n");
+        printf("#define ALGN .balign 4\n");
        printf("#endif\n");
        printf("\t.section .rodata, \"a\"\n");
diff --git a/scripts/kconfig/.gitignore b/scripts/kconfig/.gitignore
index 0aabc1d6a182..b5bf92f66d11 100644
--- a/scripts/kconfig/.gitignore
+++ b/scripts/kconfig/.gitignore
@@ -2,6 +2,7 @@
 # Generated files
 #
 *.moc
+*conf-cfg
 #
 # configuration programs
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 63b609243d03..181973509a05 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -142,75 +142,68 @@ help:
        @echo  '  testconfig      - Run Kconfig unit tests (requires python3 and pytest)'
 # ===========================================================================
-# Shared Makefile for the various kconfig executables:
-# conf:   Used for defconfig, oldconfig and related targets
 # object files used by all kconfig flavours
+common-objs     := confdata.o expr.o symbol.o preprocess.o zconf.lex.o zconf.tab.o
-conf-objs       := conf.o  zconf.tab.o
+$(obj)/zconf.lex.o: $(obj)/zconf.tab.h
-hostprogs-y := conf
-targets         += zconf.lex.c
-# generated files seem to need this to find local include files
 HOSTCFLAGS_zconf.lex.o  := -I$(src)
 HOSTCFLAGS_zconf.tab.o  := -I$(src)
+# conf: Used for defconfig, oldconfig and related targets
+hostprogs-y     += conf
+conf-objs       := conf.o $(common-objs)
 # nconf: Used for the nconfig target based on ncurses
 hostprogs-y     += nconf
-nconf-objs      := nconf.o zconf.tab.o nconf.gui.o
+nconf-objs      := nconf.o nconf.gui.o $(common-objs)
-HOSTLDLIBS_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.o      = $(shell . $(obj)/nconf-cfg && echo $$cflags)
-HOSTCFLAGS_nconf.gui.o  = $(shell . $(obj)/.nconf-cfg && echo $$cflags)
+HOSTCFLAGS_nconf.gui.o  = $(shell . $(obj)/nconf-cfg && echo $$cflags)
-$(obj)/nconf.o $(obj)/nconf.gui.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))
+mconf-objs      := mconf.o $(addprefix lxdialog/, $(lxdialog)) $(common-objs)
-HOSTLDLIBS_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)))
+  $(eval HOSTCFLAGS_$f = $$(shell . $(obj)/mconf-cfg && echo $$$$cflags)))
-$(obj)/mconf.o: $(obj)/.mconf-cfg
+$(obj)/mconf.o: $(obj)/mconf-cfg
-$(addprefix $(obj)/lxdialog/, $(lxdialog)): $(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
+qconf-objs      := images.o $(common-objs)
-HOSTLDLIBS_qconf        = $(shell . $(obj)/.qconf-cfg && echo $$libs)
+HOSTLDLIBS_qconf        = $(shell . $(obj)/qconf-cfg && echo $$libs)
-HOSTCXXFLAGS_qconf.o    = $(shell . $(obj)/.qconf-cfg && echo $$cflags)
+HOSTCXXFLAGS_qconf.o    = $(shell . $(obj)/qconf-cfg && echo $$cflags)
-$(obj)/qconf.o: $(obj)/.qconf-cfg $(obj)/qconf.moc
+$(obj)/qconf.o: $(obj)/qconf-cfg $(obj)/qconf.moc
 quiet_cmd_moc = MOC     $@
-      cmd_moc = $(shell . $(obj)/.qconf-cfg && echo $$moc) -i $< -o $@
+      cmd_moc = $(shell . $(obj)/qconf-cfg && echo $$moc) -i $< -o $@
-$(obj)/%.moc: $(src)/%.h $(obj)/.qconf-cfg
+$(obj)/%.moc: $(src)/%.h $(obj)/qconf-cfg
        $(call cmd,moc)
 # gconf: Used for the gconfig target based on GTK+
 hostprogs-y     += gconf
-gconf-objs      := gconf.o zconf.tab.o
+gconf-objs      := gconf.o images.o $(common-objs)
-HOSTLDLIBS_gconf    = $(shell . $(obj)/.gconf-cfg && echo $$libs)
-HOSTCFLAGS_gconf.o  = $(shell . $(obj)/.gconf-cfg && echo $$cflags)
-$(obj)/gconf.o: $(obj)/.gconf-cfg
+HOSTLDLIBS_gconf    = $(shell . $(obj)/gconf-cfg && echo $$libs)
+HOSTCFLAGS_gconf.o  = $(shell . $(obj)/gconf-cfg && echo $$cflags)
-$(obj)/zconf.tab.o: $(obj)/zconf.lex.c
+$(obj)/gconf.o: $(obj)/gconf-cfg
 # check if necessary packages are available, and configure build flags
-define filechk_conf_cfg
+filechk_conf_cfg = $(CONFIG_SHELL) $<
-        $(CONFIG_SHELL) $<
-endef
-$(obj)/.%conf-cfg: $(src)/%conf-cfg.sh FORCE
+$(obj)/%conf-cfg: $(src)/%conf-cfg.sh FORCE
        $(call filechk,conf_cfg)
-clean-files += .*conf-cfg
+clean-files += *conf-cfg
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 98e0c7a34699..da89ef788a8d 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -1,6 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
- * Released under the terms of the GNU GPL v2.0.
 */
 #include <ctype.h>
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 91d0a5c014ac..08ba146a83c5 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -1,12 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
- * Released under the terms of the GNU GPL v2.0.
 */
 #include <sys/stat.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <limits.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -74,6 +75,47 @@ static int make_parent_dir(const char *path)
        return 0;
 }
+static char depfile_path[PATH_MAX];
+static size_t depfile_prefix_len;
+/* touch depfile for symbol 'name' */
+static int conf_touch_dep(const char *name)
+{
+        int fd, ret;
+        const char *s;
+        char *d, c;
+        /* check overflow: prefix + name + ".h" + '\0' must fit in buffer. */
+        if (depfile_prefix_len + strlen(name) + 3 > sizeof(depfile_path))
+                return -1;
+        d = depfile_path + depfile_prefix_len;
+        s = name;
+        while ((c = *s++))
+                *d++ = (c == '_') ? '/' : tolower(c);
+        strcpy(d, ".h");
+        /* Assume directory path already exists. */
+        fd = open(depfile_path, O_WRONLY | O_CREAT | O_TRUNC, 0644);
+        if (fd == -1) {
+                if (errno != ENOENT)
+                        return -1;
+                ret = make_parent_dir(depfile_path);
+                if (ret)
+                        return ret;
+                /* Try it again. */
+                fd = open(depfile_path, O_WRONLY | O_CREAT | O_TRUNC, 0644);
+                if (fd == -1)
+                        return -1;
+        }
+        close(fd);
+        return 0;
+}
 struct conf_printer {
        void (*print_symbol)(FILE *, struct symbol *, const char *, void *);
        void (*print_comment)(FILE *, const char *, void *);
@@ -186,14 +228,6 @@ static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p)
                        conf_warning("symbol value '%s' invalid for %s",
                                     p, sym->name);
                return 1;
-        case S_OTHER:
-                if (*p != '"') {
-                        for (p2 = p; *p2 && !isspace(*p2); p2++)
-                                ;
-                        sym->type = S_STRING;
-                        goto done;
-                }
-                /* fall through */
        case S_STRING:
                if (*p++ != '"')
                        break;
@@ -212,7 +246,6 @@ static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p)
                /* fall through */
        case S_INT:
        case S_HEX:
-        done:
                if (sym_string_valid(sym, p)) {
                        sym->def[def].val = xstrdup(p);
                        sym->flags |= def_flags;
@@ -363,7 +396,7 @@ load:
                                sym = sym_find(line + 2 + strlen(CONFIG_));
                                if (!sym) {
                                        sym_add_change_count(1);
-                                        goto setsym;
+                                        continue;
                                }
                        } else {
                                sym = sym_lookup(line + 2 + strlen(CONFIG_), 0);
@@ -393,17 +426,22 @@ load:
                                if (*p2 == '\r')
                                        *p2 = 0;
                        }
-                        if (def == S_DEF_USER) {
-                                sym = sym_find(line + strlen(CONFIG_));
+                        sym = sym_find(line + strlen(CONFIG_));
-                                if (!sym) {
+                        if (!sym) {
+                                if (def == S_DEF_AUTO)
+                                        /*
+                                         * Reading from include/config/auto.conf
+                                         * If CONFIG_FOO previously existed in
+                                         * auto.conf but it is missing now,
+                                         * include/config/foo.h must be touched.
+                                         */
+                                        conf_touch_dep(line + strlen(CONFIG_));
+                                else
                                        sym_add_change_count(1);
-                                        goto setsym;
+                                continue;
-                                }
-                        } else {
-                                sym = sym_lookup(line + strlen(CONFIG_), 0);
-                                if (sym->type == S_UNKNOWN)
-                                        sym->type = S_OTHER;
                        }
                        if (sym->flags & def_flags) {
                                conf_warning("override: reassigning to symbol %s", sym->name);
                        }
@@ -416,7 +454,7 @@ load:
                        continue;
                }
-setsym:
                if (sym && sym_is_choice_value(sym)) {
                        struct symbol *cs = prop_get_symbol(sym_get_choice_prop(sym));
                        switch (sym->def[def].tri) {
@@ -669,7 +707,6 @@ static void conf_write_symbol(FILE *fp, struct symbol *sym,
        const char *str;
        switch (sym->type) {
-        case S_OTHER:
        case S_UNKNOWN:
                break;
        case S_STRING:
@@ -906,24 +943,19 @@ static int conf_write_dep(const char *name)
        return 0;
 }
-static int conf_split_config(void)
+static int conf_touch_deps(void)
 {
        const char *name;
-        char path[PATH_MAX+1];
-        char *s, *d, c;
        struct symbol *sym;
-        int res, i, fd;
+        int res, i;
+        strcpy(depfile_path, "include/config/");
+        depfile_prefix_len = strlen(depfile_path);
        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_NO_WRITE) || !sym->name)
@@ -975,42 +1007,12 @@ static int conf_split_config(void)
                 *      different from 'no').
                 */
-                /* Replace all '_' and append ".h" */
+                res = conf_touch_dep(sym->name);
-                s = sym->name;
+                if (res)
-                d = path;
+                        return res;
-                while ((c = *s++)) {
-                        c = tolower(c);
-                        *d++ = (c == '_') ? '/' : c;
-                }
-                strcpy(d, ".h");
-                /* Assume directory path already exists. */
-                fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0644);
-                if (fd == -1) {
-                        if (errno != ENOENT) {
-                                res = 1;
-                                break;
-                        }
-                        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) {
-                                res = 1;
-                                break;
-                        }
-                }
-                close(fd);
        }
-out:
-        if (chdir("../.."))
-                return 1;
-        return res;
+        return 0;
 }
 int conf_write_autoconf(int overwrite)
@@ -1028,7 +1030,7 @@ int conf_write_autoconf(int overwrite)
        conf_write_dep("include/config/auto.conf.cmd");
-        if (conf_split_config())
+        if (conf_touch_deps())
                return 1;
        out = fopen(".tmpconfig", "w");
diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c
index e1a39e90841d..77ffff3a053c 100644
--- a/scripts/kconfig/expr.c
+++ b/scripts/kconfig/expr.c
@@ -1,8 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
- * Released under the terms of the GNU GPL v2.0.
 */
+#include <ctype.h>
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -980,7 +982,6 @@ enum string_value_kind {
        k_string,
        k_signed,
        k_unsigned,
-        k_invalid
 };
 union string_value {
@@ -1011,13 +1012,10 @@ static enum string_value_kind expr_parse_string(const char *str,
                val->u = strtoull(str, &tail, 16);
                kind = k_unsigned;
                break;
-        case S_STRING:
+        default:
-        case S_UNKNOWN:
                val->s = strtoll(str, &tail, 0);
                kind = k_signed;
                break;
-        default:
-                return k_invalid;
        }
        return !errno && !*tail && tail > str && isxdigit(tail[-1])
               ? kind : k_string;
@@ -1073,13 +1071,7 @@ tristate expr_calc_value(struct expr *e)
        if (k1 == k_string || k2 == k_string)
                res = strcmp(str1, str2);
-        else if (k1 == k_invalid || k2 == k_invalid) {
+        else if (k1 == k_unsigned || k2 == k_unsigned)
-                if (e->type != E_EQUAL && e->type != E_UNEQUAL) {
-                        printf("Cannot compare \"%s\" and \"%s\"\n", str1, str2);
-                        return no;
-                }
-                res = strcmp(str1, str2);
-        } else if (k1 == k_unsigned || k2 == k_unsigned)
                res = (lval.u > rval.u) - (lval.u < rval.u);
        else /* if (k1 == k_signed && k2 == k_signed) */
                res = (lval.s > rval.s) - (lval.s < rval.s);
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index 7c329e179007..999edb60cd53 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -1,6 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
 * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
- * Released under the terms of the GNU GPL v2.0.
 */
 #ifndef EXPR_H
@@ -62,7 +62,7 @@ struct symbol_value {
 };
 enum symbol_type {
-        S_UNKNOWN, S_BOOLEAN, S_TRISTATE, S_INT, S_HEX, S_STRING, S_OTHER
+        S_UNKNOWN, S_BOOLEAN, S_TRISTATE, S_INT, S_HEX, S_STRING
 };
 /* enum values are used as index to symbol.def[] */
@@ -131,7 +131,7 @@ struct symbol {
        struct expr_value implied;
 };
-#define for_all_symbols(i, sym) for (i = 0; i < SYMBOL_HASHSIZE; i++) for (sym = symbol_hash[i]; sym; sym = sym->next) if (sym->type != S_OTHER)
+#define for_all_symbols(i, sym) for (i = 0; i < SYMBOL_HASHSIZE; i++) for (sym = symbol_hash[i]; sym; sym = sym->next)
 #define SYMBOL_CONST      0x0001  /* symbol is const */
 #define SYMBOL_CHECK      0x0008  /* used during dependency checking */
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
index 36f578415c4a..5d4ecf309ee4 100644
--- a/scripts/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -1,9 +1,6 @@
-/* Hey EMACS -*- linux-c -*- */
+// SPDX-License-Identifier: GPL-2.0
 /*
- *
 * Copyright (C) 2002-2003 Romain Lievin <roms@tilp.info>
- * Released under the terms of the GNU GPL v2.0.
- *
 */
 #ifdef HAVE_CONFIG_H
@@ -12,7 +9,7 @@
 #include <stdlib.h>
 #include "lkc.h"
-#include "images.c"
+#include "images.h"
 #include <glade/glade.h>
 #include <gtk/gtk.h>
@@ -78,8 +75,8 @@ static gchar **fill_row(struct menu *menu);
 static void conf_changed(void);
 /* Helping/Debugging Functions */
+#ifdef DEBUG
-const char *dbg_sym_flags(int val)
+static const char *dbg_sym_flags(int val)
 {
        static char buf[256];
@@ -108,9 +105,10 @@ const char *dbg_sym_flags(int val)
        return buf;
 }
+#endif
-void replace_button_icon(GladeXML * xml, GdkDrawable * window,
+static void replace_button_icon(GladeXML *xml, GdkDrawable *window,
-                         GtkStyle * style, gchar * btn_name, gchar ** xpm)
+                                GtkStyle *style, gchar *btn_name, gchar **xpm)
 {
        GdkPixmap *pixmap;
        GdkBitmap *mask;
@@ -128,7 +126,7 @@ void replace_button_icon(GladeXML * xml, GdkDrawable * window,
 }
 /* Main Window Initialization */
-void init_main_window(const gchar * glade_file)
+static void init_main_window(const gchar *glade_file)
 {
        GladeXML *xml;
        GtkWidget *widget;
@@ -190,7 +188,7 @@ void init_main_window(const gchar * glade_file)
        gtk_widget_show(main_wnd);
 }
-void init_tree_model(void)
+static void init_tree_model(void)
 {
        gint i;
@@ -220,7 +218,7 @@ void init_tree_model(void)
        model1 = GTK_TREE_MODEL(tree1);
 }
-void init_left_tree(void)
+static void init_left_tree(void)
 {
        GtkTreeView *view = GTK_TREE_VIEW(tree1_w);
        GtkCellRenderer *renderer;
@@ -262,7 +260,7 @@ static void renderer_edited(GtkCellRendererText * cell,
                            const gchar * path_string,
                            const gchar * new_text, gpointer user_data);
-void init_right_tree(void)
+static void init_right_tree(void)
 {
        GtkTreeView *view = GTK_TREE_VIEW(tree2_w);
        GtkCellRenderer *renderer;
@@ -1212,8 +1210,8 @@ static GtkTreeIter found;
 /*
 * Find a menu in the GtkTree starting at parent.
 */
-GtkTreeIter *gtktree_iter_find_node(GtkTreeIter * parent,
+static GtkTreeIter *gtktree_iter_find_node(GtkTreeIter *parent,
-                                    struct menu *tofind)
+                                           struct menu *tofind)
 {
        GtkTreeIter iter;
        GtkTreeIter *child = &iter;
@@ -1424,7 +1422,7 @@ static void display_list(void)
        tree = tree2;
 }
-void fixup_rootmenu(struct menu *menu)
+static void fixup_rootmenu(struct menu *menu)
 {
        struct menu *child;
        static int menu_cnt = 0;
diff --git a/scripts/kconfig/images.c b/scripts/kconfig/images.c
index d4f84bd4a96b..b4fa0e4a63a5 100644
--- a/scripts/kconfig/images.c
+++ b/scripts/kconfig/images.c
@@ -1,9 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
- * Released under the terms of the GNU GPL v2.0.
 */
-static const char *xpm_load[] = {
+#include "images.h"
+const char *xpm_load[] = {
 "22 22 5 1",
 ". c None",
 "# c #000000",
@@ -33,7 +35,7 @@ static const char *xpm_load[] = {
 "###############.......",
 "......................"};
-static const char *xpm_save[] = {
+const char *xpm_save[] = {
 "22 22 5 1",
 ". c None",
 "# c #000000",
@@ -63,7 +65,7 @@ static const char *xpm_save[] = {
 "..##################..",
 "......................"};
-static const char *xpm_back[] = {
+const char *xpm_back[] = {
 "22 22 3 1",
 ". c None",
 "# c #000083",
@@ -91,7 +93,7 @@ static const char *xpm_back[] = {
 "......................",
 "......................"};
-static const char *xpm_tree_view[] = {
+const char *xpm_tree_view[] = {
 "22 22 2 1",
 ". c None",
 "# c #000000",
@@ -118,7 +120,7 @@ static const char *xpm_tree_view[] = {
 "......................",
 "......................"};
-static const char *xpm_single_view[] = {
+const char *xpm_single_view[] = {
 "22 22 2 1",
 ". c None",
 "# c #000000",
@@ -145,7 +147,7 @@ static const char *xpm_single_view[] = {
 "......................",
 "......................"};
-static const char *xpm_split_view[] = {
+const char *xpm_split_view[] = {
 "22 22 2 1",
 ". c None",
 "# c #000000",
@@ -172,7 +174,7 @@ static const char *xpm_split_view[] = {
 "......................",
 "......................"};
-static const char *xpm_symbol_no[] = {
+const char *xpm_symbol_no[] = {
 "12 12 2 1",
 "  c white",
 ". c black",
@@ -189,7 +191,7 @@ static const char *xpm_symbol_no[] = {
 " .......... ",
 "            "};
-static const char *xpm_symbol_mod[] = {
+const char *xpm_symbol_mod[] = {
 "12 12 2 1",
 "  c white",
 ". c black",
@@ -206,7 +208,7 @@ static const char *xpm_symbol_mod[] = {
 " .......... ",
 "            "};
-static const char *xpm_symbol_yes[] = {
+const char *xpm_symbol_yes[] = {
 "12 12 2 1",
 "  c white",
 ". c black",
@@ -223,7 +225,7 @@ static const char *xpm_symbol_yes[] = {
 " .......... ",
 "            "};
-static const char *xpm_choice_no[] = {
+const char *xpm_choice_no[] = {
 "12 12 2 1",
 "  c white",
 ". c black",
@@ -240,7 +242,7 @@ static const char *xpm_choice_no[] = {
 "    ....    ",
 "            "};
-static const char *xpm_choice_yes[] = {
+const char *xpm_choice_yes[] = {
 "12 12 2 1",
 "  c white",
 ". c black",
@@ -257,7 +259,7 @@ static const char *xpm_choice_yes[] = {
 "    ....    ",
 "            "};
-static const char *xpm_menu[] = {
+const char *xpm_menu[] = {
 "12 12 2 1",
 "  c white",
 ". c black",
@@ -274,7 +276,7 @@ static const char *xpm_menu[] = {
 " .......... ",
 "            "};
-static const char *xpm_menu_inv[] = {
+const char *xpm_menu_inv[] = {
 "12 12 2 1",
 "  c white",
 ". c black",
@@ -291,7 +293,7 @@ static const char *xpm_menu_inv[] = {
 " .......... ",
 "            "};
-static const char *xpm_menuback[] = {
+const char *xpm_menuback[] = {
 "12 12 2 1",
 "  c white",
 ". c black",
@@ -308,7 +310,7 @@ static const char *xpm_menuback[] = {
 " .......... ",
 "            "};
-static const char *xpm_void[] = {
+const char *xpm_void[] = {
 "12 12 2 1",
 "  c white",
 ". c black",
diff --git a/scripts/kconfig/images.h b/scripts/kconfig/images.h
new file mode 100644
index 000000000000..d8ff614bd087
--- /dev/null
+++ b/scripts/kconfig/images.h
@@ -0,0 +1,33 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ */
+#ifndef IMAGES_H
+#define IMAGES_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern const char *xpm_load[];
+extern const char *xpm_save[];
+extern const char *xpm_back[];
+extern const char *xpm_tree_view[];
+extern const char *xpm_single_view[];
+extern const char *xpm_split_view[];
+extern const char *xpm_symbol_no[];
+extern const char *xpm_symbol_mod[];
+extern const char *xpm_symbol_yes[];
+extern const char *xpm_choice_no[];
+extern const char *xpm_choice_yes[];
+extern const char *xpm_menu[];
+extern const char *xpm_menu_inv[];
+extern const char *xpm_menuback[];
+extern const char *xpm_void[];
+#ifdef __cplusplus
+}
+#endif
+#endif /* IMAGES_H */
diff --git a/scripts/kconfig/kconf_id.c b/scripts/kconfig/kconf_id.c
deleted file mode 100644
index b3e0ea0ac732..000000000000
--- a/scripts/kconfig/kconf_id.c
+++ /dev/null
@@ -1,52 +0,0 @@
-static struct kconf_id kconf_id_array[] = {
-        { "mainmenu",           T_MAINMENU,             TF_COMMAND },
-        { "menu",               T_MENU,                 TF_COMMAND },
-        { "endmenu",            T_ENDMENU,              TF_COMMAND },
-        { "source",             T_SOURCE,               TF_COMMAND },
-        { "choice",             T_CHOICE,               TF_COMMAND },
-        { "endchoice",          T_ENDCHOICE,            TF_COMMAND },
-        { "comment",            T_COMMENT,              TF_COMMAND },
-        { "config",             T_CONFIG,               TF_COMMAND },
-        { "menuconfig",         T_MENUCONFIG,           TF_COMMAND },
-        { "help",               T_HELP,                 TF_COMMAND },
-        { "---help---",         T_HELP,                 TF_COMMAND },
-        { "if",                 T_IF,                   TF_COMMAND|TF_PARAM },
-        { "endif",              T_ENDIF,                TF_COMMAND },
-        { "depends",            T_DEPENDS,              TF_COMMAND },
-        { "optional",           T_OPTIONAL,             TF_COMMAND },
-        { "default",            T_DEFAULT,              TF_COMMAND, S_UNKNOWN },
-        { "prompt",             T_PROMPT,               TF_COMMAND },
-        { "tristate",           T_TYPE,                 TF_COMMAND, S_TRISTATE },
-        { "def_tristate",       T_DEFAULT,              TF_COMMAND, S_TRISTATE },
-        { "bool",               T_TYPE,                 TF_COMMAND, S_BOOLEAN },
-        { "def_bool",           T_DEFAULT,              TF_COMMAND, S_BOOLEAN },
-        { "int",                T_TYPE,                 TF_COMMAND, S_INT },
-        { "hex",                T_TYPE,                 TF_COMMAND, S_HEX },
-        { "string",             T_TYPE,                 TF_COMMAND, S_STRING },
-        { "select",             T_SELECT,               TF_COMMAND },
-        { "imply",              T_IMPLY,                TF_COMMAND },
-        { "range",              T_RANGE,                TF_COMMAND },
-        { "visible",            T_VISIBLE,              TF_COMMAND },
-        { "option",             T_OPTION,               TF_COMMAND },
-        { "on",                 T_ON,                   TF_PARAM },
-        { "modules",            T_OPT_MODULES,          TF_OPTION },
-        { "defconfig_list",     T_OPT_DEFCONFIG_LIST,   TF_OPTION },
-        { "allnoconfig_y",      T_OPT_ALLNOCONFIG_Y,    TF_OPTION },
-};
-#define KCONF_ID_ARRAY_SIZE (sizeof(kconf_id_array)/sizeof(struct kconf_id))
-static const struct kconf_id *kconf_id_lookup(register const char *str, register unsigned int len)
-{
-        int i;
-        for (i = 0; i < KCONF_ID_ARRAY_SIZE; i++) {
-                struct kconf_id *id = kconf_id_array+i;
-                int l = strlen(id->name);
-                if (len == l && !memcmp(str, id->name, len))
-                        return id;
-        }
-        return NULL;
-}
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
index 9eb7c837cd8f..531ff7c57d92 100644
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -1,6 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
 * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
- * Released under the terms of the GNU GPL v2.0.
 */
 #ifndef LKC_H
@@ -30,10 +30,6 @@ static inline const char *CONFIG_prefix(void)
 #undef CONFIG_
 #define CONFIG_ CONFIG_prefix()
-#define TF_COMMAND      0x0001
-#define TF_PARAM        0x0002
-#define TF_OPTION       0x0004
 enum conf_def_mode {
        def_default,
        def_yes,
@@ -42,17 +38,6 @@ enum conf_def_mode {
        def_random
 };
-#define T_OPT_MODULES           1
-#define T_OPT_DEFCONFIG_LIST    2
-#define T_OPT_ALLNOCONFIG_Y     4
-struct kconf_id {
-        const char *name;
-        int token;
-        unsigned int flags;
-        enum symbol_type stype;
-};
 extern int yylineno;
 void zconfdump(FILE *out);
 void zconf_starthelp(void);
@@ -91,7 +76,9 @@ void menu_add_visibility(struct expr *dep);
 struct property *menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep);
 void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep);
 void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep);
-void menu_add_option(int token, char *arg);
+void menu_add_option_modules(void);
+void menu_add_option_defconfig_list(void);
+void menu_add_option_allnoconfig_y(void);
 void menu_finalize(struct menu *parent);
 void menu_set_type(int type);
@@ -103,6 +90,9 @@ void *xrealloc(void *p, size_t size);
 char *xstrdup(const char *s);
 char *xstrndup(const char *s, size_t n);
+/* zconf.l */
+int yylex(void);
 struct gstr {
        size_t len;
        char  *s;
@@ -121,6 +111,7 @@ const char *str_get(struct gstr *gs);
 /* symbol.c */
 void sym_clear_all_valid(void);
 struct symbol *sym_choice_default(struct symbol *sym);
+struct property *sym_get_range_prop(struct symbol *sym);
 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);
diff --git a/scripts/kconfig/lxdialog/checklist.c b/scripts/kconfig/lxdialog/checklist.c
index 2e96323ad11b..fd161cfff121 100644
--- a/scripts/kconfig/lxdialog/checklist.c
+++ b/scripts/kconfig/lxdialog/checklist.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *  checklist.c -- implements the checklist box
 *
@@ -5,20 +6,6 @@
 *     Stuart Herbert - S.Herbert@sheffield.ac.uk: radiolist extension
 *     Alessandro Rubini - rubini@ipvvis.unipv.it: merged the two
 *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version 2
- *  of the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 #include "dialog.h"
diff --git a/scripts/kconfig/lxdialog/dialog.h b/scripts/kconfig/lxdialog/dialog.h
index 0b00be5abaa6..68b565e3c495 100644
--- a/scripts/kconfig/lxdialog/dialog.h
+++ b/scripts/kconfig/lxdialog/dialog.h
@@ -1,21 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
 *  dialog.h -- common declarations for all dialog modules
 *
 *  AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version 2
- *  of the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 #include <sys/types.h>
diff --git a/scripts/kconfig/lxdialog/inputbox.c b/scripts/kconfig/lxdialog/inputbox.c
index fe82ff6d744e..611945611bf8 100644
--- a/scripts/kconfig/lxdialog/inputbox.c
+++ b/scripts/kconfig/lxdialog/inputbox.c
@@ -1,22 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *  inputbox.c -- implements the input box
 *
 *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
 *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version 2
- *  of the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 #include "dialog.h"
diff --git a/scripts/kconfig/lxdialog/menubox.c b/scripts/kconfig/lxdialog/menubox.c
index d70cab36137e..58c2f8afe59b 100644
--- a/scripts/kconfig/lxdialog/menubox.c
+++ b/scripts/kconfig/lxdialog/menubox.c
@@ -1,22 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *  menubox.c -- implements the menu box
 *
 *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
 *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcapw@cfw.com)
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version 2
- *  of the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 /*
diff --git a/scripts/kconfig/lxdialog/textbox.c b/scripts/kconfig/lxdialog/textbox.c
index 88d2818ed956..4e339b12664e 100644
--- a/scripts/kconfig/lxdialog/textbox.c
+++ b/scripts/kconfig/lxdialog/textbox.c
@@ -1,22 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *  textbox.c -- implements the text box
 *
 *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
 *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version 2
- *  of the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 #include "dialog.h"
diff --git a/scripts/kconfig/lxdialog/util.c b/scripts/kconfig/lxdialog/util.c
index f7abdeb92af0..1b490d4af0d3 100644
--- a/scripts/kconfig/lxdialog/util.c
+++ b/scripts/kconfig/lxdialog/util.c
@@ -1,22 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *  util.c
 *
 *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
 *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version 2
- *  of the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 #include <stdarg.h>
diff --git a/scripts/kconfig/lxdialog/yesno.c b/scripts/kconfig/lxdialog/yesno.c
index cd1223c903d1..bcaac9b7bab2 100644
--- a/scripts/kconfig/lxdialog/yesno.c
+++ b/scripts/kconfig/lxdialog/yesno.c
@@ -1,22 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
 *  yesno.c -- implements the yes/no box
 *
 *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
 *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version 2
- *  of the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 #include "dialog.h"
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 143c05fec161..5f8c82a4cb08 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -1,6 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
- * Released under the terms of the GNU GPL v2.0.
 *
 * Introduced single menu mode (show all sub-menus in one large tree).
 * 2002-11-06 Petr Baudis <pasky@ucw.cz>
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 4cf15d449c05..d9d16469859a 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -1,6 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
- * Released under the terms of the GNU GPL v2.0.
 */
 #include <ctype.h>
@@ -195,29 +195,26 @@ void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep)
        menu_add_prop(type, NULL, expr_alloc_symbol(sym), dep);
 }
-void menu_add_option(int token, char *arg)
+void menu_add_option_modules(void)
 {
-        switch (token) {
+        if (modules_sym)
-        case T_OPT_MODULES:
+                zconf_error("symbol '%s' redefines option 'modules' already defined by symbol '%s'",
-                if (modules_sym)
+                            current_entry->sym->name, modules_sym->name);
-                        zconf_error("symbol '%s' redefines option 'modules'"
+        modules_sym = current_entry->sym;
-                                    " already defined by symbol '%s'",
+}
-                                    current_entry->sym->name,
-                                    modules_sym->name
+void menu_add_option_defconfig_list(void)
-                                    );
+{
-                modules_sym = current_entry->sym;
+        if (!sym_defconfig_list)
-                break;
+                sym_defconfig_list = current_entry->sym;
-        case T_OPT_DEFCONFIG_LIST:
+        else if (sym_defconfig_list != current_entry->sym)
-                if (!sym_defconfig_list)
+                zconf_error("trying to redefine defconfig symbol");
-                        sym_defconfig_list = current_entry->sym;
+        sym_defconfig_list->flags |= SYMBOL_NO_WRITE;
-                else if (sym_defconfig_list != current_entry->sym)
+}
-                        zconf_error("trying to redefine defconfig symbol");
-                sym_defconfig_list->flags |= SYMBOL_NO_WRITE;
+void menu_add_option_allnoconfig_y(void)
-                break;
+{
-        case T_OPT_ALLNOCONFIG_Y:
+        current_entry->sym->flags |= SYMBOL_ALLNOCONFIG_Y;
-                current_entry->sym->flags |= SYMBOL_ALLNOCONFIG_Y;
-                break;
-        }
 }
 static int menu_validate_number(struct symbol *sym, struct symbol *sym2)
diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index 0ef906499646..d924c51d28b7 100755
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -1,4 +1,6 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+#
 #  merge_config.sh - Takes a list of config fragment values, and merges
 #  them one by one. Provides warnings on overridden values, and specified
 #  values that did not make it to the resulting .config file (due to missed
@@ -10,18 +12,10 @@
 #
 #  Copyright (c) 2009-2010 Wind River Systems, Inc.
 #  Copyright 2011 Linaro
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License version 2 as
-#  published by the Free Software Foundation.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#  See the GNU General Public License for more details.
 clean_up() {
        rm -f $TMP_FILE
+        rm -f $MERGE_FILE
        exit
 }
 trap clean_up HUP INT TERM
@@ -32,6 +26,7 @@ usage() {
        echo "  -m    only merge the fragments, do not execute the make command"
        echo "  -n    use allnoconfig instead of alldefconfig"
        echo "  -r    list redundant entries when merging fragments"
+        echo "  -y    make builtin have precedence over modules"
        echo "  -O    dir to put generated output files.  Consider setting \$KCONFIG_CONFIG instead."
        echo
        echo "Used prefix: '$CONFIG_PREFIX'. You can redefine it with \$CONFIG_ environment variable."
@@ -40,6 +35,7 @@ usage() {
 RUNMAKE=true
 ALLTARGET=alldefconfig
 WARNREDUN=false
+BUILTIN=false
 OUTPUT=.
 CONFIG_PREFIX=${CONFIG_-CONFIG_}
@@ -64,6 +60,11 @@ while true; do
                shift
                continue
                ;;
+        "-y")
+                BUILTIN=true
+                shift
+                continue
+                ;;
        "-O")
                if [ -d $2 ];then
                        OUTPUT=$(echo $2 | sed 's/\/*$//')
@@ -106,32 +107,45 @@ SED_CONFIG_EXP1="s/^\(${CONFIG_PREFIX}[a-zA-Z0-9_]*\)=.*/\1/p"
 SED_CONFIG_EXP2="s/^# \(${CONFIG_PREFIX}[a-zA-Z0-9_]*\) is not set$/\1/p"
 TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX)
+MERGE_FILE=$(mktemp ./.merge_tmp.config.XXXXXXXXXX)
 echo "Using $INITFILE as base"
 cat $INITFILE > $TMP_FILE
 # Merge files, printing warnings on overridden values
-for MERGE_FILE in $MERGE_LIST ; do
+for ORIG_MERGE_FILE in $MERGE_LIST ; do
-        echo "Merging $MERGE_FILE"
+        echo "Merging $ORIG_MERGE_FILE"
-        if [ ! -r "$MERGE_FILE" ]; then
+        if [ ! -r "$ORIG_MERGE_FILE" ]; then
-                echo "The merge file '$MERGE_FILE' does not exist.  Exit." >&2
+                echo "The merge file '$ORIG_MERGE_FILE' does not exist.  Exit." >&2
                exit 1
        fi
+        cat $ORIG_MERGE_FILE > $MERGE_FILE
        CFG_LIST=$(sed -n -e "$SED_CONFIG_EXP1" -e "$SED_CONFIG_EXP2" $MERGE_FILE)
        for CFG in $CFG_LIST ; do
                grep -q -w $CFG $TMP_FILE || continue
                PREV_VAL=$(grep -w $CFG $TMP_FILE)
                NEW_VAL=$(grep -w $CFG $MERGE_FILE)
-                if [ "x$PREV_VAL" != "x$NEW_VAL" ] ; then
+                BUILTIN_FLAG=false
-                        echo Value of $CFG is redefined by fragment $MERGE_FILE:
+                if [ "$BUILTIN" = "true" ] && [ "${NEW_VAL#CONFIG_*=}" = "m" ] && [ "${PREV_VAL#CONFIG_*=}" = "y" ]; then
+                        echo Previous  value: $PREV_VAL
+                        echo New value:       $NEW_VAL
+                        echo -y passed, will not demote y to m
+                        echo
+                        BUILTIN_FLAG=true
+                elif [ "x$PREV_VAL" != "x$NEW_VAL" ] ; then
+                        echo Value of $CFG is redefined by fragment $ORIG_MERGE_FILE:
                        echo Previous  value: $PREV_VAL
                        echo New value:       $NEW_VAL
                        echo
                elif [ "$WARNREDUN" = "true" ]; then
-                        echo Value of $CFG is redundant by fragment $MERGE_FILE:
+                        echo Value of $CFG is redundant by fragment $ORIG_MERGE_FILE:
+                fi
+                if [ "$BUILTIN_FLAG" = "false" ]; then
+                        sed -i "/$CFG[ =]/d" $TMP_FILE
+                else
+                        sed -i "/$CFG[ =]/d" $MERGE_FILE
                fi
-                sed -i "/$CFG[ =]/d" $TMP_FILE
        done
        cat $MERGE_FILE >> $TMP_FILE
 done
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
index 1ef232ae5ab9..a4670f4e825a 100644
--- a/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
- * Copyright (C) 2008 Nir Tzachar <nir.tzachar@gmail.com?
+ * Copyright (C) 2008 Nir Tzachar <nir.tzachar@gmail.com>
- * Released under the terms of the GNU GPL v2.0.
 *
 * Derived from menuconfig.
- *
 */
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
diff --git a/scripts/kconfig/nconf.gui.c b/scripts/kconfig/nconf.gui.c
index 88874acfda36..7be620a1fcdb 100644
--- a/scripts/kconfig/nconf.gui.c
+++ b/scripts/kconfig/nconf.gui.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
- * Copyright (C) 2008 Nir Tzachar <nir.tzachar@gmail.com?
+ * Copyright (C) 2008 Nir Tzachar <nir.tzachar@gmail.com>
- * Released under the terms of the GNU GPL v2.0.
 *
 * Derived from menuconfig.
- *
 */
 #include "nconf.h"
 #include "lkc.h"
diff --git a/scripts/kconfig/nconf.h b/scripts/kconfig/nconf.h
index 2b9e19f603c4..fa5245eb93a7 100644
--- a/scripts/kconfig/nconf.h
+++ b/scripts/kconfig/nconf.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
- * Copyright (C) 2008 Nir Tzachar <nir.tzachar@gmail.com?
+ * Copyright (C) 2008 Nir Tzachar <nir.tzachar@gmail.com>
- * Released under the terms of the GNU GPL v2.0.
 *
 * Derived from menuconfig.
- *
 */
 #include <ctype.h>
diff --git a/scripts/kconfig/preprocess.c b/scripts/kconfig/preprocess.c
index 5ca2df790d3c..592dfbfa9fb3 100644
--- a/scripts/kconfig/preprocess.c
+++ b/scripts/kconfig/preprocess.c
@@ -2,6 +2,7 @@
 //
 // Copyright (C) 2018 Masahiro Yamada <yamada.masahiro@socionext.com>
+#include <ctype.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -9,6 +10,7 @@
 #include <string.h>
 #include "list.h"
+#include "lkc.h"
 #define ARRAY_SIZE(arr)         (sizeof(arr) / sizeof((arr)[0]))
@@ -555,8 +557,7 @@ char *expand_string(const char *in)
 static bool is_end_of_token(char c)
 {
-        /* Why are '.' and '/' valid characters for symbols? */
+        return !(isalnum(c) || c == '_' || c == '-');
-        return !(isalnum(c) || c == '_' || c == '-' || c == '.' || c == '/');
 }
 /*
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index ef4310f2558b..8be8a70c5542 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -1,7 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
 * Copyright (C) 2015 Boris Barbulovski <bbarbulovski@gmail.com>
- * Released under the terms of the GNU GPL v2.0.
 */
 #include <qglobal.h>
@@ -32,7 +32,7 @@
 #include "qconf.h"
 #include "qconf.moc"
-#include "images.c"
+#include "images.h"
 static QApplication *configApp;
diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h
index a40036d1b059..41df466e67d9 100644
--- a/scripts/kconfig/qconf.h
+++ b/scripts/kconfig/qconf.h
@@ -1,6 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
 * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
- * Released under the terms of the GNU GPL v2.0.
 */
 #include <QTextBrowser>
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index 4686531e2f8c..08d76d7b3b81 100755
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
+# SPDX-License-Identifier: GPL-2.0
 #
 # Copyright 2005-2009 - Steven Rostedt
-# Licensed under the terms of the GNU GPL License version 2
 #
 #  It's simple enough to figure out how this works.
 #  If not, then you can ask me at stripconfig@goodmis.org
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 703b9b899ee9..1f9266dadedf 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -1,6 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
- * Released under the terms of the GNU GPL v2.0.
 */
 #include <ctype.h>
@@ -61,8 +61,6 @@ const char *sym_type_name(enum symbol_type type)
                return "string";
        case S_UNKNOWN:
                return "unknown";
-        case S_OTHER:
-                break;
        }
        return "???";
 }
@@ -88,7 +86,7 @@ static struct property *sym_get_default_prop(struct symbol *sym)
        return NULL;
 }
-static struct property *sym_get_range_prop(struct symbol *sym)
+struct property *sym_get_range_prop(struct symbol *sym)
 {
        struct property *prop;
@@ -757,7 +755,6 @@ const char *sym_get_string_default(struct symbol *sym)
                return str;
        case S_STRING:
                return str;
-        case S_OTHER:
        case S_UNKNOWN:
                break;
        }
diff --git a/scripts/kconfig/tests/auto_submenu/Kconfig b/scripts/kconfig/tests/auto_submenu/Kconfig
index c17bf2caa7e6..b20761edc2f4 100644
--- a/scripts/kconfig/tests/auto_submenu/Kconfig
+++ b/scripts/kconfig/tests/auto_submenu/Kconfig
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
 config A
        bool "A"
        default y
diff --git a/scripts/kconfig/tests/auto_submenu/__init__.py b/scripts/kconfig/tests/auto_submenu/__init__.py
index 32e79b85faeb..25abd927fd0a 100644
--- a/scripts/kconfig/tests/auto_submenu/__init__.py
+++ b/scripts/kconfig/tests/auto_submenu/__init__.py
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 """
 Create submenu for symbols that depend on the preceding one.
diff --git a/scripts/kconfig/tests/choice/Kconfig b/scripts/kconfig/tests/choice/Kconfig
index cc60e9ce2c03..a412205b1b0c 100644
--- a/scripts/kconfig/tests/choice/Kconfig
+++ b/scripts/kconfig/tests/choice/Kconfig
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
 config MODULES
        bool "Enable loadable module support"
        option modules
diff --git a/scripts/kconfig/tests/choice/__init__.py b/scripts/kconfig/tests/choice/__init__.py
index 9edcc5262134..4318fce05912 100644
--- a/scripts/kconfig/tests/choice/__init__.py
+++ b/scripts/kconfig/tests/choice/__init__.py
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 """
 Basic choice tests.
diff --git a/scripts/kconfig/tests/choice_value_with_m_dep/Kconfig b/scripts/kconfig/tests/choice_value_with_m_dep/Kconfig
index 11ac25c26040..7106c26bb3a8 100644
--- a/scripts/kconfig/tests/choice_value_with_m_dep/Kconfig
+++ b/scripts/kconfig/tests/choice_value_with_m_dep/Kconfig
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
 config MODULES
        def_bool y
        option modules
diff --git a/scripts/kconfig/tests/choice_value_with_m_dep/__init__.py b/scripts/kconfig/tests/choice_value_with_m_dep/__init__.py
index f8d728c7b101..075b4e08696e 100644
--- a/scripts/kconfig/tests/choice_value_with_m_dep/__init__.py
+++ b/scripts/kconfig/tests/choice_value_with_m_dep/__init__.py
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 """
 Hide tristate choice values with mod dependency in y choice.
diff --git a/scripts/kconfig/tests/err_recursive_inc/__init__.py b/scripts/kconfig/tests/err_recursive_inc/__init__.py
index 0e4c839c54aa..27aa1895a0b2 100644
--- a/scripts/kconfig/tests/err_recursive_inc/__init__.py
+++ b/scripts/kconfig/tests/err_recursive_inc/__init__.py
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 """
 Detect recursive inclusion error.
diff --git a/scripts/kconfig/tests/inter_choice/Kconfig b/scripts/kconfig/tests/inter_choice/Kconfig
index e44449f075df..5698a4018dd0 100644
--- a/scripts/kconfig/tests/inter_choice/Kconfig
+++ b/scripts/kconfig/tests/inter_choice/Kconfig
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
 config MODULES
        def_bool y
        option modules
diff --git a/scripts/kconfig/tests/inter_choice/__init__.py b/scripts/kconfig/tests/inter_choice/__init__.py
index 5c7fc365ed40..ffea6b1148a6 100644
--- a/scripts/kconfig/tests/inter_choice/__init__.py
+++ b/scripts/kconfig/tests/inter_choice/__init__.py
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 """
 Do not affect user-assigned choice value by another choice.
diff --git a/scripts/kconfig/tests/new_choice_with_dep/Kconfig b/scripts/kconfig/tests/new_choice_with_dep/Kconfig
index 53ef1b86e7bf..127731c046b5 100644
--- a/scripts/kconfig/tests/new_choice_with_dep/Kconfig
+++ b/scripts/kconfig/tests/new_choice_with_dep/Kconfig
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
 config A
        bool "A"
        help
diff --git a/scripts/kconfig/tests/new_choice_with_dep/__init__.py b/scripts/kconfig/tests/new_choice_with_dep/__init__.py
index f0e0ead0f32f..fe9d322539c9 100644
--- a/scripts/kconfig/tests/new_choice_with_dep/__init__.py
+++ b/scripts/kconfig/tests/new_choice_with_dep/__init__.py
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 """
 Ask new choice values when they become visible.
diff --git a/scripts/kconfig/tests/no_write_if_dep_unmet/Kconfig b/scripts/kconfig/tests/no_write_if_dep_unmet/Kconfig
index c00b8fe54f45..4767aab6d8e3 100644
--- a/scripts/kconfig/tests/no_write_if_dep_unmet/Kconfig
+++ b/scripts/kconfig/tests/no_write_if_dep_unmet/Kconfig
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
 config A
        bool "A"
diff --git a/scripts/kconfig/tests/no_write_if_dep_unmet/__init__.py b/scripts/kconfig/tests/no_write_if_dep_unmet/__init__.py
index 207261b0fe00..ffd469d1f226 100644
--- a/scripts/kconfig/tests/no_write_if_dep_unmet/__init__.py
+++ b/scripts/kconfig/tests/no_write_if_dep_unmet/__init__.py
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 """
 Do not write choice values to .config if the dependency is unmet.
diff --git a/scripts/kconfig/tests/rand_nested_choice/Kconfig b/scripts/kconfig/tests/rand_nested_choice/Kconfig
index c591d512929f..8350de7f732b 100644
--- a/scripts/kconfig/tests/rand_nested_choice/Kconfig
+++ b/scripts/kconfig/tests/rand_nested_choice/Kconfig
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
 choice
        prompt "choice"
diff --git a/scripts/kconfig/tests/rand_nested_choice/__init__.py b/scripts/kconfig/tests/rand_nested_choice/__init__.py
index e729a4e85218..9e4b2db53581 100644
--- a/scripts/kconfig/tests/rand_nested_choice/__init__.py
+++ b/scripts/kconfig/tests/rand_nested_choice/__init__.py
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 """
 Set random values recursively in nested choices.
diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c
index d999683bb2a7..29585394df71 100644
--- a/scripts/kconfig/util.c
+++ b/scripts/kconfig/util.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Copyright (C) 2002-2005 Roman Zippel <zippel@linux-m68k.org>
 * Copyright (C) 2002-2005 Sam Ravnborg <sam@ravnborg.org>
- *
- * Released under the terms of the GNU GPL v2.0.
 */
 #include <stdarg.h>
diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l
index 25bd2b89fe3f..b2d0a3b0bce9 100644
--- a/scripts/kconfig/zconf.l
+++ b/scripts/kconfig/zconf.l
@@ -1,11 +1,11 @@
-%option nostdinit noyywrap never-interactive full ecs
+/* SPDX-License-Identifier: GPL-2.0 */
-%option 8bit nodefault yylineno
-%x COMMAND HELP STRING PARAM ASSIGN_VAL
-%{
 /*
 * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
- * Released under the terms of the GNU GPL v2.0.
 */
+%option nostdinit noyywrap never-interactive full ecs
+%option 8bit nodefault yylineno
+%x ASSIGN_VAL HELP STRING
+%{
 #include <assert.h>
 #include <limits.h>
@@ -15,6 +15,9 @@
 #include <unistd.h>
 #include "lkc.h"
+#include "zconf.tab.h"
+#define YY_DECL         static int yylex1(void)
 #define START_STRSIZE   16
@@ -23,6 +26,8 @@ static struct {
        int lineno;
 } current_pos;
+static int prev_prev_token = T_EOL;
+static int prev_token = T_EOL;
 static char *text;
 static int text_size, text_asize;
@@ -73,7 +78,7 @@ static void warn_ignored_character(char chr)
 {
        fprintf(stderr,
                "%s:%d:warning: ignoring unsupported character '%c'\n",
-                zconf_curname(), zconf_lineno(), chr);
+                current_file->name, yylineno, chr);
 }
 %}
@@ -83,54 +88,73 @@ n	[A-Za-z0-9_-]
        int str = 0;
        int ts, i;
-[ \t]*#.*\n     |
+#.*                     /* ignore comment */
-[ \t]*\n        {
+[ \t]*                  /* whitespaces */
-        return T_EOL;
+\\\n                    /* escaped new line */
-}
+\n                      return T_EOL;
-[ \t]*#.*
+"allnoconfig_y"         return T_ALLNOCONFIG_Y;
+"bool"                  return T_BOOL;
+"choice"                return T_CHOICE;
-[ \t]+  {
+"comment"               return T_COMMENT;
-        BEGIN(COMMAND);
+"config"                return T_CONFIG;
-}
+"def_bool"              return T_DEF_BOOL;
+"def_tristate"          return T_DEF_TRISTATE;
-.       {
+"default"               return T_DEFAULT;
-        unput(yytext[0]);
+"defconfig_list"        return T_DEFCONFIG_LIST;
-        BEGIN(COMMAND);
+"depends"               return T_DEPENDS;
-}
+"endchoice"             return T_ENDCHOICE;
+"endif"                 return T_ENDIF;
+"endmenu"               return T_ENDMENU;
-<COMMAND>{
+"help"|"---help---"     return T_HELP;
-        {n}+    {
+"hex"                   return T_HEX;
-                const struct kconf_id *id = kconf_id_lookup(yytext, yyleng);
+"if"                    return T_IF;
-                current_pos.file = current_file;
+"imply"                 return T_IMPLY;
-                current_pos.lineno = yylineno;
+"int"                   return T_INT;
-                if (id && id->flags & TF_COMMAND) {
+"mainmenu"              return T_MAINMENU;
-                        BEGIN(PARAM);
+"menu"                  return T_MENU;
-                        yylval.id = id;
+"menuconfig"            return T_MENUCONFIG;
-                        return id->token;
+"modules"               return T_MODULES;
-                }
+"on"                    return T_ON;
-                alloc_string(yytext, yyleng);
+"option"                return T_OPTION;
-                yylval.string = text;
+"optional"              return T_OPTIONAL;
-                return T_VARIABLE;
+"prompt"                return T_PROMPT;
-        }
+"range"                 return T_RANGE;
-        ({n}|$)+        {
+"select"                return T_SELECT;
-                /* this token includes at least one '$' */
+"source"                return T_SOURCE;
-                yylval.string = expand_token(yytext, yyleng);
+"string"                return T_STRING;
-                if (strlen(yylval.string))
+"tristate"              return T_TRISTATE;
-                        return T_VARIABLE;
+"visible"               return T_VISIBLE;
-                free(yylval.string);
+"||"                    return T_OR;
-        }
+"&&"                    return T_AND;
-        "="     { BEGIN(ASSIGN_VAL); yylval.flavor = VAR_RECURSIVE; return T_ASSIGN; }
+"="                     return T_EQUAL;
-        ":="    { BEGIN(ASSIGN_VAL); yylval.flavor = VAR_SIMPLE; return T_ASSIGN; }
+"!="                    return T_UNEQUAL;
-        "+="    { BEGIN(ASSIGN_VAL); yylval.flavor = VAR_APPEND; return T_ASSIGN; }
+"<"                     return T_LESS;
-        [[:blank:]]+
+"<="                    return T_LESS_EQUAL;
-        .       warn_ignored_character(*yytext);
+">"                     return T_GREATER;
-        \n      {
+">="                    return T_GREATER_EQUAL;
-                BEGIN(INITIAL);
+"!"                     return T_NOT;
-                return T_EOL;
+"("                     return T_OPEN_PAREN;
-        }
+")"                     return T_CLOSE_PAREN;
-}
+":="                    return T_COLON_EQUAL;
+"+="                    return T_PLUS_EQUAL;
+\"|\'                   {
+                                str = yytext[0];
+                                new_string();
+                                BEGIN(STRING);
+                        }
+{n}+                    {
+                                alloc_string(yytext, yyleng);
+                                yylval.string = text;
+                                return T_WORD;
+                        }
+({n}|$)+                {
+                                /* this token includes at least one '$' */
+                                yylval.string = expand_token(yytext, yyleng);
+                                if (strlen(yylval.string))
+                                        return T_WORD;
+                                free(yylval.string);
+                        }
+.                       warn_ignored_character(*yytext);
 <ASSIGN_VAL>{
        [^[:blank:]\n]+.*       {
@@ -142,71 +166,17 @@ n	[A-Za-z0-9_-]
        .
 }
-<PARAM>{
-        "&&"    return T_AND;
-        "||"    return T_OR;
-        "("     return T_OPEN_PAREN;
-        ")"     return T_CLOSE_PAREN;
-        "!"     return T_NOT;
-        "="     return T_EQUAL;
-        "!="    return T_UNEQUAL;
-        "<="    return T_LESS_EQUAL;
-        ">="    return T_GREATER_EQUAL;
-        "<"     return T_LESS;
-        ">"     return T_GREATER;
-        \"|\'   {
-                str = yytext[0];
-                new_string();
-                BEGIN(STRING);
-        }
-        \n      BEGIN(INITIAL); return T_EOL;
-        ({n}|[/.])+     {
-                const struct kconf_id *id = kconf_id_lookup(yytext, yyleng);
-                if (id && id->flags & TF_PARAM) {
-                        yylval.id = id;
-                        return id->token;
-                }
-                alloc_string(yytext, yyleng);
-                yylval.string = text;
-                return T_WORD;
-        }
-        ({n}|[/.$])+    {
-                /* this token includes at least one '$' */
-                yylval.string = expand_token(yytext, yyleng);
-                if (strlen(yylval.string))
-                        return T_WORD;
-                free(yylval.string);
-        }
-        #.*     /* comment */
-        \\\n    ;
-        [[:blank:]]+
-        .       warn_ignored_character(*yytext);
-        <<EOF>> {
-                BEGIN(INITIAL);
-        }
-}
 <STRING>{
        "$".*   append_expanded_string(yytext);
-        [^$'"\\\n]+/\n  {
-                append_string(yytext, yyleng);
-                yylval.string = text;
-                return T_WORD_QUOTE;
-        }
        [^$'"\\\n]+     {
                append_string(yytext, yyleng);
        }
-        \\.?/\n {
-                append_string(yytext + 1, yyleng - 1);
-                yylval.string = text;
-                return T_WORD_QUOTE;
-        }
        \\.?    {
                append_string(yytext + 1, yyleng - 1);
        }
        \'|\"   {
                if (str == yytext[0]) {
-                        BEGIN(PARAM);
+                        BEGIN(INITIAL);
                        yylval.string = text;
                        return T_WORD_QUOTE;
                } else
@@ -216,11 +186,15 @@ n	[A-Za-z0-9_-]
                fprintf(stderr,
                        "%s:%d:warning: multi-line strings not supported\n",
                        zconf_curname(), zconf_lineno());
+                unput('\n');
                BEGIN(INITIAL);
-                return T_EOL;
+                yylval.string = text;
+                return T_WORD_QUOTE;
        }
        <<EOF>> {
                BEGIN(INITIAL);
+                yylval.string = text;
+                return T_WORD_QUOTE;
        }
 }
@@ -271,6 +245,12 @@ n	[A-Za-z0-9_-]
 }
 <<EOF>> {
+        BEGIN(INITIAL);
+        if (prev_token != T_EOL && prev_token != T_HELPTEXT)
+                fprintf(stderr, "%s:%d:warning: no new line at end of file\n",
+                        current_file->name, yylineno);
        if (current_file) {
                zconf_endfile();
                return T_EOL;
@@ -280,6 +260,41 @@ n	[A-Za-z0-9_-]
 }
 %%
+/* second stage lexer */
+int yylex(void)
+{
+        int token;
+repeat:
+        token = yylex1();
+        if (prev_token == T_EOL || prev_token == T_HELPTEXT) {
+                if (token == T_EOL) {
+                        /* Do not pass unneeded T_EOL to the parser. */
+                        goto repeat;
+                } else {
+                        /*
+                         * For the parser, update file/lineno at the first token
+                         * of each statement. Generally, \n is a statement
+                         * terminator in Kconfig, but it is not always true
+                         * because \n could be escaped by a backslash.
+                         */
+                        current_pos.file = current_file;
+                        current_pos.lineno = yylineno;
+                }
+        }
+        if (prev_prev_token == T_EOL && prev_token == T_WORD &&
+            (token == T_EQUAL || token == T_COLON_EQUAL || token == T_PLUS_EQUAL))
+                BEGIN(ASSIGN_VAL);
+        prev_prev_token = prev_token;
+        prev_token = token;
+        return token;
+}
 static char *expand_token(const char *in, size_t n)
 {
        char *out;
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y
index 22fceb264cf5..60936c76865b 100644
--- a/scripts/kconfig/zconf.y
+++ b/scripts/kconfig/zconf.y
@@ -1,8 +1,8 @@
-%{
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
 * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
- * Released under the terms of the GNU GPL v2.0.
 */
+%{
 #include <ctype.h>
 #include <stdarg.h>
@@ -20,66 +20,68 @@
 int cdebug = PRINTD;
-int yylex(void);
 static void yyerror(const char *err);
 static void zconfprint(const char *err, ...);
 static void zconf_error(const char *err, ...);
-static bool zconf_endtoken(const struct kconf_id *id, int starttoken, int endtoken);
+static bool zconf_endtoken(const char *tokenname,
+                           const char *expected_tokenname);
 struct symbol *symbol_hash[SYMBOL_HASHSIZE];
 static struct menu *current_menu, *current_entry;
 %}
-%expect 30
 %union
 {
        char *string;
-        struct file *file;
        struct symbol *symbol;
        struct expr *expr;
        struct menu *menu;
-        const struct kconf_id *id;
+        enum symbol_type type;
        enum variable_flavor flavor;
 }
-%token <id>T_MAINMENU
-%token <id>T_MENU
-%token <id>T_ENDMENU
-%token <id>T_SOURCE
-%token <id>T_CHOICE
-%token <id>T_ENDCHOICE
-%token <id>T_COMMENT
-%token <id>T_CONFIG
-%token <id>T_MENUCONFIG
-%token <id>T_HELP
 %token <string> T_HELPTEXT
-%token <id>T_IF
-%token <id>T_ENDIF
-%token <id>T_DEPENDS
-%token <id>T_OPTIONAL
-%token <id>T_PROMPT
-%token <id>T_TYPE
-%token <id>T_DEFAULT
-%token <id>T_SELECT
-%token <id>T_IMPLY
-%token <id>T_RANGE
-%token <id>T_VISIBLE
-%token <id>T_OPTION
-%token <id>T_ON
 %token <string> T_WORD
 %token <string> T_WORD_QUOTE
-%token T_UNEQUAL
+%token T_ALLNOCONFIG_Y
-%token T_LESS
+%token T_BOOL
-%token T_LESS_EQUAL
+%token T_CHOICE
-%token T_GREATER
-%token T_GREATER_EQUAL
 %token T_CLOSE_PAREN
+%token T_COLON_EQUAL
+%token T_COMMENT
+%token T_CONFIG
+%token T_DEFAULT
+%token T_DEFCONFIG_LIST
+%token T_DEF_BOOL
+%token T_DEF_TRISTATE
+%token T_DEPENDS
+%token T_ENDCHOICE
+%token T_ENDIF
+%token T_ENDMENU
+%token T_HELP
+%token T_HEX
+%token T_IF
+%token T_IMPLY
+%token T_INT
+%token T_MAINMENU
+%token T_MENU
+%token T_MENUCONFIG
+%token T_MODULES
+%token T_ON
 %token T_OPEN_PAREN
+%token T_OPTION
+%token T_OPTIONAL
+%token T_PLUS_EQUAL
+%token T_PROMPT
+%token T_RANGE
+%token T_SELECT
+%token T_SOURCE
+%token T_STRING
+%token T_TRISTATE
+%token T_VISIBLE
 %token T_EOL
-%token <string> T_VARIABLE
-%token <flavor> T_ASSIGN
 %token <string> T_ASSIGN_VAL
 %left T_OR
@@ -91,12 +93,13 @@ static struct menu *current_menu, *current_entry;
 %type <string> prompt
 %type <symbol> nonconst_symbol
 %type <symbol> symbol
+%type <type> type logic_type default
 %type <expr> expr
 %type <expr> if_expr
-%type <id> end
+%type <string> end
-%type <id> option_name
 %type <menu> if_entry menu_entry choice_entry
-%type <string> symbol_option_arg word_opt assign_val
+%type <string> word_opt assign_val
+%type <flavor> assign_op
 %destructor {
        fprintf(stderr, "%s:%d: missing end statement for this entry\n",
@@ -105,15 +108,8 @@ static struct menu *current_menu, *current_entry;
                menu_end_menu();
 } if_entry menu_entry choice_entry
-%{
-/* Include kconf_id.c here so it can see the token constants. */
-#include "kconf_id.c"
-%}
 %%
-input: nl start | start;
+input: mainmenu_stmt stmt_list | stmt_list;
-start: mainmenu_stmt stmt_list | stmt_list;
 /* mainmenu entry */
@@ -127,22 +123,12 @@ stmt_list:
        | stmt_list common_stmt
        | stmt_list choice_stmt
        | stmt_list menu_stmt
-        | stmt_list end                 { zconf_error("unexpected end statement"); }
        | stmt_list T_WORD error T_EOL  { zconf_error("unknown statement \"%s\"", $2); }
-        | stmt_list option_name error T_EOL
-{
-        zconf_error("unexpected option \"%s\"", $2->name);
-}
        | stmt_list error T_EOL         { zconf_error("invalid statement"); }
 ;
-option_name:
-        T_DEPENDS | T_PROMPT | T_TYPE | T_SELECT | T_IMPLY | T_OPTIONAL | T_RANGE | T_DEFAULT | T_VISIBLE
-;
 common_stmt:
-          T_EOL
+          if_stmt
-        | if_stmt
        | comment_stmt
        | config_stmt
        | menuconfig_stmt
@@ -150,12 +136,6 @@ common_stmt:
        | assignment_stmt
 ;
-option_error:
-          T_WORD error T_EOL            { zconf_error("unknown option \"%s\"", $1); }
-        | error T_EOL                   { zconf_error("invalid option"); }
-;
 /* config/menuconfig entry */
 config_entry_start: T_CONFIG nonconst_symbol T_EOL
@@ -189,19 +169,16 @@ menuconfig_stmt: menuconfig_entry_start config_option_list
 config_option_list:
          /* empty */
        | config_option_list config_option
-        | config_option_list symbol_option
        | config_option_list depends
        | config_option_list help
-        | config_option_list option_error
-        | config_option_list T_EOL
 ;
-config_option: T_TYPE prompt_stmt_opt T_EOL
+config_option: type prompt_stmt_opt T_EOL
 {
-        menu_set_type($1->stype);
+        menu_set_type($1);
        printd(DEBUG_PARSE, "%s:%d:type(%u)\n",
                zconf_curname(), zconf_lineno(),
-                $1->stype);
+                $1);
 };
 config_option: T_PROMPT prompt if_expr T_EOL
@@ -210,14 +187,14 @@ config_option: T_PROMPT prompt if_expr T_EOL
        printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
 };
-config_option: T_DEFAULT expr if_expr T_EOL
+config_option: default expr if_expr T_EOL
 {
        menu_add_expr(P_DEFAULT, $2, $3);
-        if ($1->stype != S_UNKNOWN)
+        if ($1 != S_UNKNOWN)
-                menu_set_type($1->stype);
+                menu_set_type($1);
        printd(DEBUG_PARSE, "%s:%d:default(%u)\n",
                zconf_curname(), zconf_lineno(),
-                $1->stype);
+                $1);
 };
 config_option: T_SELECT nonconst_symbol if_expr T_EOL
@@ -238,27 +215,20 @@ config_option: T_RANGE symbol symbol if_expr T_EOL
        printd(DEBUG_PARSE, "%s:%d:range\n", zconf_curname(), zconf_lineno());
 };
-symbol_option: T_OPTION symbol_option_list T_EOL
+config_option: T_OPTION T_MODULES T_EOL
-;
+{
+        menu_add_option_modules();
+};
-symbol_option_list:
+config_option: T_OPTION T_DEFCONFIG_LIST T_EOL
-          /* empty */
-        | symbol_option_list T_WORD symbol_option_arg
 {
-        const struct kconf_id *id = kconf_id_lookup($2, strlen($2));
+        menu_add_option_defconfig_list();
-        if (id && id->flags & TF_OPTION) {
-                menu_add_option(id->token, $3);
-                free($3);
-        }
-        else
-                zconfprint("warning: ignoring unknown option %s", $2);
-        free($2);
 };
-symbol_option_arg:
+config_option: T_OPTION T_ALLNOCONFIG_Y T_EOL
-          /* empty */           { $$ = NULL; }
+{
-        | T_EQUAL prompt        { $$ = $2; }
+        menu_add_option_allnoconfig_y();
-;
+};
 /* choice entry */
@@ -279,7 +249,7 @@ choice_entry: choice choice_option_list
 choice_end: end
 {
-        if (zconf_endtoken($1, T_CHOICE, T_ENDCHOICE)) {
+        if (zconf_endtoken($1, "choice")) {
                menu_end_menu();
                printd(DEBUG_PARSE, "%s:%d:endchoice\n", zconf_curname(), zconf_lineno());
        }
@@ -293,8 +263,6 @@ choice_option_list:
        | choice_option_list choice_option
        | choice_option_list depends
        | choice_option_list help
-        | choice_option_list T_EOL
-        | choice_option_list option_error
 ;
 choice_option: T_PROMPT prompt if_expr T_EOL
@@ -303,15 +271,11 @@ choice_option: T_PROMPT prompt if_expr T_EOL
        printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
 };
-choice_option: T_TYPE prompt_stmt_opt T_EOL
+choice_option: logic_type prompt_stmt_opt T_EOL
 {
-        if ($1->stype == S_BOOLEAN || $1->stype == S_TRISTATE) {
+        menu_set_type($1);
-                menu_set_type($1->stype);
+        printd(DEBUG_PARSE, "%s:%d:type(%u)\n",
-                printd(DEBUG_PARSE, "%s:%d:type(%u)\n",
+               zconf_curname(), zconf_lineno(), $1);
-                        zconf_curname(), zconf_lineno(),
-                        $1->stype);
-        } else
-                YYERROR;
 };
 choice_option: T_OPTIONAL T_EOL
@@ -322,14 +286,26 @@ choice_option: T_OPTIONAL T_EOL
 choice_option: T_DEFAULT nonconst_symbol if_expr T_EOL
 {
-        if ($1->stype == S_UNKNOWN) {
+        menu_add_symbol(P_DEFAULT, $2, $3);
-                menu_add_symbol(P_DEFAULT, $2, $3);
+        printd(DEBUG_PARSE, "%s:%d:default\n",
-                printd(DEBUG_PARSE, "%s:%d:default\n",
+               zconf_curname(), zconf_lineno());
-                        zconf_curname(), zconf_lineno());
-        } else
-                YYERROR;
 };
+type:
+          logic_type
+        | T_INT                 { $$ = S_INT; }
+        | T_HEX                 { $$ = S_HEX; }
+        | T_STRING              { $$ = S_STRING; }
+logic_type:
+          T_BOOL                { $$ = S_BOOLEAN; }
+        | T_TRISTATE            { $$ = S_TRISTATE; }
+default:
+          T_DEFAULT             { $$ = S_UNKNOWN; }
+        | T_DEF_BOOL            { $$ = S_BOOLEAN; }
+        | T_DEF_TRISTATE        { $$ = S_TRISTATE; }
 choice_block:
          /* empty */
        | choice_block common_stmt
@@ -347,20 +323,13 @@ if_entry: T_IF expr T_EOL
 if_end: end
 {
-        if (zconf_endtoken($1, T_IF, T_ENDIF)) {
+        if (zconf_endtoken($1, "if")) {
                menu_end_menu();
                printd(DEBUG_PARSE, "%s:%d:endif\n", zconf_curname(), zconf_lineno());
        }
 };
-if_stmt: if_entry if_block if_end
+if_stmt: if_entry stmt_list if_end
-;
-if_block:
-          /* empty */
-        | if_block common_stmt
-        | if_block menu_stmt
-        | if_block choice_stmt
 ;
 /* menu entry */
@@ -372,27 +341,26 @@ menu: T_MENU prompt T_EOL
        printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno());
 };
-menu_entry: menu visibility_list depends_list
+menu_entry: menu menu_option_list
 {
        $$ = menu_add_menu();
 };
 menu_end: end
 {
-        if (zconf_endtoken($1, T_MENU, T_ENDMENU)) {
+        if (zconf_endtoken($1, "menu")) {
                menu_end_menu();
                printd(DEBUG_PARSE, "%s:%d:endmenu\n", zconf_curname(), zconf_lineno());
        }
 };
-menu_stmt: menu_entry menu_block menu_end
+menu_stmt: menu_entry stmt_list menu_end
 ;
-menu_block:
+menu_option_list:
          /* empty */
-        | menu_block common_stmt
+        | menu_option_list visible
-        | menu_block menu_stmt
+        | menu_option_list depends
-        | menu_block choice_stmt
 ;
 source_stmt: T_SOURCE prompt T_EOL
@@ -411,7 +379,12 @@ comment: T_COMMENT prompt T_EOL
        printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno());
 };
-comment_stmt: comment depends_list
+comment_stmt: comment comment_option_list
+;
+comment_option_list:
+          /* empty */
+        | comment_option_list depends
 ;
 /* help option */
@@ -440,13 +413,6 @@ help: help_start T_HELPTEXT
 /* depends option */
-depends_list:
-          /* empty */
-        | depends_list depends
-        | depends_list T_EOL
-        | depends_list option_error
-;
 depends: T_DEPENDS T_ON expr T_EOL
 {
        menu_add_dep($3);
@@ -454,14 +420,7 @@ depends: T_DEPENDS T_ON expr T_EOL
 };
 /* visibility option */
+visible: T_VISIBLE if_expr T_EOL
-visibility_list:
-          /* empty */
-        | visibility_list visible
-        | visibility_list T_EOL
-;
-visible: T_VISIBLE if_expr
 {
        menu_add_visibility($2);
 };
@@ -479,14 +438,9 @@ prompt:	  T_WORD
        | T_WORD_QUOTE
 ;
-end:      T_ENDMENU T_EOL       { $$ = $1; }
+end:      T_ENDMENU T_EOL       { $$ = "menu"; }
-        | T_ENDCHOICE T_EOL     { $$ = $1; }
+        | T_ENDCHOICE T_EOL     { $$ = "choice"; }
-        | T_ENDIF T_EOL         { $$ = $1; }
+        | T_ENDIF T_EOL         { $$ = "if"; }
-;
-nl:
-          T_EOL
-        | nl T_EOL
 ;
 if_expr:  /* empty */                   { $$ = NULL; }
@@ -518,7 +472,13 @@ word_opt: /* empty */			{ $$ = NULL; }
 /* assignment statement */
-assignment_stmt:  T_VARIABLE T_ASSIGN assign_val T_EOL  { variable_add($1, $3, $2); free($1); free($3); }
+assignment_stmt:  T_WORD assign_op assign_val T_EOL     { variable_add($1, $3, $2); free($1); free($3); }
+assign_op:
+          T_EQUAL       { $$ = VAR_RECURSIVE; }
+        | T_COLON_EQUAL { $$ = VAR_SIMPLE; }
+        | T_PLUS_EQUAL  { $$ = VAR_APPEND; }
+;
 assign_val:
        /* empty */             { $$ = xstrdup(""); };
@@ -563,35 +523,21 @@ void conf_parse(const char *name)
        sym_set_change_count(1);
 }
-static const char *zconf_tokenname(int token)
+static bool zconf_endtoken(const char *tokenname,
-{
+                           const char *expected_tokenname)
-        switch (token) {
-        case T_MENU:            return "menu";
-        case T_ENDMENU:         return "endmenu";
-        case T_CHOICE:          return "choice";
-        case T_ENDCHOICE:       return "endchoice";
-        case T_IF:              return "if";
-        case T_ENDIF:           return "endif";
-        case T_DEPENDS:         return "depends";
-        case T_VISIBLE:         return "visible";
-        }
-        return "<token>";
-}
-static bool zconf_endtoken(const struct kconf_id *id, int starttoken, int endtoken)
 {
-        if (id->token != endtoken) {
+        if (strcmp(tokenname, expected_tokenname)) {
                zconf_error("unexpected '%s' within %s block",
-                        id->name, zconf_tokenname(starttoken));
+                            tokenname, expected_tokenname);
                yynerrs++;
                return false;
        }
        if (current_menu->file != current_file) {
                zconf_error("'%s' in different file than '%s'",
-                        id->name, zconf_tokenname(starttoken));
+                            tokenname, expected_tokenname);
                fprintf(stderr, "%s:%d: location of the '%s'\n",
                        current_menu->file->name, current_menu->lineno,
-                        zconf_tokenname(starttoken));
+                        expected_tokenname);
                yynerrs++;
                return false;
        }
@@ -781,10 +727,5 @@ void zconfdump(FILE *out)
        }
 }
-#include "zconf.lex.c"
 #include "util.c"
-#include "confdata.c"
-#include "expr.c"
-#include "symbol.c"
 #include "menu.c"
-#include "preprocess.c"
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index ffbe901a37b5..c5333d251985 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -212,7 +212,7 @@ my $anon_struct_union = 0;
 my $type_constant = '\b``([^\`]+)``\b';
 my $type_constant2 = '\%([-_\w]+)';
 my $type_func = '(\w+)\(\)';
-my $type_param = '\@(\w*(\.\w+)*(\.\.\.)?)';
+my $type_param = '\@(\w*((\.\w+)|(->\w+))*(\.\.\.)?)';
 my $type_fp_param = '\@(\w+)\(\)';  # Special RST handling for func ptr params
 my $type_env = '(\$\w+)';
 my $type_enum = '\&(enum\s*([_\w]+))';
@@ -361,7 +361,7 @@ my $doc_com = '\s*\*\s*';
 my $doc_com_body = '\s*\* ?';
 my $doc_decl = $doc_com . '(\w+)';
 # @params and a strictly limited set of supported section names
-my $doc_sect = $doc_com . 
+my $doc_sect = $doc_com .
    '\s*(\@[.\w]+|\@\.\.\.|description|context|returns?|notes?|examples?)\s*:(.*)';
 my $doc_content = $doc_com_body . '(.*)';
 my $doc_block = $doc_com . 'DOC:\s*(.*)?';
@@ -751,7 +751,7 @@ sub output_blockhead_rst(%) {
 #
 # Apply the RST highlights to a sub-block of text.
-#   
+#
 sub highlight_block($) {
    # The dohighlight kludge requires the text be called $contents
    my $contents = shift;
@@ -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*\{(.*)\}(\s*(__packed|__aligned|__attribute__\s*\(\([a-z0-9,_\s\(\)]*\)\)))*/) {
        my $decl_type = $1;
        $declaration_name = $2;
        my $members = $3;
@@ -1073,8 +1073,9 @@ sub dump_struct($$) {
        # strip comments:
        $members =~ s/\/\*.*?\*\///gos;
        # strip attributes
-        $members =~ s/__attribute__\s*\(\([a-z,_\*\s\(\)]*\)\)//i;
+        $members =~ s/\s*__attribute__\s*\(\([a-z0-9,_\*\s\(\)]*\)\)//gi;
-        $members =~ s/__aligned\s*\([^;]*\)//gos;
+        $members =~ s/\s*__aligned\s*\([^;]*\)//gos;
+        $members =~ s/\s*__packed\s*//gos;
        $members =~ s/\s*CRYPTO_MINALIGN_ATTR//gos;
        # replace DECLARE_BITMAP
        $members =~ s/DECLARE_BITMAP\s*\(([^,)]+),\s*([^,)]+)\)/unsigned long $1\[BITS_TO_LONGS($2)\]/gos;
diff --git a/scripts/mod/Makefile b/scripts/mod/Makefile
index a5b4af47987a..42c5d50f2bcc 100644
--- a/scripts/mod/Makefile
+++ b/scripts/mod/Makefile
@@ -4,8 +4,6 @@ OBJECT_FILES_NON_STANDARD := y
 hostprogs-y     := modpost mk_elfconfig
 always          := $(hostprogs-y) empty.o
-CFLAGS_REMOVE_empty.o := $(ASM_MACRO_FLAGS)
 modpost-objs    := modpost.o file2alias.o sumversion.o
 devicetable-offsets-file := devicetable-offsets.h
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 28a61665bb9c..a37af7d71973 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -47,49 +47,9 @@ typedef struct {
 struct devtable {
        const char *device_id; /* name of table, __mod_<name>__*_device_table. */
        unsigned long id_size;
-        void *function;
+        int (*do_entry)(const char *filename, void *symval, char *alias);
 };
-#define ___cat(a,b) a ## b
-#define __cat(a,b) ___cat(a,b)
-/* we need some special handling for this host tool running eventually on
- * Darwin. The Mach-O section handling is a bit different than ELF section
- * handling. The differnces in detail are:
- *  a) we have segments which have sections
- *  b) we need a API call to get the respective section symbols */
-#if defined(__MACH__)
-#include <mach-o/getsect.h>
-#define INIT_SECTION(name)  do {                                        \
-                unsigned long name ## _len;                             \
-                char *__cat(pstart_,name) = getsectdata("__TEXT",       \
-                        #name, &__cat(name,_len));                      \
-                char *__cat(pstop_,name) = __cat(pstart_,name) +        \
-                        __cat(name, _len);                              \
-                __cat(__start_,name) = (void *)__cat(pstart_,name);     \
-                __cat(__stop_,name) = (void *)__cat(pstop_,name);       \
-        } while (0)
-#define SECTION(name)   __attribute__((section("__TEXT, " #name)))
-struct devtable **__start___devtable, **__stop___devtable;
-#else
-#define INIT_SECTION(name) /* no-op for ELF */
-#define SECTION(name)   __attribute__((section(#name)))
-/* We construct a table of pointers in an ELF section (pointers generally
- * go unpadded by gcc).  ld creates boundary syms for us. */
-extern struct devtable *__start___devtable[], *__stop___devtable[];
-#endif /* __MACH__ */
-#if !defined(__used)
-# if __GNUC__ == 3 && __GNUC_MINOR__ < 3
-#  define __used                        __attribute__((__unused__))
-# else
-#  define __used                        __attribute__((__used__))
-# endif
-#endif
 /* Define a variable f that holds the value of field f of struct devid
 * based at address m.
 */
@@ -110,16 +70,6 @@ extern struct devtable *__start___devtable[], *__stop___devtable[];
 #define DEF_FIELD_ADDR(m, devid, f) \
        DEF_FIELD_ADDR_VAR(m, devid, f, f)
-/* Add a table entry.  We test function type matches while we're here. */
-#define ADD_TO_DEVTABLE(device_id, type, function) \
-        static struct devtable __cat(devtable,__LINE__) = {     \
-                device_id + 0*sizeof((function)((const char *)NULL,     \
-                                                (void *)NULL,           \
-                                                (char *)NULL)),         \
-                SIZE_##type, (function) };                              \
-        static struct devtable *SECTION(__devtable) __used \
-                __cat(devtable_ptr,__LINE__) = &__cat(devtable,__LINE__)
 #define ADD(str, sep, cond, field)                              \
 do {                                                            \
        strcat(str, sep);                                       \
@@ -439,7 +389,6 @@ static int do_hid_entry(const char *filename,
        return 1;
 }
-ADD_TO_DEVTABLE("hid", hid_device_id, do_hid_entry);
 /* Looks like: ieee1394:venNmoNspNverN */
 static int do_ieee1394_entry(const char *filename,
@@ -464,7 +413,6 @@ static int do_ieee1394_entry(const char *filename,
        add_wildcard(alias);
        return 1;
 }
-ADD_TO_DEVTABLE("ieee1394", ieee1394_device_id, do_ieee1394_entry);
 /* Looks like: pci:vNdNsvNsdNbcNscNiN. */
 static int do_pci_entry(const char *filename,
@@ -508,7 +456,6 @@ static int do_pci_entry(const char *filename,
        add_wildcard(alias);
        return 1;
 }
-ADD_TO_DEVTABLE("pci", pci_device_id, do_pci_entry);
 /* looks like: "ccw:tNmNdtNdmN" */
 static int do_ccw_entry(const char *filename,
@@ -532,7 +479,6 @@ static int do_ccw_entry(const char *filename,
        add_wildcard(alias);
        return 1;
 }
-ADD_TO_DEVTABLE("ccw", ccw_device_id, do_ccw_entry);
 /* looks like: "ap:tN" */
 static int do_ap_entry(const char *filename,
@@ -543,7 +489,6 @@ static int do_ap_entry(const char *filename,
        sprintf(alias, "ap:t%02X*", dev_type);
        return 1;
 }
-ADD_TO_DEVTABLE("ap", ap_device_id, do_ap_entry);
 /* looks like: "css:tN" */
 static int do_css_entry(const char *filename,
@@ -554,7 +499,6 @@ static int do_css_entry(const char *filename,
        sprintf(alias, "css:t%01X", type);
        return 1;
 }
-ADD_TO_DEVTABLE("css", css_device_id, do_css_entry);
 /* Looks like: "serio:tyNprNidNexN" */
 static int do_serio_entry(const char *filename,
@@ -574,7 +518,6 @@ static int do_serio_entry(const char *filename,
        add_wildcard(alias);
        return 1;
 }
-ADD_TO_DEVTABLE("serio", serio_device_id, do_serio_entry);
 /* looks like: "acpi:ACPI0003" or "acpi:PNP0C0B" or "acpi:LNXVIDEO" or
 *             "acpi:bbsspp" (bb=base-class, ss=sub-class, pp=prog-if)
@@ -612,7 +555,6 @@ static int do_acpi_entry(const char *filename,
        }
        return 1;
 }
-ADD_TO_DEVTABLE("acpi", acpi_device_id, do_acpi_entry);
 /* looks like: "pnp:dD" */
 static void do_pnp_device_entry(void *symval, unsigned long size,
@@ -736,7 +678,6 @@ static int do_pcmcia_entry(const char *filename,
        add_wildcard(alias);
        return 1;
 }
-ADD_TO_DEVTABLE("pcmcia", pcmcia_device_id, do_pcmcia_entry);
 static int do_vio_entry(const char *filename, void *symval,
                char *alias)
@@ -756,7 +697,6 @@ static int do_vio_entry(const char *filename, void *symval,
        add_wildcard(alias);
        return 1;
 }
-ADD_TO_DEVTABLE("vio", vio_device_id, do_vio_entry);
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
@@ -829,7 +769,6 @@ static int do_input_entry(const char *filename, void *symval,
                do_input(alias, *swbit, 0, INPUT_DEVICE_ID_SW_MAX);
        return 1;
 }
-ADD_TO_DEVTABLE("input", input_device_id, do_input_entry);
 static int do_eisa_entry(const char *filename, void *symval,
                char *alias)
@@ -841,7 +780,6 @@ static int do_eisa_entry(const char *filename, void *symval,
                strcat(alias, "*");
        return 1;
 }
-ADD_TO_DEVTABLE("eisa", eisa_device_id, do_eisa_entry);
 /* Looks like: parisc:tNhvNrevNsvN */
 static int do_parisc_entry(const char *filename, void *symval,
@@ -861,7 +799,6 @@ static int do_parisc_entry(const char *filename, void *symval,
        add_wildcard(alias);
        return 1;
 }
-ADD_TO_DEVTABLE("parisc", parisc_device_id, do_parisc_entry);
 /* Looks like: sdio:cNvNdN. */
 static int do_sdio_entry(const char *filename,
@@ -878,7 +815,6 @@ static int do_sdio_entry(const char *filename,
        add_wildcard(alias);
        return 1;
 }
-ADD_TO_DEVTABLE("sdio", sdio_device_id, do_sdio_entry);
 /* Looks like: ssb:vNidNrevN. */
 static int do_ssb_entry(const char *filename,
@@ -895,7 +831,6 @@ static int do_ssb_entry(const char *filename,
        add_wildcard(alias);
        return 1;
 }
-ADD_TO_DEVTABLE("ssb", ssb_device_id, do_ssb_entry);
 /* Looks like: bcma:mNidNrevNclN. */
 static int do_bcma_entry(const char *filename,
@@ -914,7 +849,6 @@ static int do_bcma_entry(const char *filename,
        add_wildcard(alias);
        return 1;
 }
-ADD_TO_DEVTABLE("bcma", bcma_device_id, do_bcma_entry);
 /* Looks like: virtio:dNvN */
 static int do_virtio_entry(const char *filename, void *symval,
@@ -930,7 +864,6 @@ static int do_virtio_entry(const char *filename, void *symval,
        add_wildcard(alias);
        return 1;
 }
-ADD_TO_DEVTABLE("virtio", virtio_device_id, do_virtio_entry);
 /*
 * Looks like: vmbus:guid
@@ -953,7 +886,6 @@ static int do_vmbus_entry(const char *filename, void *symval,
        return 1;
 }
-ADD_TO_DEVTABLE("vmbus", hv_vmbus_device_id, do_vmbus_entry);
 /* Looks like: rpmsg:S */
 static int do_rpmsg_entry(const char *filename, void *symval,
@@ -964,7 +896,6 @@ static int do_rpmsg_entry(const char *filename, void *symval,
        return 1;
 }
-ADD_TO_DEVTABLE("rpmsg", rpmsg_device_id, do_rpmsg_entry);
 /* Looks like: i2c:S */
 static int do_i2c_entry(const char *filename, void *symval,
@@ -975,7 +906,6 @@ static int do_i2c_entry(const char *filename, void *symval,
        return 1;
 }
-ADD_TO_DEVTABLE("i2c", i2c_device_id, do_i2c_entry);
 /* Looks like: spi:S */
 static int do_spi_entry(const char *filename, void *symval,
@@ -986,7 +916,6 @@ static int do_spi_entry(const char *filename, void *symval,
        return 1;
 }
-ADD_TO_DEVTABLE("spi", spi_device_id, do_spi_entry);
 static const struct dmifield {
        const char *prefix;
@@ -1041,7 +970,6 @@ static int do_dmi_entry(const char *filename, void *symval,
        strcat(alias, ":");
        return 1;
 }
-ADD_TO_DEVTABLE("dmi", dmi_system_id, do_dmi_entry);
 static int do_platform_entry(const char *filename,
                             void *symval, char *alias)
@@ -1050,7 +978,6 @@ static int do_platform_entry(const char *filename,
        sprintf(alias, PLATFORM_MODULE_PREFIX "%s", *name);
        return 1;
 }
-ADD_TO_DEVTABLE("platform", platform_device_id, do_platform_entry);
 static int do_mdio_entry(const char *filename,
                         void *symval, char *alias)
@@ -1075,7 +1002,6 @@ static int do_mdio_entry(const char *filename,
        return 1;
 }
-ADD_TO_DEVTABLE("mdio", mdio_device_id, do_mdio_entry);
 /* Looks like: zorro:iN. */
 static int do_zorro_entry(const char *filename, void *symval,
@@ -1086,7 +1012,6 @@ static int do_zorro_entry(const char *filename, void *symval,
        ADD(alias, "i", id != ZORRO_WILDCARD, id);
        return 1;
 }
-ADD_TO_DEVTABLE("zorro", zorro_device_id, do_zorro_entry);
 /* looks like: "pnp:dD" */
 static int do_isapnp_entry(const char *filename,
@@ -1102,7 +1027,6 @@ static int do_isapnp_entry(const char *filename,
                (function >> 12) & 0x0f, (function >> 8) & 0x0f);
        return 1;
 }
-ADD_TO_DEVTABLE("isapnp", isapnp_device_id, do_isapnp_entry);
 /* Looks like: "ipack:fNvNdN". */
 static int do_ipack_entry(const char *filename,
@@ -1118,7 +1042,6 @@ static int do_ipack_entry(const char *filename,
        add_wildcard(alias);
        return 1;
 }
-ADD_TO_DEVTABLE("ipack", ipack_device_id, do_ipack_entry);
 /*
 * Append a match expression for a single masked hex digit.
@@ -1189,7 +1112,6 @@ static int do_amba_entry(const char *filename,
        return 1;
 }
-ADD_TO_DEVTABLE("amba", amba_id, do_amba_entry);
 /*
 * looks like: "mipscdmm:tN"
@@ -1205,7 +1127,6 @@ static int do_mips_cdmm_entry(const char *filename,
        sprintf(alias, "mipscdmm:t%02X*", type);
        return 1;
 }
-ADD_TO_DEVTABLE("mipscdmm", mips_cdmm_device_id, do_mips_cdmm_entry);
 /* LOOKS like cpu:type:x86,venVVVVfamFFFFmodMMMM:feature:*,FEAT,*
 * All fields are numbers. It would be nicer to use strings for vendor
@@ -1230,7 +1151,6 @@ static int do_x86cpu_entry(const char *filename, void *symval,
                sprintf(alias + strlen(alias), "%04X*", feature);
        return 1;
 }
-ADD_TO_DEVTABLE("x86cpu", x86_cpu_id, do_x86cpu_entry);
 /* LOOKS like cpu:type:*:feature:*FEAT* */
 static int do_cpu_entry(const char *filename, void *symval, char *alias)
@@ -1240,7 +1160,6 @@ static int do_cpu_entry(const char *filename, void *symval, char *alias)
        sprintf(alias, "cpu:type:*:feature:*%04X*", feature);
        return 1;
 }
-ADD_TO_DEVTABLE("cpu", cpu_feature, do_cpu_entry);
 /* Looks like: mei:S:uuid:N:* */
 static int do_mei_entry(const char *filename, void *symval,
@@ -1259,7 +1178,6 @@ static int do_mei_entry(const char *filename, void *symval,
        return 1;
 }
-ADD_TO_DEVTABLE("mei", mei_cl_device_id, do_mei_entry);
 /* Looks like: rapidio:vNdNavNadN */
 static int do_rio_entry(const char *filename,
@@ -1279,7 +1197,6 @@ static int do_rio_entry(const char *filename,
        add_wildcard(alias);
        return 1;
 }
-ADD_TO_DEVTABLE("rapidio", rio_device_id, do_rio_entry);
 /* Looks like: ulpi:vNpN */
 static int do_ulpi_entry(const char *filename, void *symval,
@@ -1292,7 +1209,6 @@ static int do_ulpi_entry(const char *filename, void *symval,
        return 1;
 }
-ADD_TO_DEVTABLE("ulpi", ulpi_device_id, do_ulpi_entry);
 /* Looks like: hdaudio:vNrNaN */
 static int do_hda_entry(const char *filename, void *symval, char *alias)
@@ -1309,7 +1225,6 @@ static int do_hda_entry(const char *filename, void *symval, char *alias)
        add_wildcard(alias);
        return 1;
 }
-ADD_TO_DEVTABLE("hdaudio", hda_device_id, do_hda_entry);
 /* Looks like: sdw:mNpN */
 static int do_sdw_entry(const char *filename, void *symval, char *alias)
@@ -1324,7 +1239,6 @@ static int do_sdw_entry(const char *filename, void *symval, char *alias)
        add_wildcard(alias);
        return 1;
 }
-ADD_TO_DEVTABLE("sdw", sdw_device_id, do_sdw_entry);
 /* Looks like: fsl-mc:vNdN */
 static int do_fsl_mc_entry(const char *filename, void *symval,
@@ -1336,7 +1250,6 @@ static int do_fsl_mc_entry(const char *filename, void *symval,
        sprintf(alias, "fsl-mc:v%08Xd%s", vendor, *obj_type);
        return 1;
 }
-ADD_TO_DEVTABLE("fslmc", fsl_mc_device_id, do_fsl_mc_entry);
 /* Looks like: tbsvc:kSpNvNrN */
 static int do_tbsvc_entry(const char *filename, void *symval, char *alias)
@@ -1361,7 +1274,6 @@ static int do_tbsvc_entry(const char *filename, void *symval, char *alias)
        add_wildcard(alias);
        return 1;
 }
-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)
@@ -1374,7 +1286,6 @@ static int do_typec_entry(const char *filename, void *symval, char *alias)
        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)
@@ -1388,12 +1299,11 @@ static bool sym_is(const char *name, unsigned namelen, const char *symbol)
 static void do_table(void *symval, unsigned long size,
                     unsigned long id_size,
                     const char *device_id,
-                     void *function,
+                     int (*do_entry)(const char *filename, void *symval, char *alias),
                     struct module *mod)
 {
        unsigned int i;
        char alias[500];
-        int (*do_entry)(const char *, void *entry, char *alias) = function;
        device_id_check(mod->name, device_id, size, id_size, symval);
        /* Leave last one: it's the terminator. */
@@ -1407,6 +1317,48 @@ static void do_table(void *symval, unsigned long size,
        }
 }
+static const struct devtable devtable[] = {
+        {"hid", SIZE_hid_device_id, do_hid_entry},
+        {"ieee1394", SIZE_ieee1394_device_id, do_ieee1394_entry},
+        {"pci", SIZE_pci_device_id, do_pci_entry},
+        {"ccw", SIZE_ccw_device_id, do_ccw_entry},
+        {"ap", SIZE_ap_device_id, do_ap_entry},
+        {"css", SIZE_css_device_id, do_css_entry},
+        {"serio", SIZE_serio_device_id, do_serio_entry},
+        {"acpi", SIZE_acpi_device_id, do_acpi_entry},
+        {"pcmcia", SIZE_pcmcia_device_id, do_pcmcia_entry},
+        {"vio", SIZE_vio_device_id, do_vio_entry},
+        {"input", SIZE_input_device_id, do_input_entry},
+        {"eisa", SIZE_eisa_device_id, do_eisa_entry},
+        {"parisc", SIZE_parisc_device_id, do_parisc_entry},
+        {"sdio", SIZE_sdio_device_id, do_sdio_entry},
+        {"ssb", SIZE_ssb_device_id, do_ssb_entry},
+        {"bcma", SIZE_bcma_device_id, do_bcma_entry},
+        {"virtio", SIZE_virtio_device_id, do_virtio_entry},
+        {"vmbus", SIZE_hv_vmbus_device_id, do_vmbus_entry},
+        {"rpmsg", SIZE_rpmsg_device_id, do_rpmsg_entry},
+        {"i2c", SIZE_i2c_device_id, do_i2c_entry},
+        {"spi", SIZE_spi_device_id, do_spi_entry},
+        {"dmi", SIZE_dmi_system_id, do_dmi_entry},
+        {"platform", SIZE_platform_device_id, do_platform_entry},
+        {"mdio", SIZE_mdio_device_id, do_mdio_entry},
+        {"zorro", SIZE_zorro_device_id, do_zorro_entry},
+        {"isapnp", SIZE_isapnp_device_id, do_isapnp_entry},
+        {"ipack", SIZE_ipack_device_id, do_ipack_entry},
+        {"amba", SIZE_amba_id, do_amba_entry},
+        {"mipscdmm", SIZE_mips_cdmm_device_id, do_mips_cdmm_entry},
+        {"x86cpu", SIZE_x86_cpu_id, do_x86cpu_entry},
+        {"cpu", SIZE_cpu_feature, do_cpu_entry},
+        {"mei", SIZE_mei_cl_device_id, do_mei_entry},
+        {"rapidio", SIZE_rio_device_id, do_rio_entry},
+        {"ulpi", SIZE_ulpi_device_id, do_ulpi_entry},
+        {"hdaudio", SIZE_hda_device_id, do_hda_entry},
+        {"sdw", SIZE_sdw_device_id, do_sdw_entry},
+        {"fslmc", SIZE_fsl_mc_device_id, do_fsl_mc_entry},
+        {"tbsvc", SIZE_tb_service_id, do_tbsvc_entry},
+        {"typec", SIZE_typec_device_id, do_typec_entry},
+};
 /* Create MODULE_ALIAS() statements.
 * At this time, we cannot write the actual output C source yet,
 * so we write into the mod->dev_table_buf buffer. */
@@ -1460,13 +1412,14 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
        else if (sym_is(name, namelen, "pnp_card"))
                do_pnp_card_entries(symval, sym->st_size, mod);
        else {
-                struct devtable **p;
+                int i;
-                INIT_SECTION(__devtable);
+                for (i = 0; i < ARRAY_SIZE(devtable); i++) {
+                        const struct devtable *p = &devtable[i];
-                for (p = __start___devtable; p < __stop___devtable; p++) {
+                        if (sym_is(name, namelen, p->device_id)) {
-                        if (sym_is(name, namelen, (*p)->device_id)) {
+                                do_table(symval, sym->st_size, p->id_size,
-                                do_table(symval, sym->st_size, (*p)->id_size,
+                                         p->device_id, p->do_entry, mod);
-                                         (*p)->device_id, (*p)->function, mod);
                                break;
                        }
                }
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 0d998c54564d..26bf886bd168 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -1163,6 +1163,14 @@ static const struct sectioncheck *section_mismatch(
 *   fromsec = text section
 *   refsymname = *.constprop.*
 *
+ * Pattern 6:
+ *   Hide section mismatch warnings for ELF local symbols.  The goal
+ *   is to eliminate false positive modpost warnings caused by
+ *   compiler-generated ELF local symbol names such as ".LANCHOR1".
+ *   Autogenerated symbol names bypass modpost's "Pattern 2"
+ *   whitelisting, which relies on pattern-matching against symbol
+ *   names to work.  (One situation where gcc can autogenerate ELF
+ *   local symbols is when "-fsection-anchors" is used.)
 **/
 static int secref_whitelist(const struct sectioncheck *mismatch,
                            const char *fromsec, const char *fromsym,
@@ -1201,9 +1209,37 @@ static int secref_whitelist(const struct sectioncheck *mismatch,
            match(fromsym, optim_symbols))
                return 0;
+        /* Check for pattern 6 */
+        if (strstarts(fromsym, ".L"))
+                return 0;
        return 1;
 }
+static inline int is_arm_mapping_symbol(const char *str)
+{
+        return str[0] == '$' && strchr("axtd", str[1])
+               && (str[2] == '\0' || str[2] == '.');
+}
+/*
+ * If there's no name there, ignore it; likewise, ignore it if it's
+ * one of the magic symbols emitted used by current ARM tools.
+ *
+ * Otherwise if find_symbols_between() returns those symbols, they'll
+ * fail the whitelist tests and cause lots of false alarms ... fixable
+ * only by merging __exit and __init sections into __text, bloating
+ * the kernel (which is especially evil on embedded platforms).
+ */
+static inline int is_valid_name(struct elf_info *elf, Elf_Sym *sym)
+{
+        const char *name = elf->strtab + sym->st_name;
+        if (!name || !strlen(name))
+                return 0;
+        return !is_arm_mapping_symbol(name);
+}
 /**
 * Find symbol based on relocation record info.
 * In some cases the symbol supplied is a valid symbol so
@@ -1229,6 +1265,8 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,
                        continue;
                if (ELF_ST_TYPE(sym->st_info) == STT_SECTION)
                        continue;
+                if (!is_valid_name(elf, sym))
+                        continue;
                if (sym->st_value == addr)
                        return sym;
                /* Find a symbol nearby - addr are maybe negative */
@@ -1247,30 +1285,6 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,
                return NULL;
 }
-static inline int is_arm_mapping_symbol(const char *str)
-{
-        return str[0] == '$' && strchr("axtd", str[1])
-               && (str[2] == '\0' || str[2] == '.');
-}
-/*
- * If there's no name there, ignore it; likewise, ignore it if it's
- * one of the magic symbols emitted used by current ARM tools.
- *
- * Otherwise if find_symbols_between() returns those symbols, they'll
- * fail the whitelist tests and cause lots of false alarms ... fixable
- * only by merging __exit and __init sections into __text, bloating
- * the kernel (which is especially evil on embedded platforms).
- */
-static inline int is_valid_name(struct elf_info *elf, Elf_Sym *sym)
-{
-        const char *name = elf->strtab + sym->st_name;
-        if (!name || !strlen(name))
-                return 0;
-        return !is_arm_mapping_symbol(name);
-}
 /*
 * Find symbols before or equal addr and after addr - in the section sec.
 * If we find two symbols with equal offset prefer one with a valid name.
@@ -2083,15 +2097,27 @@ static void check_for_unused(enum export exp, const char *m, const char *s)
        }
 }
-static void check_exports(struct module *mod)
+static int check_exports(struct module *mod)
 {
        struct symbol *s, *exp;
+        int err = 0;
        for (s = mod->unres; s; s = s->next) {
                const char *basename;
                exp = find_symbol(s->name);
-                if (!exp || exp->module == mod)
+                if (!exp || exp->module == mod) {
+                        if (have_vmlinux && !s->weak) {
+                                if (warn_unresolved) {
+                                        warn("\"%s\" [%s.ko] undefined!\n",
+                                             s->name, mod->name);
+                                } else {
+                                        merror("\"%s\" [%s.ko] undefined!\n",
+                                               s->name, mod->name);
+                                        err = 1;
+                                }
+                        }
                        continue;
+                }
                basename = strrchr(mod->name, '/');
                if (basename)
                        basename++;
@@ -2101,6 +2127,8 @@ static void check_exports(struct module *mod)
                        check_for_gpl_usage(exp->export, basename, exp->name);
                check_for_unused(exp->export, basename, exp->name);
        }
+        return err;
 }
 static int check_modname_len(struct module *mod)
@@ -2157,7 +2185,7 @@ static void add_intree_flag(struct buffer *b, int is_intree)
 /* Cannot check for assembler */
 static void add_retpoline(struct buffer *b)
 {
-        buf_printf(b, "\n#ifdef RETPOLINE\n");
+        buf_printf(b, "\n#ifdef CONFIG_RETPOLINE\n");
        buf_printf(b, "MODULE_INFO(retpoline, \"Y\");\n");
        buf_printf(b, "#endif\n");
 }
@@ -2178,19 +2206,8 @@ static int add_versions(struct buffer *b, struct module *mod)
        for (s = mod->unres; s; s = s->next) {
                exp = find_symbol(s->name);
-                if (!exp || exp->module == mod) {
+                if (!exp || exp->module == mod)
-                        if (have_vmlinux && !s->weak) {
-                                if (warn_unresolved) {
-                                        warn("\"%s\" [%s.ko] undefined!\n",
-                                             s->name, mod->name);
-                                } else {
-                                        merror("\"%s\" [%s.ko] undefined!\n",
-                                               s->name, mod->name);
-                                        err = 1;
-                                }
-                        }
                        continue;
-                }
                s->module = exp->module;
                s->crc_valid = exp->crc_valid;
                s->crc = exp->crc;
@@ -2227,15 +2244,15 @@ static int add_versions(struct buffer *b, struct module *mod)
        return err;
 }
-static void add_depends(struct buffer *b, struct module *mod,
+static void add_depends(struct buffer *b, struct module *mod)
-                        struct module *modules)
 {
        struct symbol *s;
-        struct module *m;
        int first = 1;
-        for (m = modules; m; m = m->next)
+        /* Clear ->seen flag of modules that own symbols needed by this. */
-                m->seen = is_vmlinux(m->name);
+        for (s = mod->unres; s; s = s->next)
+                if (s->module)
+                        s->module->seen = is_vmlinux(s->module->name);
        buf_printf(b, "\n");
        buf_printf(b, "static const char __module_depends[]\n");
@@ -2416,7 +2433,7 @@ int main(int argc, char **argv)
        struct ext_sym_list *extsym_iter;
        struct ext_sym_list *extsym_start = NULL;
-        while ((opt = getopt(argc, argv, "i:I:e:mnsST:o:awM:K:E")) != -1) {
+        while ((opt = getopt(argc, argv, "i:I:e:mnsST:o:awE")) != -1) {
                switch (opt) {
                case 'i':
                        kernel_read = optarg;
@@ -2482,12 +2499,6 @@ int main(int argc, char **argv)
        if (files_source)
                read_symbols_from_files(files_source);
-        for (mod = modules; mod; mod = mod->next) {
-                if (mod->skip)
-                        continue;
-                check_exports(mod);
-        }
        err = 0;
        for (mod = modules; mod; mod = mod->next) {
@@ -2499,12 +2510,13 @@ int main(int argc, char **argv)
                buf.pos = 0;
                err |= check_modname_len(mod);
+                err |= check_exports(mod);
                add_header(&buf, mod);
                add_intree_flag(&buf, !external_module);
                add_retpoline(&buf);
                add_staging_flag(&buf, mod->name);
                err |= add_versions(&buf, mod);
-                add_depends(&buf, mod, modules);
+                add_depends(&buf, mod);
                add_moddevtable(&buf, mod);
                add_srcversion(&buf, mod);
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index 73503ebce632..453fecee62f0 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -33,7 +33,6 @@ MKSPEC     := $(srctree)/scripts/package/mkspec
 quiet_cmd_src_tar = TAR     $(2).tar.gz
      cmd_src_tar = \
-set -e; \
 if test "$(objtree)" != "$(srctree)"; then \
        echo >&2; \
        echo >&2 "  ERROR:"; \
diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c
index 895c40e8679f..a50a2aa963ad 100644
--- a/scripts/recordmcount.c
+++ b/scripts/recordmcount.c
@@ -397,7 +397,7 @@ static uint32_t (*w2)(uint16_t);
 static int
 is_mcounted_section_name(char const *const txtname)
 {
-        return strcmp(".text",           txtname) == 0 ||
+        return strncmp(".text",          txtname, 5) == 0 ||
                strcmp(".init.text",     txtname) == 0 ||
                strcmp(".ref.text",      txtname) == 0 ||
                strcmp(".sched.text",    txtname) == 0 ||
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index f599031260d5..68841d01162c 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -142,6 +142,11 @@ my %text_sections = (
     ".text.unlikely" => 1,
 );
+# Acceptable section-prefixes to record.
+my %text_section_prefixes = (
+     ".text." => 1,
+);
 # Note: we are nice to C-programmers here, thus we skip the '||='-idiom.
 $objdump = 'objdump' if (!$objdump);
 $objcopy = 'objcopy' if (!$objcopy);
@@ -519,6 +524,14 @@ while (<IN>) {
        # Only record text sections that we know are safe
        $read_function = defined($text_sections{$1});
+        if (!$read_function) {
+            foreach my $prefix (keys %text_section_prefixes) {
+                if (substr($1, 0, length $prefix) eq $prefix) {
+                    $read_function = 1;
+                    last;
+                }
+            }
+        }
        # print out any recorded offsets
        update_funcs();
diff --git a/scripts/selinux/genheaders/genheaders.c b/scripts/selinux/genheaders/genheaders.c
index fa48fabcb330..1ceedea847dd 100644
--- a/scripts/selinux/genheaders/genheaders.c
+++ b/scripts/selinux/genheaders/genheaders.c
@@ -19,8 +19,6 @@ struct security_class_mapping {
 #include "classmap.h"
 #include "initial_sid_to_string.h"
-#define max(x, y) (((int)(x) > (int)(y)) ? x : y)
 const char *progname;
 static void usage(void)
@@ -46,11 +44,9 @@ static char *stoupperx(const char *s)
 int main(int argc, char *argv[])
 {
-        int i, j, k;
+        int i, j;
        int isids_len;
        FILE *fout;
-        const char *needle = "SOCKET";
-        char *substr;
        progname = argv[0];
@@ -80,20 +76,14 @@ int main(int argc, char *argv[])
        for (i = 0; secclass_map[i].name; i++) {
                struct security_class_mapping *map = &secclass_map[i];
-                fprintf(fout, "#define SECCLASS_%s", map->name);
+                fprintf(fout, "#define SECCLASS_%-39s %2d\n", map->name, i+1);
-                for (j = 0; j < max(1, 40 - strlen(map->name)); j++)
-                        fprintf(fout, " ");
-                fprintf(fout, "%2d\n", i+1);
        }
        fprintf(fout, "\n");
        for (i = 1; i < isids_len; i++) {
                const char *s = initial_sid_to_string[i];
-                fprintf(fout, "#define SECINITSID_%s", s);
+                fprintf(fout, "#define SECINITSID_%-39s %2d\n", s, i);
-                for (j = 0; j < max(1, 40 - strlen(s)); j++)
-                        fprintf(fout, " ");
-                fprintf(fout, "%2d\n", i);
        }
        fprintf(fout, "\n#define SECINITSID_NUM %d\n", i-1);
        fprintf(fout, "\nstatic inline bool security_is_socket_class(u16 kern_tclass)\n");
@@ -101,9 +91,10 @@ int main(int argc, char *argv[])
        fprintf(fout, "\tbool sock = false;\n\n");
        fprintf(fout, "\tswitch (kern_tclass) {\n");
        for (i = 0; secclass_map[i].name; i++) {
+                static char s[] = "SOCKET";
                struct security_class_mapping *map = &secclass_map[i];
-                substr = strstr(map->name, needle);
+                int len = strlen(map->name), l = sizeof(s) - 1;
-                if (substr && strcmp(substr, needle) == 0)
+                if (len >= l && memcmp(map->name + len - l, s, l) == 0)
                        fprintf(fout, "\tcase SECCLASS_%s:\n", map->name);
        }
        fprintf(fout, "\t\tsock = true;\n");
@@ -129,17 +120,15 @@ int main(int argc, char *argv[])
        for (i = 0; secclass_map[i].name; i++) {
                struct security_class_mapping *map = &secclass_map[i];
+                int len = strlen(map->name);
                for (j = 0; map->perms[j]; j++) {
                        if (j >= 32) {
                                fprintf(stderr, "Too many permissions to fit into an access vector at (%s, %s).\n",
                                        map->name, map->perms[j]);
                                exit(5);
                        }
-                        fprintf(fout, "#define %s__%s", map->name,
+                        fprintf(fout, "#define %s__%-*s 0x%08xU\n", map->name,
-                                map->perms[j]);
+                                39-len, map->perms[j], 1U<<j);
-                        for (k = 0; k < max(1, 40 - strlen(map->name) - strlen(map->perms[j])); k++)
-                                fprintf(fout, " ");
-                        fprintf(fout, "0x%08xU\n", (1<<j));
                }
        }
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 71f39410691b..365b3c2b8f43 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -73,8 +73,16 @@ scm_version()
                        printf -- '-svn%s' "`git svn find-rev $head`"
                fi
-                # Check for uncommitted changes
+                # Check for uncommitted changes.
-                if git diff-index --name-only HEAD | grep -qv "^scripts/package"; then
+                # First, with git-status, but --no-optional-locks is only
+                # supported in git >= 2.14, so fall back to git-diff-index if
+                # it fails. Note that git-diff-index does not refresh the
+                # index, so it may give misleading results. See
+                # git-update-index(1), git-diff-index(1), and git-status(1).
+                if {
+                        git --no-optional-locks status -uno --porcelain 2>/dev/null ||
+                        git diff-index --name-only HEAD
+                } | grep -qvE '^(.. )?scripts/package'; then
                        printf '%s' -dirty
                fi
diff --git a/scripts/spdxcheck-test.sh b/scripts/spdxcheck-test.sh
new file mode 100644
index 000000000000..cfea6a0d1cc0
--- /dev/null
+++ b/scripts/spdxcheck-test.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+for PYTHON in python2 python3; do
+        # run check on a text and a binary file
+        for FILE in Makefile Documentation/logo.gif; do
+                $PYTHON scripts/spdxcheck.py $FILE
+                $PYTHON scripts/spdxcheck.py - < $FILE
+        done
+        # run check on complete tree to catch any other issues
+        $PYTHON scripts/spdxcheck.py > /dev/null
+done
diff --git a/scripts/spdxcheck.py b/scripts/spdxcheck.py
index 5056fb3b897d..e559c6294c39 100755
--- a/scripts/spdxcheck.py
+++ b/scripts/spdxcheck.py
@@ -168,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
@@ -249,12 +250,13 @@ if __name__ == '__main__':
    try:
        if len(args.path) and args.path[0] == '-':
-            parser.parse_lines(sys.stdin, args.maxlines, '-')
+            stdin = os.fdopen(sys.stdin.fileno(), 'rb')
+            parser.parse_lines(stdin, args.maxlines, '-')
        else:
            if args.path:
                for p in args.path:
                    if os.path.isfile(p):
-                        parser.parse_lines(open(p), args.maxlines, p)
+                        parser.parse_lines(open(p, 'rb'), args.maxlines, p)
                    elif os.path.isdir(p):
                        scan_git_subtree(repo.head.reference.commit.tree, p)
                    else:
diff --git a/scripts/tags.sh b/scripts/tags.sh
index 4fa070f9231a..f470d9919ed7 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -191,7 +191,7 @@ regex_c=(
        '/^DEF_PCI_AC_\(\|NO\)RET(\([[:alnum:]_]*\).*/\2/'
        '/^PCI_OP_READ(\(\w*\).*[1-4])/pci_bus_read_config_\1/'
        '/^PCI_OP_WRITE(\(\w*\).*[1-4])/pci_bus_write_config_\1/'
-        '/\<DEFINE_\(MUTEX\|SEMAPHORE\|SPINLOCK\)(\([[:alnum:]_]*\)/\2/v/'
+        '/\<DEFINE_\(RT_MUTEX\|MUTEX\|SEMAPHORE\|SPINLOCK\)(\([[:alnum:]_]*\)/\2/v/'
        '/\<DEFINE_\(RAW_SPINLOCK\|RWLOCK\|SEQLOCK\)(\([[:alnum:]_]*\)/\2/v/'
        '/\<DECLARE_\(RWSEM\|COMPLETION\)(\([[:alnum:]_]\+\)/\2/v/'
        '/\<DECLARE_BITMAP(\([[:alnum:]_]*\)/\1/v/'
@@ -204,6 +204,15 @@ regex_c=(
        '/\(^\s\)OFFSET(\([[:alnum:]_]*\)/\2/v/'
        '/\(^\s\)DEFINE(\([[:alnum:]_]*\)/\2/v/'
        '/\<\(DEFINE\|DECLARE\)_HASHTABLE(\([[:alnum:]_]*\)/\2/v/'
+        '/\<DEFINE_ID\(R\|A\)(\([[:alnum:]_]\+\)/\2/'
+        '/\<DEFINE_WD_CLASS(\([[:alnum:]_]\+\)/\1/'
+        '/\<ATOMIC_NOTIFIER_HEAD(\([[:alnum:]_]\+\)/\1/'
+        '/\<RAW_NOTIFIER_HEAD(\([[:alnum:]_]\+\)/\1/'
+        '/\<DECLARE_FAULT_ATTR(\([[:alnum:]_]\+\)/\1/'
+        '/\<BLOCKING_NOTIFIER_HEAD(\([[:alnum:]_]\+\)/\1/'
+        '/\<DEVICE_ATTR_\(RW\|RO\|WO\)(\([[:alnum:]_]\+\)/dev_attr_\2/'
+        '/\<DRIVER_ATTR_\(RW\|RO\|WO\)(\([[:alnum:]_]\+\)/driver_attr_\2/'
+        '/\<\(DEFINE\|DECLARE\)_STATIC_KEY_\(TRUE\|FALSE\)\(\|_RO\)(\([[:alnum:]_]\+\)/\4/'
 )
 regex_kconfig=(
        '/^[[:blank:]]*\(menu\|\)config[[:blank:]]\+\([[:alnum:]_]\+\)/\2/'
@@ -249,7 +258,7 @@ exuberant()
        -I __initdata,__exitdata,__initconst,__ro_after_init    \
        -I __initdata_memblock                                  \
        -I __refdata,__attribute,__maybe_unused,__always_unused \
-        -I __acquires,__releases,__deprecated                   \
+        -I __acquires,__releases,__deprecated,__always_inline   \
        -I __read_mostly,__aligned,____cacheline_aligned        \
        -I ____cacheline_aligned_in_smp                         \
        -I __cacheline_aligned,__cacheline_aligned_in_smp       \
diff --git a/scripts/unifdef.c b/scripts/unifdef.c
index 7493c0ee51cc..db00e3e30a59 100644
--- a/scripts/unifdef.c
+++ b/scripts/unifdef.c
@@ -395,7 +395,7 @@ usage(void)
 * When we have processed a group that starts off with a known-false
 * #if/#elif sequence (which has therefore been deleted) followed by a
 * #elif that we don't understand and therefore must keep, we edit the
- * latter into a #if to keep the nesting correct. We use strncpy() to
+ * latter into a #if to keep the nesting correct. We use memcpy() to
 * overwrite the 4 byte token "elif" with "if  " without a '\0' byte.
 *
 * When we find a true #elif in a group, the following block will
@@ -450,7 +450,7 @@ static void Idrop (void) { Fdrop();  ignoreon(); }
 static void Itrue (void) { Ftrue();  ignoreon(); }
 static void Ifalse(void) { Ffalse(); ignoreon(); }
 /* modify this line */
-static void Mpass (void) { strncpy(keyword, "if  ", 4); Pelif(); }
+static void Mpass (void) { memcpy(keyword, "if  ", 4); Pelif(); }
 static void Mtrue (void) { keywordedit("else");  state(IS_TRUE_MIDDLE); }
 static void Melif (void) { keywordedit("endif"); state(IS_FALSE_TRAILER); }
 static void Melse (void) { keywordedit("endif"); state(IS_FALSE_ELSE); }