Merge tag 'v4.0-next-soc-fix' of https://github.com/mbgg/linux-mediatek into next...