Merge branch 'fixes' into next/soc