Merge branch 'cleanup/kconfig' into next/soc