Merge tag 'asoc-fix-v5.5-rc6' into asoc-5.6