Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle: "MIPS fixes for various loose ends: - Fix workarounds for R4000 erratum. - Patch up DEC, Siemens-Nixdorf and Loongson hardware support. - Wire up renameat2 syscall. - Delete unused file - it was causing false warnings from maintenance scripts. - Revert a patch because it's functionality is now implemented twice which causes superfluous /proc/cpuinfo output. - Fix a microMIPS regression" * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: MIPS: mm: Fix broken microMIPS kernel regression. MIPS: Add new AUDIT_ARCH token for the N32 ABI on MIPS64 MIPS: Wire up renameat2 syscall. MIPS: inst.h: Rename BITFIELD_FIELD to __BITFIELD_FIELD. MIPS: Remove file missed when removing rm9k support a while ago. MIPS/loongson2_cpufreq: Fix CPU clock rate setting MIPS: Loongson: No need to select GENERIC_HARDIRQS_NO__DO_IRQ MIPS: csum_partial.S CPU_DADDI_WORKAROUNDS bug fix MIPS: __strncpy_from_user_asm CPU_DADDI_WORKAROUNDS bug fix MIPS: __delay CPU_DADDI_WORKAROUNDS bug fix MIPS: DEC/SNI: O32 wrapper stack switching fixes MIPS: DEC: Bus error handler <asm/cpu-type.h> fixes MAINTAINERS: TURBOchannel: Update entry Revert "MIPS: MT: proc: Add support for printing VPE and TC ids"
Showing
- MAINTAINERS 3 additions, 0 deletionsMAINTAINERS
- arch/mips/dec/ecc-berr.c 1 addition, 0 deletionsarch/mips/dec/ecc-berr.c
- arch/mips/dec/kn02xa-berr.c 1 addition, 0 deletionsarch/mips/dec/kn02xa-berr.c
- arch/mips/dec/prom/Makefile 0 additions, 1 deletionarch/mips/dec/prom/Makefile
- arch/mips/dec/prom/call_o32.S 0 additions, 89 deletionsarch/mips/dec/prom/call_o32.S
- arch/mips/fw/lib/call_o32.S 35 additions, 22 deletionsarch/mips/fw/lib/call_o32.S
- arch/mips/fw/sni/sniprom.c 2 additions, 1 deletionarch/mips/fw/sni/sniprom.c
- arch/mips/include/asm/dec/prom.h 24 additions, 24 deletionsarch/mips/include/asm/dec/prom.h
- arch/mips/include/asm/rm9k-ocd.h 0 additions, 56 deletionsarch/mips/include/asm/rm9k-ocd.h
- arch/mips/include/asm/syscall.h 2 additions, 0 deletionsarch/mips/include/asm/syscall.h
- arch/mips/include/uapi/asm/inst.h 199 additions, 199 deletionsarch/mips/include/uapi/asm/inst.h
- arch/mips/include/uapi/asm/unistd.h 6 additions, 3 deletionsarch/mips/include/uapi/asm/unistd.h
- arch/mips/kernel/proc.c 1 addition, 8 deletionsarch/mips/kernel/proc.c
- arch/mips/kernel/scall32-o32.S 1 addition, 0 deletionsarch/mips/kernel/scall32-o32.S
- arch/mips/kernel/scall64-64.S 1 addition, 0 deletionsarch/mips/kernel/scall64-64.S
- arch/mips/kernel/scall64-n32.S 1 addition, 0 deletionsarch/mips/kernel/scall64-n32.S
- arch/mips/kernel/scall64-o32.S 1 addition, 0 deletionsarch/mips/kernel/scall64-o32.S
- arch/mips/lib/csum_partial.S 9 additions, 0 deletionsarch/mips/lib/csum_partial.S
- arch/mips/lib/delay.c 10 additions, 4 deletionsarch/mips/lib/delay.c
- arch/mips/lib/strncpy_user.S 6 additions, 7 deletionsarch/mips/lib/strncpy_user.S
Loading
Please register or sign in to comment