11 files changed, 51 insertions, 36 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 5219280bf7ff..161b0224d6ae 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -380,6 +380,7 @@ our $Attribute	= qr{
                         __noclone|
                         __deprecated|
                         __read_mostly|
+                        __ro_after_init|
                         __kprobes|
                         $InitAttribute|
                         ____cacheline_aligned|
@@ -3311,7 +3312,7 @@ sub process {
                         # known declaration macros
                       $sline =~ /^\+\s+$declaration_macros/ ||
                         # start of struct or union or enum
-                      $sline =~ /^\+\s+(?:union|struct|enum|typedef)\b/ ||
+                      $sline =~ /^\+\s+(?:static\s+)?(?:const\s+)?(?:union|struct|enum|typedef)\b/ ||
                         # start or end of block or continuation of declaration
                       $sline =~ /^\+\s+(?:$|[\{\}\.\#\"\?\:\(\[])/ ||
                         # bitfield continuation
diff --git a/scripts/depmod.sh b/scripts/depmod.sh
index 999d585eaa73..e083bcae343f 100755
--- a/scripts/depmod.sh
+++ b/scripts/depmod.sh
@@ -11,13 +11,14 @@ DEPMOD=$1
 KERNELRELEASE=$2
 
 if ! test -r System.map ; then
+        echo "Warning: modules_install: missing 'System.map' file. Skipping depmod." >&2
         exit 0
 fi
 
 if [ -z $(command -v $DEPMOD) ]; then
-        echo "'make modules_install' requires $DEPMOD. Please install it." >&2
+        echo "Warning: 'make modules_install' requires $DEPMOD. Please install it." >&2
         echo "This is probably in the kmod package." >&2
-        exit 1
+        exit 0
 fi
 
 # older versions of depmod require the version string to start with three
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 4a7bd2192073..67ed9f6ccdf8 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -221,7 +221,6 @@ $(obj)/zconf.tab.o: $(obj)/zconf.lex.c
 
 # check if necessary packages are available, and configure build flags
 define filechk_conf_cfg
-        $(CONFIG_SHELL) $(srctree)/scripts/kconfig/check-pkgconfig.sh; \
         $(CONFIG_SHELL) $<
 endef
 
diff --git a/scripts/kconfig/check-pkgconfig.sh b/scripts/kconfig/check-pkgconfig.sh
deleted file mode 100644
index 7a1c40bfb58c..000000000000
--- a/scripts/kconfig/check-pkgconfig.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# SPDX-License-Identifier: GPL-2.0
-# Check for pkg-config presence
-
-if [ -z $(command -v pkg-config) ]; then
-        echo "'make *config' requires 'pkg-config'. Please install it." 1>&2
-        exit 1
-fi
diff --git a/scripts/kconfig/gconf-cfg.sh b/scripts/kconfig/gconf-cfg.sh
index 533b3d8f8f08..480ecd8b9f41 100755
--- a/scripts/kconfig/gconf-cfg.sh
+++ b/scripts/kconfig/gconf-cfg.sh
@@ -3,6 +3,13 @@
 
 PKG="gtk+-2.0 gmodule-2.0 libglade-2.0"
 
+if [ -z "$(command -v pkg-config)" ]; then
+        echo >&2 "*"
+        echo >&2 "* 'make gconfig' requires 'pkg-config'. Please install it."
+        echo >&2 "*"
+        exit 1
+fi
+
 if ! pkg-config --exists $PKG; then
         echo >&2 "*"
         echo >&2 "* Unable to find the GTK+ installation. Please make sure that"
diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh
index e6f9facd0077..c812872d7f9d 100755
--- a/scripts/kconfig/mconf-cfg.sh
+++ b/scripts/kconfig/mconf-cfg.sh
@@ -4,20 +4,23 @@
 PKG="ncursesw"
 PKG2="ncurses"
 
-if pkg-config --exists $PKG; then
-        echo cflags=\"$(pkg-config --cflags $PKG)\"
-        echo libs=\"$(pkg-config --libs $PKG)\"
-        exit 0
-fi
+if [ -n "$(command -v pkg-config)" ]; then
+        if pkg-config --exists $PKG; then
+                echo cflags=\"$(pkg-config --cflags $PKG)\"
+                echo libs=\"$(pkg-config --libs $PKG)\"
+                exit 0
+        fi
 
-if pkg-config --exists $PKG2; then
-        echo cflags=\"$(pkg-config --cflags $PKG2)\"
-        echo libs=\"$(pkg-config --libs $PKG2)\"
-        exit 0
+        if pkg-config --exists $PKG2; then
+                echo cflags=\"$(pkg-config --cflags $PKG2)\"
+                echo libs=\"$(pkg-config --libs $PKG2)\"
+                exit 0
+        fi
 fi
 
-# Unfortunately, some distributions (e.g. openSUSE) cannot find ncurses
-# by pkg-config.
+# Check the default paths in case pkg-config is not installed.
+# (Even if it is installed, some distributions such as openSUSE cannot
+# find ncurses by pkg-config.)
 if [ -f /usr/include/ncursesw/ncurses.h ]; then
         echo cflags=\"-D_GNU_SOURCE -I/usr/include/ncursesw\"
         echo libs=\"-lncursesw\"
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 83b5836615fb..143c05fec161 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -490,7 +490,6 @@ static void build_conf(struct menu *menu)
                         switch (prop->type) {
                         case P_MENU:
                                 child_count++;
-                                prompt = prompt;
                                 if (single_menu_mode) {
                                         item_make("%s%*c%s",
                                                   menu->data ? "-->" : "++>",
diff --git a/scripts/kconfig/nconf-cfg.sh b/scripts/kconfig/nconf-cfg.sh
index 42f5ac73548e..001559ef0a60 100644
--- a/scripts/kconfig/nconf-cfg.sh
+++ b/scripts/kconfig/nconf-cfg.sh
@@ -4,20 +4,23 @@
 PKG="ncursesw menuw panelw"
 PKG2="ncurses menu panel"
 
-if pkg-config --exists $PKG; then
-        echo cflags=\"$(pkg-config --cflags $PKG)\"
-        echo libs=\"$(pkg-config --libs $PKG)\"
-        exit 0
-fi
+if [ -n "$(command -v pkg-config)" ]; then
+        if pkg-config --exists $PKG; then
+                echo cflags=\"$(pkg-config --cflags $PKG)\"
+                echo libs=\"$(pkg-config --libs $PKG)\"
+                exit 0
+        fi
 
-if pkg-config --exists $PKG2; then
-        echo cflags=\"$(pkg-config --cflags $PKG2)\"
-        echo libs=\"$(pkg-config --libs $PKG2)\"
-        exit 0
+        if pkg-config --exists $PKG2; then
+                echo cflags=\"$(pkg-config --cflags $PKG2)\"
+                echo libs=\"$(pkg-config --libs $PKG2)\"
+                exit 0
+        fi
 fi
 
-# Unfortunately, some distributions (e.g. openSUSE) cannot find ncurses
-# by pkg-config.
+# Check the default paths in case pkg-config is not installed.
+# (Even if it is installed, some distributions such as openSUSE cannot
+# find ncurses by pkg-config.)
 if [ -f /usr/include/ncursesw/ncurses.h ]; then
         echo cflags=\"-D_GNU_SOURCE -I/usr/include/ncursesw\"
         echo libs=\"-lncursesw -lmenuw -lpanelw\"
diff --git a/scripts/kconfig/qconf-cfg.sh b/scripts/kconfig/qconf-cfg.sh
index 0862e1562536..02ccc0ae1031 100755
--- a/scripts/kconfig/qconf-cfg.sh
+++ b/scripts/kconfig/qconf-cfg.sh
@@ -4,6 +4,13 @@
 PKG="Qt5Core Qt5Gui Qt5Widgets"
 PKG2="QtCore QtGui"
 
+if [ -z "$(command -v pkg-config)" ]; then
+        echo >&2 "*"
+        echo >&2 "* 'make xconfig' requires 'pkg-config'. Please install it."
+        echo >&2 "*"
+        exit 1
+fi
+
 if pkg-config --exists $PKG; then
         echo cflags=\"-std=c++11 -fPIC $(pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets)\"
         echo libs=\"$(pkg-config --libs $PKG)\"
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index fe06e77c15eb..f599031260d5 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -389,6 +389,9 @@ if ($arch eq "x86_64") {
     $mcount_regex = "^\\s*([0-9a-fA-F]+):\\sR_RISCV_CALL\\s_mcount\$";
     $type = ".quad";
     $alignment = 2;
+} elsif ($arch eq "nds32") {
+    $mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*R_NDS32_HI20_RELA\\s+_mcount\$";
+    $alignment = 2;
 } else {
     die "Arch $arch is not supported with CONFIG_FTRACE_MCOUNT_RECORD";
 }
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 71f39410691b..79f7dd57d571 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -74,7 +74,7 @@ scm_version()
                 fi
 
                 # Check for uncommitted changes
-                if git diff-index --name-only HEAD | grep -qv "^scripts/package"; then
+                if git status -uno --porcelain | grep -qv '^.. scripts/package'; then
                         printf '%s' -dirty
                 fi