From: Paul Burton Date: Tue, 9 Apr 2019 23:19:48 +0000 (-0700) Subject: Merge tag 'mips_fixes_5.1_1' into mips-next X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ec86e545c19a5d7364b6da06dd755d43d130bf4f;p=linux.git Merge tag 'mips_fixes_5.1_1' into mips-next A small batch of MIPS fixes for 5.1: - An interrupt masking fix for Loongson-based Lemote 2F systems (fixing a regression from v3.19). - A relocation fix for configurations in which the devicetree is stored in an ELF section (fixing a regression from v4.7). - Fix jump labels for MIPSr6 kernels where they previously could inadvertently place a control transfer instruction in a forbidden slot & take unexpected exceptions (fixing MIPSr6 support added in v4.0). - Extend an existing USB power workaround for the Netgear WNDR3400 to v2 boards in addition to the v3 ones that already used it. - Remove the custom MIPS32 definition of __kernel_fsid_t to make it consistent with MIPS64 & every other architecture, in particular resolving issues for code which tries to print the val field whose type previously differed (though had identical memory layout). Merged into mips-next to gain the MIPSr6 jump label fix before enabling jump labels by default for generic kernel builds. Signed-off-by: Paul Burton --- ec86e545c19a5d7364b6da06dd755d43d130bf4f