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