Merge tag 'mips_fixes_5.1_1' into mips-next