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