Merge branches 'topic/fix/hda' and 'topic/fix/misc' into for-linus