drop 6.1 kconfig changes

breaks 'make menuconfig'

diff --git a/queue-6.1/kconfig-fix-static-linking-of-nconf.patch b/queue-6.1/kconfig-fix-static-linking-of-nconf.patch
deleted file mode 100644 (file)
index 5cef563..0000000
--- a/queue-6.1/kconfig-fix-static-linking-of-nconf.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From ecc47ad41f4b87794aebd54504b62b40adb813a6 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat, 10 Jan 2026 12:48:08 +0100
-Subject: kconfig: fix static linking of nconf
-
-From: Arkadiusz Kozdra <floss@arusekk.pl>
-
-[ Upstream commit baaecfcac559bcac73206df447eb5c385fa22f2a ]
-
-When running make nconfig with a static linking host toolchain,
-the libraries are linked in an incorrect order,
-resulting in errors similar to the following:
-
-$ MAKEFLAGS='HOSTCC=cc\ -static' make nconfig
-/usr/bin/ld: /usr/lib64/gcc/x86_64-unknown-linux-gnu/14.2.1/../../../../lib64/libpanel.a(p_new.o): in function `new_panel':
-(.text+0x13): undefined reference to `_nc_panelhook_sp'
-/usr/bin/ld: (.text+0x6c): undefined reference to `_nc_panelhook_sp'
-
-Fixes: 1c5af5cf9308 ("kconfig: refactor ncurses package checks for building mconf and nconf")
-Signed-off-by: Arusekk <floss@arusekk.pl>
-Link: https://patch.msgid.link/20260110114808.22595-1-floss@arusekk.pl
-[nsc: Added comment about library order]
-Signed-off-by: Nicolas Schier <nsc@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- scripts/kconfig/nconf-cfg.sh | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/scripts/kconfig/nconf-cfg.sh b/scripts/kconfig/nconf-cfg.sh
-index f871a2160e363..59814eb3616c6 100755
---- a/scripts/kconfig/nconf-cfg.sh
-+++ b/scripts/kconfig/nconf-cfg.sh
-@@ -4,8 +4,9 @@
- cflags=$1
- libs=$2
- 
--PKG="ncursesw menuw panelw"
--PKG2="ncurses menu panel"
-+# Keep library order for static linking (HOSTCC='cc -static')
-+PKG="menuw panelw ncursesw"
-+PKG2="menu panel ncurses"
- 
- if [ -n "$(command -v ${HOSTPKG_CONFIG})" ]; then
-       if ${HOSTPKG_CONFIG} --exists $PKG; then
-@@ -26,19 +27,19 @@ fi
- # find ncurses by pkg-config.)
- if [ -f /usr/include/ncursesw/ncurses.h ]; then
-       echo -D_GNU_SOURCE -I/usr/include/ncursesw > ${cflags}
--      echo -lncursesw -lmenuw -lpanelw > ${libs}
-+      echo -lmenuw -lpanelw -lncursesw > ${libs}
-       exit 0
- fi
- 
- if [ -f /usr/include/ncurses/ncurses.h ]; then
-       echo -D_GNU_SOURCE -I/usr/include/ncurses > ${cflags}
--      echo -lncurses -lmenu -lpanel > ${libs}
-+      echo -lmenu -lpanel -lncurses > ${libs}
-       exit 0
- fi
- 
- if [ -f /usr/include/ncurses.h ]; then
-       echo -D_GNU_SOURCE > ${cflags}
--      echo -lncurses -lmenu -lpanel > ${libs}
-+      echo -lmenu -lpanel -lncurses > ${libs}
-       exit 0
- fi
- 
--- 
-2.51.0
-

diff --git a/queue-6.1/kconfig-refactor-makefile-to-reduce-process-forks.patch b/queue-6.1/kconfig-refactor-makefile-to-reduce-process-forks.patch
deleted file mode 100644 (file)
index 3f8c220..0000000
--- a/queue-6.1/kconfig-refactor-makefile-to-reduce-process-forks.patch
+++ /dev/null
@@ -1,305 +0,0 @@
-From 77b4f34df14c6ee74ea690dadc1e311fb30d35fa Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 11 Dec 2022 11:54:48 +0900
-Subject: kconfig: refactor Makefile to reduce process forks
-
-From: Masahiro Yamada <masahiroy@kernel.org>
-
-[ Upstream commit 3122c84409d578a5df8bcb1953547e0b871ac4c2 ]
-
-Refactor Makefile and use read-file macro. For Make >= 4.2, it can read
-out a file by using the built-in function.
-
-Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
-Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
-Stable-dep-of: baaecfcac559 ("kconfig: fix static linking of nconf")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- scripts/kconfig/.gitignore   |  4 +++-
- scripts/kconfig/Makefile     | 45 +++++++++++++++++++-----------------
- scripts/kconfig/gconf-cfg.sh |  7 ++++--
- scripts/kconfig/mconf-cfg.sh | 25 +++++++++++---------
- scripts/kconfig/nconf-cfg.sh | 23 ++++++++++--------
- scripts/kconfig/qconf-cfg.sh | 10 +++++---
- scripts/remove-stale-files   |  2 ++
- 7 files changed, 68 insertions(+), 48 deletions(-)
-
-diff --git a/scripts/kconfig/.gitignore b/scripts/kconfig/.gitignore
-index 500e7424b3ef9..c8a3f9cd52f02 100644
---- a/scripts/kconfig/.gitignore
-+++ b/scripts/kconfig/.gitignore
-@@ -1,5 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0-only
- /conf
- /[gmnq]conf
--/[gmnq]conf-cfg
-+/[gmnq]conf-cflags
-+/[gmnq]conf-libs
-+/qconf-bin
- /qconf-moc.cc
-diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
-index b8ef0fb4bbef7..0b1d15efaeb0c 100644
---- a/scripts/kconfig/Makefile
-+++ b/scripts/kconfig/Makefile
-@@ -159,11 +159,12 @@ conf-objs        := conf.o $(common-objs)
- hostprogs     += nconf
- nconf-objs    := nconf.o nconf.gui.o $(common-objs)
- 
--HOSTLDLIBS_nconf      = $(shell . $(obj)/nconf-cfg && echo $$libs)
--HOSTCFLAGS_nconf.o    = $(shell . $(obj)/nconf-cfg && echo $$cflags)
--HOSTCFLAGS_nconf.gui.o        = $(shell . $(obj)/nconf-cfg && echo $$cflags)
-+HOSTLDLIBS_nconf       = $(call read-file, $(obj)/nconf-libs)
-+HOSTCFLAGS_nconf.o     = $(call read-file, $(obj)/nconf-cflags)
-+HOSTCFLAGS_nconf.gui.o = $(call read-file, $(obj)/nconf-cflags)
- 
--$(obj)/nconf.o $(obj)/nconf.gui.o: $(obj)/nconf-cfg
-+$(obj)/nconf: | $(obj)/nconf-libs
-+$(obj)/nconf.o $(obj)/nconf.gui.o: | $(obj)/nconf-cflags
- 
- # mconf: Used for the menuconfig target based on lxdialog
- hostprogs     += mconf
-@@ -171,27 +172,28 @@ lxdialog := $(addprefix lxdialog/, \
-                    checklist.o inputbox.o menubox.o textbox.o util.o yesno.o)
- mconf-objs    := mconf.o $(lxdialog) $(common-objs)
- 
--HOSTLDLIBS_mconf = $(shell . $(obj)/mconf-cfg && echo $$libs)
-+HOSTLDLIBS_mconf = $(call read-file, $(obj)/mconf-libs)
- $(foreach f, mconf.o $(lxdialog), \
--  $(eval HOSTCFLAGS_$f = $$(shell . $(obj)/mconf-cfg && echo $$$$cflags)))
-+  $(eval HOSTCFLAGS_$f = $$(call read-file, $(obj)/mconf-cflags)))
- 
--$(addprefix $(obj)/, mconf.o $(lxdialog)): $(obj)/mconf-cfg
-+$(obj)/mconf: | $(obj)/mconf-libs
-+$(addprefix $(obj)/, mconf.o $(lxdialog)): | $(obj)/mconf-cflags
- 
- # qconf: Used for the xconfig target based on Qt
- hostprogs     += qconf
- qconf-cxxobjs := qconf.o qconf-moc.o
- qconf-objs    := images.o $(common-objs)
- 
--HOSTLDLIBS_qconf      = $(shell . $(obj)/qconf-cfg && echo $$libs)
--HOSTCXXFLAGS_qconf.o  = $(shell . $(obj)/qconf-cfg && echo $$cflags)
--HOSTCXXFLAGS_qconf-moc.o = $(shell . $(obj)/qconf-cfg && echo $$cflags)
--
--$(obj)/qconf.o: $(obj)/qconf-cfg
-+HOSTLDLIBS_qconf         = $(call read-file, $(obj)/qconf-libs)
-+HOSTCXXFLAGS_qconf.o     = -std=c++11 -fPIC $(call read-file, $(obj)/qconf-cflags)
-+HOSTCXXFLAGS_qconf-moc.o = -std=c++11 -fPIC $(call read-file, $(obj)/qconf-cflags)
-+$(obj)/qconf: | $(obj)/qconf-libs
-+$(obj)/qconf.o $(obj)/qconf-moc.o: | $(obj)/qconf-cflags
- 
- quiet_cmd_moc = MOC     $@
--      cmd_moc = $(shell . $(obj)/qconf-cfg && echo $$moc) $< -o $@
-+      cmd_moc = $(call read-file, $(obj)/qconf-bin)/moc $< -o $@
- 
--$(obj)/qconf-moc.cc: $(src)/qconf.h $(obj)/qconf-cfg FORCE
-+$(obj)/qconf-moc.cc: $(src)/qconf.h FORCE | $(obj)/qconf-bin
-       $(call if_changed,moc)
- 
- targets += qconf-moc.cc
-@@ -200,15 +202,16 @@ targets += qconf-moc.cc
- hostprogs     += gconf
- 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)
-+HOSTLDLIBS_gconf   = $(call read-file, $(obj)/gconf-libs)
-+HOSTCFLAGS_gconf.o = $(call read-file, $(obj)/gconf-cflags)
- 
--$(obj)/gconf.o: $(obj)/gconf-cfg
-+$(obj)/gconf: | $(obj)/gconf-libs
-+$(obj)/gconf.o: | $(obj)/gconf-cflags
- 
- # check if necessary packages are available, and configure build flags
--filechk_conf_cfg = $(CONFIG_SHELL) $<
-+cmd_conf_cfg = $< $(addprefix $(obj)/$*conf-, cflags libs bin)
- 
--$(obj)/%conf-cfg: $(src)/%conf-cfg.sh FORCE
--      $(call filechk,conf_cfg)
-+$(obj)/%conf-cflags $(obj)/%conf-libs $(obj)/%conf-bin: $(src)/%conf-cfg.sh
-+      $(call cmd,conf_cfg)
- 
--clean-files += *conf-cfg
-+clean-files += *conf-cflags *conf-libs *conf-bin
-diff --git a/scripts/kconfig/gconf-cfg.sh b/scripts/kconfig/gconf-cfg.sh
-index cbd90c28c05f2..040d8f3388202 100755
---- a/scripts/kconfig/gconf-cfg.sh
-+++ b/scripts/kconfig/gconf-cfg.sh
-@@ -1,6 +1,9 @@
- #!/bin/sh
- # SPDX-License-Identifier: GPL-2.0
- 
-+cflags=$1
-+libs=$2
-+
- PKG="gtk+-2.0 gmodule-2.0 libglade-2.0"
- 
- if [ -z "$(command -v ${HOSTPKG_CONFIG})" ]; then
-@@ -26,5 +29,5 @@ if ! ${HOSTPKG_CONFIG} --atleast-version=2.0.0 gtk+-2.0; then
-       exit 1
- fi
- 
--echo cflags=\"$(${HOSTPKG_CONFIG} --cflags $PKG)\"
--echo libs=\"$(${HOSTPKG_CONFIG} --libs $PKG)\"
-+${HOSTPKG_CONFIG} --cflags ${PKG} > ${cflags}
-+${HOSTPKG_CONFIG} --libs ${PKG} > ${libs}
-diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh
-index 025b565e0b7cd..1e61f50a59050 100755
---- a/scripts/kconfig/mconf-cfg.sh
-+++ b/scripts/kconfig/mconf-cfg.sh
-@@ -1,19 +1,22 @@
- #!/bin/sh
- # SPDX-License-Identifier: GPL-2.0
- 
-+cflags=$1
-+libs=$2
-+
- PKG="ncursesw"
- PKG2="ncurses"
- 
- if [ -n "$(command -v ${HOSTPKG_CONFIG})" ]; then
-       if ${HOSTPKG_CONFIG} --exists $PKG; then
--              echo cflags=\"$(${HOSTPKG_CONFIG} --cflags $PKG)\"
--              echo libs=\"$(${HOSTPKG_CONFIG} --libs $PKG)\"
-+              ${HOSTPKG_CONFIG} --cflags ${PKG} > ${cflags}
-+              ${HOSTPKG_CONFIG} --libs ${PKG} > ${libs}
-               exit 0
-       fi
- 
--      if ${HOSTPKG_CONFIG} --exists $PKG2; then
--              echo cflags=\"$(${HOSTPKG_CONFIG} --cflags $PKG2)\"
--              echo libs=\"$(${HOSTPKG_CONFIG} --libs $PKG2)\"
-+      if ${HOSTPKG_CONFIG} --exists ${PKG2}; then
-+              ${HOSTPKG_CONFIG} --cflags ${PKG2} > ${cflags}
-+              ${HOSTPKG_CONFIG} --libs ${PKG2} > ${libs}
-               exit 0
-       fi
- fi
-@@ -22,22 +25,22 @@ fi
- # (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\"
-+      echo -D_GNU_SOURCE -I/usr/include/ncursesw > ${cflags}
-+      echo -lncursesw > ${libs}
-       exit 0
- fi
- 
- if [ -f /usr/include/ncurses/ncurses.h ]; then
--      echo cflags=\"-D_GNU_SOURCE -I/usr/include/ncurses\"
--      echo libs=\"-lncurses\"
-+      echo -D_GNU_SOURCE -I/usr/include/ncurses > ${cflags}
-+      echo -lncurses > ${libs}
-       exit 0
- fi
- 
- # As a final fallback before giving up, check if $HOSTCC knows of a default
- # ncurses installation (e.g. from a vendor-specific sysroot).
- if echo '#include <ncurses.h>' | ${HOSTCC} -E - >/dev/null 2>&1; then
--      echo cflags=\"-D_GNU_SOURCE\"
--      echo libs=\"-lncurses\"
-+      echo -D_GNU_SOURCE > ${cflags}
-+      echo -lncurses > ${libs}
-       exit 0
- fi
- 
-diff --git a/scripts/kconfig/nconf-cfg.sh b/scripts/kconfig/nconf-cfg.sh
-index 3a10bac2adb3a..f871a2160e363 100755
---- a/scripts/kconfig/nconf-cfg.sh
-+++ b/scripts/kconfig/nconf-cfg.sh
-@@ -1,19 +1,22 @@
- #!/bin/sh
- # SPDX-License-Identifier: GPL-2.0
- 
-+cflags=$1
-+libs=$2
-+
- PKG="ncursesw menuw panelw"
- PKG2="ncurses menu panel"
- 
- if [ -n "$(command -v ${HOSTPKG_CONFIG})" ]; then
-       if ${HOSTPKG_CONFIG} --exists $PKG; then
--              echo cflags=\"$(${HOSTPKG_CONFIG} --cflags $PKG)\"
--              echo libs=\"$(${HOSTPKG_CONFIG} --libs $PKG)\"
-+              ${HOSTPKG_CONFIG} --cflags ${PKG} > ${cflags}
-+              ${HOSTPKG_CONFIG} --libs ${PKG} > ${libs}
-               exit 0
-       fi
- 
-       if ${HOSTPKG_CONFIG} --exists $PKG2; then
--              echo cflags=\"$(${HOSTPKG_CONFIG} --cflags $PKG2)\"
--              echo libs=\"$(${HOSTPKG_CONFIG} --libs $PKG2)\"
-+              ${HOSTPKG_CONFIG} --cflags ${PKG2} > ${cflags}
-+              ${HOSTPKG_CONFIG} --libs ${PKG2} > ${libs}
-               exit 0
-       fi
- fi
-@@ -22,20 +25,20 @@ fi
- # (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\"
-+      echo -D_GNU_SOURCE -I/usr/include/ncursesw > ${cflags}
-+      echo -lncursesw -lmenuw -lpanelw > ${libs}
-       exit 0
- fi
- 
- if [ -f /usr/include/ncurses/ncurses.h ]; then
--      echo cflags=\"-D_GNU_SOURCE -I/usr/include/ncurses\"
--      echo libs=\"-lncurses -lmenu -lpanel\"
-+      echo -D_GNU_SOURCE -I/usr/include/ncurses > ${cflags}
-+      echo -lncurses -lmenu -lpanel > ${libs}
-       exit 0
- fi
- 
- if [ -f /usr/include/ncurses.h ]; then
--      echo cflags=\"-D_GNU_SOURCE\"
--      echo libs=\"-lncurses -lmenu -lpanel\"
-+      echo -D_GNU_SOURCE > ${cflags}
-+      echo -lncurses -lmenu -lpanel > ${libs}
-       exit 0
- fi
- 
-diff --git a/scripts/kconfig/qconf-cfg.sh b/scripts/kconfig/qconf-cfg.sh
-index ad652cb539474..117f36e568fc5 100755
---- a/scripts/kconfig/qconf-cfg.sh
-+++ b/scripts/kconfig/qconf-cfg.sh
-@@ -1,6 +1,10 @@
- #!/bin/sh
- # SPDX-License-Identifier: GPL-2.0
- 
-+cflags=$1
-+libs=$2
-+bin=$3
-+
- PKG="Qt5Core Qt5Gui Qt5Widgets"
- 
- if [ -z "$(command -v ${HOSTPKG_CONFIG})" ]; then
-@@ -11,9 +15,9 @@ if [ -z "$(command -v ${HOSTPKG_CONFIG})" ]; then
- fi
- 
- if ${HOSTPKG_CONFIG} --exists $PKG; then
--      echo cflags=\"-std=c++11 -fPIC $(${HOSTPKG_CONFIG} --cflags $PKG)\"
--      echo libs=\"$(${HOSTPKG_CONFIG} --libs $PKG)\"
--      echo moc=\"$(${HOSTPKG_CONFIG} --variable=host_bins Qt5Core)/moc\"
-+      ${HOSTPKG_CONFIG} --cflags ${PKG} > ${cflags}
-+      ${HOSTPKG_CONFIG} --libs ${PKG} > ${libs}
-+      ${HOSTPKG_CONFIG} --variable=host_bins Qt5Core > ${bin}
-       exit 0
- fi
- 
-diff --git a/scripts/remove-stale-files b/scripts/remove-stale-files
-index ccadfa3afb2b8..64b14aa5aebf4 100755
---- a/scripts/remove-stale-files
-+++ b/scripts/remove-stale-files
-@@ -47,3 +47,5 @@ rm -f arch/riscv/purgatory/kexec-purgatory.c
- rm -f scripts/extract-cert
- 
- rm -f arch/x86/purgatory/kexec-purgatory.c
-+
-+rm -f scripts/kconfig/[gmnq]conf-cfg
--- 
-2.51.0
-

diff --git a/queue-6.1/series b/queue-6.1/series
index 038eeb723f2e7cedc28b28d6fdb3e1e855e50750..ca973308bf398efedbca54a158811098156daebe 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -131,8 +131,6 @@ spi-sprd-adi-use-devm_register_restart_handler.patch
 spi-sprd-adi-switch-to-use-spi_alloc_host.patch
 spi-spi-sprd-adi-fix-double-free-in-probe-error-path.patch
 regmap-fix-race-condition-in-hwspinlock-irqsave-rout.patch
-kconfig-refactor-makefile-to-reduce-process-forks.patch
-kconfig-fix-static-linking-of-nconf.patch
 riscv-clocksource-fix-stimecmp-update-hazard-on-rv32.patch
 scsi-core-wake-up-the-error-handler-when-final-compl.patch
 alsa-usb-increase-volume-range-that-triggers-a-warni.patch