Merge branch 'kbuild/rc-fixes' into kbuild/kconfig