In 6e95cbda9d12e "Merge branch 'v5.10/standard/base' into
v5.10/standard/nxp-sdk-5.10/nxp-soc" there was a conflict between
linux-stable backport 4603a37f6eae ("random: credit cpu and bootloader
seeds by default") and commit 71e23f22b605 ("char: imx_amp: add sema4
driver support")The merge left an extra endmenu in drivers/char/Kconfig resulting in: drivers/char/Kconfig:514: 'menu' in different file than 'menu' drivers/Kconfig:2: location of the 'menu' drivers/Kconfig:241: syntax error drivers/Kconfig:240: invalid statement Signed-off-by: Paul Gortmaker <[email protected]> diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 0faaeffc5d6c..6e8a58c3aa46 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -472,7 +472,6 @@ config ADI driver include crash and makedumpfile. source "drivers/char/imx_amp/Kconfig" -endmenu config RANDOM_TRUST_CPU bool "Initialize RNG using CPU RNG instructions" -- 2.17.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#11450): https://lists.yoctoproject.org/g/linux-yocto/message/11450 Mute This Topic: https://lists.yoctoproject.org/mt/92292603/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
