Merge branch 'kconfig-diet' from Dave Hansen