[PW_SID:1067844] configs: cleanup obsolete or incorrect assignments#1630
[PW_SID:1067844] configs: cleanup obsolete or incorrect assignments#1630linux-riscv-bot wants to merge 9 commits intoworkflow__riscv__fixesfrom
Conversation
merge_config.sh yields this warning: ./scripts/kconfig/merge_config.sh: 384: [: false: unexpected operator This happens because the script runs under /bin/sh but compares strings using the '==' operator, which is a bash extension. The POSIX test command only specifies '=' for string equality. Replace '==' with the POSIX-compatible '=' so the script works when run with /bin/sh as intended. Fixes: dfc97e1 ("scripts: kconfig: merge_config.sh: use awk in checks too") Signed-off-by: Vincent Mailhol (Arm) <mailhol@kernel.org> Signed-off-by: Linux RISC-V bot <linux.riscv.bot@gmail.com>
Since its introduction in commit 9fce665 ("netfilter: Exclude LEGACY TABLES on PREEMPT_RT."), the configurations below all depend, either directly or indirectly, on CONFIG_NETFILTER_XTABLES_LEGACY: - CONFIG_NETFILTER_XT_TARGET_CHECKSUM - CONFIG_IP_NF_FILTER - CONFIG_IP_NF_TARGET_REJECT - CONFIG_IP_NF_NAT - CONFIG_IP_NF_TARGET_MASQUERADE - CONFIG_IP_NF_MANGLE - CONFIG_IP6_NF_FILTER - CONFIG_IP6_NF_TARGET_REJECT - CONFIG_IP6_NF_MANGLE - CONFIG_IP6_NF_NAT - CONFIG_IP6_NF_TARGET_MASQUERADE This new dependency caused many symbols to become orphaned, meaning their dependencies are no longer satisfied and Kconfig drops them from the final configuration. Note that CONFIG_NFT_COMPAT is another parent dependency, so the above-listed symbols would not become orphaned as long as NFT_COMPAT is present. Considering that these are legacy options and that nobody complained in recent kernel releases when these options were already missing, it is safe to assume they can be removed. Suppress all these configuration symbols in all the defconfig files that have neither CONFIG_NETFILTER_XTABLES_LEGACY nor CONFIG_NFT_COMPAT set. FYI, the suppressions were done using: git grep -z -L -E '^CONFIG_(NETFILTER_XTABLES_LEGACY|NFT_COMPAT)=(y|m)$' -- 'arch/*/configs/*defconfig' |\ xargs -0 sed -i -E '/^CONFIG_(NETFILTER_XT_TARGET_CHECKSUM|IP_NF_FILTER|IP_NF_TARGET_REJECT|IP_NF_NAT|IP_NF_TARGET_MASQUERADE|IP_NF_MANGLE|IP6_NF_FILTER|IP6_NF_TARGET_REJECT|IP6_NF_MANGLE|IP6_NF_NAT|IP6_NF_TARGET_MASQUERADE)=(y|m)$/d' Fixes: 9fce665 ("netfilter: Exclude LEGACY TABLES on PREEMPT_RT.") Signed-off-by: Vincent Mailhol (Arm) <mailhol@kernel.org> Signed-off-by: Linux RISC-V bot <linux.riscv.bot@gmail.com>
CONFIG_NFS_V4_1 was revomed in commit 7537db2 ("NFS: Merge CONFIG_NFS_V4_1 with CONFIG_NFS_V4"). However, some defconfigs are still referring the old configuration. Clean-up all the leftover references to CONFIG_NFS_V4_1. FYI, the suppressions were done using: git grep -z -l '^CONFIG_NFS_V4=' -- 'arch/*/configs/*defconfig' |\ xargs -0 sed -i -E '/^CONFIG_NFS_V4_1=/d' CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN and CONFIG_NFS_V4_1_MIGRATION were not in scope of the renaming and still use V4_1 in their name, so keep those two untouched. Fixes: 7537db2 ("NFS: Merge CONFIG_NFS_V4_1 with CONFIG_NFS_V4") Signed-off-by: Vincent Mailhol (Arm) <mailhol@kernel.org> Signed-off-by: Linux RISC-V bot <linux.riscv.bot@gmail.com>
Now that CONFIG_FB_MODE_HELPERS is an hidden configuration, there is
no need to manually select it anymore.
Remove any references to FB_MODE_HELPERS in the defconfigs.
FYI, the suppression was done using:
git ls-files -z 'arch/*/configs/*defconfig' |\
xargs -0 sed -i -E '/^CONFIG_FB_MODE_HELPERS/d'
Fixes: c031bff ("fbdev: Turn FB_MODE_HELPERS into an internal config option")
Signed-off-by: Vincent Mailhol (Arm) <mailhol@kernel.org>
Signed-off-by: Linux RISC-V bot <linux.riscv.bot@gmail.com>
CONFIG_SND_SOC_ROCKCHIP was removed in commit cae3cc4 ("ASoC: rockchip: Standardize ASoC menu"). However it is still referenced in some defconfigs. Remove any references to CONFIG_SND_SOC_ROCKCHIP. FYI, the suppressions were done using: git ls-files -z 'arch/*/configs/*defconfig' |\ xargs -0 sed -i -E '/^CONFIG_SND_SOC_ROCKCHIP/d' Fixes: cae3cc4 ("ASoC: rockchip: Standardize ASoC menu") Signed-off-by: Vincent Mailhol (Arm) <mailhol@kernel.org> Signed-off-by: Linux RISC-V bot <linux.riscv.bot@gmail.com>
When given the arm64 defconfig, merge_config.sh yields below warning: $ ARCH=arm64 ./scripts/kconfig/merge_config.sh arch/arm64/configs/defconfig <...> WARNING: CONFIG_CRYPTO_SHA3 differs: Requested value: CONFIG_CRYPTO_SHA3=m Actual value: CONFIG_CRYPTO_SHA3=y This is because one of CRYPTO_SHA3 child dependency, CRYPTO_JITTERENTROPY, is set to "y" thus preventing CRYPTO_SHA3 to be built as a module. CRYPTO_SHA3 is automatically selected anyway, so just remove it from the defconfig and let the kconfig scripts set it to the correct value. Fixes: 1e29a75 ("lib/crypto: arm64/sha3: Migrate optimized code into library") Signed-off-by: Vincent Mailhol (Arm) <mailhol@kernel.org> Signed-off-by: Linux RISC-V bot <linux.riscv.bot@gmail.com>
CONFIG_IPQ_APSS_5018 does not exist and never existed. Remove it. Fixes: 7f0c873 ("arm64: defconfig: Enable IPQ5018 SoC base configs") Signed-off-by: Vincent Mailhol (Arm) <mailhol@kernel.org> Signed-off-by: Linux RISC-V bot <linux.riscv.bot@gmail.com>
The Kontron SMARC-sAM67 board management controller is not in the kernel tree anymore. Clean-up the leftover reference to CONFIG_SENSORS_SA67MCU which was left in the defconfig. Fixes: e710b22 ("Revert "hwmon: add SMARC-sAM67 support"") Signed-off-by: Vincent Mailhol (Arm) <mailhol@kernel.org> Signed-off-by: Linux RISC-V bot <linux.riscv.bot@gmail.com>
The Qcom Slimbus controller driver is not in the kernel tree anymore. Clean-up the leftover reference to CONFIG_SLIM_QCOM_CTRL which was left in the defconfig. Fixes: 7cbba32 ("slimbus: qcom: remove unused qcom controller driver") Signed-off-by: Vincent Mailhol (Arm) <mailhol@kernel.org> Signed-off-by: Linux RISC-V bot <linux.riscv.bot@gmail.com>
|
Patch 1: "[1/9] scripts: kconfig: merge_config.sh: use POSIX '=' in test" |
|
Patch 1: "[1/9] scripts: kconfig: merge_config.sh: use POSIX '=' in test" |
|
Patch 1: "[1/9] scripts: kconfig: merge_config.sh: use POSIX '=' in test" |
|
Patch 1: "[1/9] scripts: kconfig: merge_config.sh: use POSIX '=' in test" |
|
Patch 1: "[1/9] scripts: kconfig: merge_config.sh: use POSIX '=' in test" |
|
Patch 1: "[1/9] scripts: kconfig: merge_config.sh: use POSIX '=' in test" |
|
Patch 1: "[1/9] scripts: kconfig: merge_config.sh: use POSIX '=' in test" |
|
Patch 1: "[1/9] scripts: kconfig: merge_config.sh: use POSIX '=' in test" |
|
Patch 1: "[1/9] scripts: kconfig: merge_config.sh: use POSIX '=' in test" |
|
Patch 1: "[1/9] scripts: kconfig: merge_config.sh: use POSIX '=' in test" |
|
Patch 1: "[1/9] scripts: kconfig: merge_config.sh: use POSIX '=' in test" |
|
Patch 1: "[1/9] scripts: kconfig: merge_config.sh: use POSIX '=' in test" |
|
Patch 2: "[2/9] configs: remove orphan dependencies of NETFILTER_XTABLES_LEGACY" |
|
Patch 2: "[2/9] configs: remove orphan dependencies of NETFILTER_XTABLES_LEGACY" |
|
Patch 2: "[2/9] configs: remove orphan dependencies of NETFILTER_XTABLES_LEGACY" |
|
Patch 2: "[2/9] configs: remove orphan dependencies of NETFILTER_XTABLES_LEGACY" |
|
Patch 2: "[2/9] configs: remove orphan dependencies of NETFILTER_XTABLES_LEGACY" |
|
Patch 2: "[2/9] configs: remove orphan dependencies of NETFILTER_XTABLES_LEGACY" |
|
Patch 2: "[2/9] configs: remove orphan dependencies of NETFILTER_XTABLES_LEGACY" |
|
Patch 2: "[2/9] configs: remove orphan dependencies of NETFILTER_XTABLES_LEGACY" |
|
Patch 2: "[2/9] configs: remove orphan dependencies of NETFILTER_XTABLES_LEGACY" |
|
Patch 7: "[7/9] arm64: defconfig: remove incorrect assignment to IPQ_APSS_5018" |
|
Patch 7: "[7/9] arm64: defconfig: remove incorrect assignment to IPQ_APSS_5018" |
|
Patch 7: "[7/9] arm64: defconfig: remove incorrect assignment to IPQ_APSS_5018" |
|
Patch 7: "[7/9] arm64: defconfig: remove incorrect assignment to IPQ_APSS_5018" |
|
Patch 7: "[7/9] arm64: defconfig: remove incorrect assignment to IPQ_APSS_5018" |
|
Patch 7: "[7/9] arm64: defconfig: remove incorrect assignment to IPQ_APSS_5018" |
|
Patch 8: "[8/9] arm64: defconfig: remove obsolete assignment to SENSORS_SA67MCU" |
|
Patch 8: "[8/9] arm64: defconfig: remove obsolete assignment to SENSORS_SA67MCU" |
|
Patch 8: "[8/9] arm64: defconfig: remove obsolete assignment to SENSORS_SA67MCU" |
|
Patch 8: "[8/9] arm64: defconfig: remove obsolete assignment to SENSORS_SA67MCU" |
|
Patch 8: "[8/9] arm64: defconfig: remove obsolete assignment to SENSORS_SA67MCU" |
|
Patch 8: "[8/9] arm64: defconfig: remove obsolete assignment to SENSORS_SA67MCU" |
|
Patch 8: "[8/9] arm64: defconfig: remove obsolete assignment to SENSORS_SA67MCU" |
|
Patch 8: "[8/9] arm64: defconfig: remove obsolete assignment to SENSORS_SA67MCU" |
|
Patch 8: "[8/9] arm64: defconfig: remove obsolete assignment to SENSORS_SA67MCU" |
|
Patch 8: "[8/9] arm64: defconfig: remove obsolete assignment to SENSORS_SA67MCU" |
|
Patch 8: "[8/9] arm64: defconfig: remove obsolete assignment to SENSORS_SA67MCU" |
|
Patch 8: "[8/9] arm64: defconfig: remove obsolete assignment to SENSORS_SA67MCU" |
|
Patch 9: "[9/9] arm64: defconfig: remove obsolete assignment to SLIM_QCOM_CTRL" |
|
Patch 9: "[9/9] arm64: defconfig: remove obsolete assignment to SLIM_QCOM_CTRL" |
|
Patch 9: "[9/9] arm64: defconfig: remove obsolete assignment to SLIM_QCOM_CTRL" |
|
Patch 9: "[9/9] arm64: defconfig: remove obsolete assignment to SLIM_QCOM_CTRL" |
|
Patch 9: "[9/9] arm64: defconfig: remove obsolete assignment to SLIM_QCOM_CTRL" |
|
Patch 9: "[9/9] arm64: defconfig: remove obsolete assignment to SLIM_QCOM_CTRL" |
|
Patch 9: "[9/9] arm64: defconfig: remove obsolete assignment to SLIM_QCOM_CTRL" |
|
Patch 9: "[9/9] arm64: defconfig: remove obsolete assignment to SLIM_QCOM_CTRL" |
|
Patch 9: "[9/9] arm64: defconfig: remove obsolete assignment to SLIM_QCOM_CTRL" |
|
Patch 9: "[9/9] arm64: defconfig: remove obsolete assignment to SLIM_QCOM_CTRL" |
|
Patch 9: "[9/9] arm64: defconfig: remove obsolete assignment to SLIM_QCOM_CTRL" |
|
Patch 9: "[9/9] arm64: defconfig: remove obsolete assignment to SLIM_QCOM_CTRL" |
PR for series 1067844 applied to workflow__riscv__fixes
Name: configs: cleanup obsolete or incorrect assignments
URL: https://patchwork.kernel.org/project/linux-riscv/list/?series=1067844
Version: 1