Merge branch '4.0-fixes' into mips-for-linux-next