Merge branch 'topic/hda-fix' into for-next