kconf: sync with upstream version 37861ffa8c28