Skip to content

[PW_SID:1067844] configs: cleanup obsolete or incorrect assignments#1630

Open
linux-riscv-bot wants to merge 9 commits intoworkflow__riscv__fixesfrom
pw1067844
Open

[PW_SID:1067844] configs: cleanup obsolete or incorrect assignments#1630
linux-riscv-bot wants to merge 9 commits intoworkflow__riscv__fixesfrom
pw1067844

Conversation

@linux-riscv-bot
Copy link

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

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>
@linux-riscv-bot
Copy link
Author

Patch 1: "[1/9] scripts: kconfig: merge_config.sh: use POSIX '=' in test"
build-rv32-defconfig
Desc: Builds riscv32 defconfig
Duration: 136.95 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 1: "[1/9] scripts: kconfig: merge_config.sh: use POSIX '=' in test"
build-rv64-clang-allmodconfig
Desc: Builds riscv64 allmodconfig with Clang, and checks for errors and added warnings
Duration: 995.82 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 1: "[1/9] scripts: kconfig: merge_config.sh: use POSIX '=' in test"
build-rv64-gcc-allmodconfig
Desc: Builds riscv64 allmodconfig with GCC, and checks for errors and added warnings
Duration: 1337.96 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 1: "[1/9] scripts: kconfig: merge_config.sh: use POSIX '=' in test"
build-rv64-nommu-k210-defconfig
Desc: Builds riscv64 defconfig with NOMMU for K210
Duration: 26.78 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 1: "[1/9] scripts: kconfig: merge_config.sh: use POSIX '=' in test"
build-rv64-nommu-k210-virt
Desc: Builds riscv64 defconfig with NOMMU for the virt platform
Duration: 27.76 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 1: "[1/9] scripts: kconfig: merge_config.sh: use POSIX '=' in test"
checkpatch
Desc: Runs checkpatch.pl on the patch
Duration: 0.70 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 1: "[1/9] scripts: kconfig: merge_config.sh: use POSIX '=' in test"
dtb-warn-rv64
Desc: Checks for Device Tree warnings/errors
Duration: 82.00 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 1: "[1/9] scripts: kconfig: merge_config.sh: use POSIX '=' in test"
header-inline
Desc: Detects static functions without inline keyword in header files
Duration: 0.22 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 1: "[1/9] scripts: kconfig: merge_config.sh: use POSIX '=' in test"
kdoc
Desc: Detects for kdoc errors
Duration: 0.81 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 1: "[1/9] scripts: kconfig: merge_config.sh: use POSIX '=' in test"
module-param
Desc: Detect module_param changes
Duration: 0.25 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 1: "[1/9] scripts: kconfig: merge_config.sh: use POSIX '=' in test"
verify-fixes
Desc: Verifies that the Fixes: tags exist
Duration: 0.28 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 1: "[1/9] scripts: kconfig: merge_config.sh: use POSIX '=' in test"
verify-signedoff
Desc: Verifies that Signed-off-by: tags are correct
Duration: 0.30 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 2: "[2/9] configs: remove orphan dependencies of NETFILTER_XTABLES_LEGACY"
build-rv32-defconfig
Desc: Builds riscv32 defconfig
Duration: 136.56 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 2: "[2/9] configs: remove orphan dependencies of NETFILTER_XTABLES_LEGACY"
build-rv64-clang-allmodconfig
Desc: Builds riscv64 allmodconfig with Clang, and checks for errors and added warnings
Duration: 997.74 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 2: "[2/9] configs: remove orphan dependencies of NETFILTER_XTABLES_LEGACY"
build-rv64-gcc-allmodconfig
Desc: Builds riscv64 allmodconfig with GCC, and checks for errors and added warnings
Duration: 1337.87 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 2: "[2/9] configs: remove orphan dependencies of NETFILTER_XTABLES_LEGACY"
build-rv64-nommu-k210-defconfig
Desc: Builds riscv64 defconfig with NOMMU for K210
Duration: 26.44 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 2: "[2/9] configs: remove orphan dependencies of NETFILTER_XTABLES_LEGACY"
build-rv64-nommu-k210-virt
Desc: Builds riscv64 defconfig with NOMMU for the virt platform
Duration: 27.90 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 2: "[2/9] configs: remove orphan dependencies of NETFILTER_XTABLES_LEGACY"
checkpatch
Desc: Runs checkpatch.pl on the patch
Duration: 6.04 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 2: "[2/9] configs: remove orphan dependencies of NETFILTER_XTABLES_LEGACY"
dtb-warn-rv64
Desc: Checks for Device Tree warnings/errors
Duration: 81.22 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 2: "[2/9] configs: remove orphan dependencies of NETFILTER_XTABLES_LEGACY"
header-inline
Desc: Detects static functions without inline keyword in header files
Duration: 0.23 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 2: "[2/9] configs: remove orphan dependencies of NETFILTER_XTABLES_LEGACY"
kdoc
Desc: Detects for kdoc errors
Duration: 0.87 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 7: "[7/9] arm64: defconfig: remove incorrect assignment to IPQ_APSS_5018"
dtb-warn-rv64
Desc: Checks for Device Tree warnings/errors
Duration: 82.92 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 7: "[7/9] arm64: defconfig: remove incorrect assignment to IPQ_APSS_5018"
header-inline
Desc: Detects static functions without inline keyword in header files
Duration: 0.24 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 7: "[7/9] arm64: defconfig: remove incorrect assignment to IPQ_APSS_5018"
kdoc
Desc: Detects for kdoc errors
Duration: 0.91 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 7: "[7/9] arm64: defconfig: remove incorrect assignment to IPQ_APSS_5018"
module-param
Desc: Detect module_param changes
Duration: 0.26 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 7: "[7/9] arm64: defconfig: remove incorrect assignment to IPQ_APSS_5018"
verify-fixes
Desc: Verifies that the Fixes: tags exist
Duration: 0.27 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 7: "[7/9] arm64: defconfig: remove incorrect assignment to IPQ_APSS_5018"
verify-signedoff
Desc: Verifies that Signed-off-by: tags are correct
Duration: 0.31 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 8: "[8/9] arm64: defconfig: remove obsolete assignment to SENSORS_SA67MCU"
build-rv32-defconfig
Desc: Builds riscv32 defconfig
Duration: 136.30 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 8: "[8/9] arm64: defconfig: remove obsolete assignment to SENSORS_SA67MCU"
build-rv64-clang-allmodconfig
Desc: Builds riscv64 allmodconfig with Clang, and checks for errors and added warnings
Duration: 999.74 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 8: "[8/9] arm64: defconfig: remove obsolete assignment to SENSORS_SA67MCU"
build-rv64-gcc-allmodconfig
Desc: Builds riscv64 allmodconfig with GCC, and checks for errors and added warnings
Duration: 1339.30 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 8: "[8/9] arm64: defconfig: remove obsolete assignment to SENSORS_SA67MCU"
build-rv64-nommu-k210-defconfig
Desc: Builds riscv64 defconfig with NOMMU for K210
Duration: 26.87 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 8: "[8/9] arm64: defconfig: remove obsolete assignment to SENSORS_SA67MCU"
build-rv64-nommu-k210-virt
Desc: Builds riscv64 defconfig with NOMMU for the virt platform
Duration: 28.04 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 8: "[8/9] arm64: defconfig: remove obsolete assignment to SENSORS_SA67MCU"
checkpatch
Desc: Runs checkpatch.pl on the patch
Duration: 0.78 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 8: "[8/9] arm64: defconfig: remove obsolete assignment to SENSORS_SA67MCU"
dtb-warn-rv64
Desc: Checks for Device Tree warnings/errors
Duration: 82.56 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 8: "[8/9] arm64: defconfig: remove obsolete assignment to SENSORS_SA67MCU"
header-inline
Desc: Detects static functions without inline keyword in header files
Duration: 0.22 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 8: "[8/9] arm64: defconfig: remove obsolete assignment to SENSORS_SA67MCU"
kdoc
Desc: Detects for kdoc errors
Duration: 0.87 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 8: "[8/9] arm64: defconfig: remove obsolete assignment to SENSORS_SA67MCU"
module-param
Desc: Detect module_param changes
Duration: 0.25 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 8: "[8/9] arm64: defconfig: remove obsolete assignment to SENSORS_SA67MCU"
verify-fixes
Desc: Verifies that the Fixes: tags exist
Duration: 0.28 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 8: "[8/9] arm64: defconfig: remove obsolete assignment to SENSORS_SA67MCU"
verify-signedoff
Desc: Verifies that Signed-off-by: tags are correct
Duration: 0.30 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 9: "[9/9] arm64: defconfig: remove obsolete assignment to SLIM_QCOM_CTRL"
build-rv32-defconfig
Desc: Builds riscv32 defconfig
Duration: 135.09 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 9: "[9/9] arm64: defconfig: remove obsolete assignment to SLIM_QCOM_CTRL"
build-rv64-clang-allmodconfig
Desc: Builds riscv64 allmodconfig with Clang, and checks for errors and added warnings
Duration: 997.58 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 9: "[9/9] arm64: defconfig: remove obsolete assignment to SLIM_QCOM_CTRL"
build-rv64-gcc-allmodconfig
Desc: Builds riscv64 allmodconfig with GCC, and checks for errors and added warnings
Duration: 1335.94 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 9: "[9/9] arm64: defconfig: remove obsolete assignment to SLIM_QCOM_CTRL"
build-rv64-nommu-k210-defconfig
Desc: Builds riscv64 defconfig with NOMMU for K210
Duration: 26.85 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 9: "[9/9] arm64: defconfig: remove obsolete assignment to SLIM_QCOM_CTRL"
build-rv64-nommu-k210-virt
Desc: Builds riscv64 defconfig with NOMMU for the virt platform
Duration: 27.68 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 9: "[9/9] arm64: defconfig: remove obsolete assignment to SLIM_QCOM_CTRL"
checkpatch
Desc: Runs checkpatch.pl on the patch
Duration: 0.70 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 9: "[9/9] arm64: defconfig: remove obsolete assignment to SLIM_QCOM_CTRL"
dtb-warn-rv64
Desc: Checks for Device Tree warnings/errors
Duration: 82.73 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 9: "[9/9] arm64: defconfig: remove obsolete assignment to SLIM_QCOM_CTRL"
header-inline
Desc: Detects static functions without inline keyword in header files
Duration: 0.22 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 9: "[9/9] arm64: defconfig: remove obsolete assignment to SLIM_QCOM_CTRL"
kdoc
Desc: Detects for kdoc errors
Duration: 0.81 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 9: "[9/9] arm64: defconfig: remove obsolete assignment to SLIM_QCOM_CTRL"
module-param
Desc: Detect module_param changes
Duration: 0.24 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 9: "[9/9] arm64: defconfig: remove obsolete assignment to SLIM_QCOM_CTRL"
verify-fixes
Desc: Verifies that the Fixes: tags exist
Duration: 4.79 seconds
Result: PASS

@linux-riscv-bot
Copy link
Author

Patch 9: "[9/9] arm64: defconfig: remove obsolete assignment to SLIM_QCOM_CTRL"
verify-signedoff
Desc: Verifies that Signed-off-by: tags are correct
Duration: 0.30 seconds
Result: PASS

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants