Merge branch 'kbuild/kconfig-for-40' into kbuild/kconfig