Merge tag 'tags/sound-sdw-kconfig-fixes' into for-linus