Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS updates from Ralf Baechle: "This is the main pull request for MIPS for 4.8. Also includes is a minor SSB cleanup as SSB code traditionally is merged through the MIPS tree: ATH25: - MIPS: Add default configuration for ath25 Boot: - For zboot, copy appended dtb to the end of the kernel - store the appended dtb address in a variable BPF: - Fix off by one error in offset allocation Cobalt code: - Fix typos Core code: - debugfs_create_file returns NULL on error, so don't use IS_ERR for testing for errors. - Fix double locking issue in RM7000 S-cache code. This would only affect RM7000 ARC systems on reboot. - Fix page table corruption on THP permission changes. - Use compat_sys_keyctl for 32 bit userspace on 64 bit kernels. David says, there are no compatibility issues raised by this fix. - Move some signal code around. - Rewrite r4k count...
Showing
- MAINTAINERS 10 additions, 0 deletionsMAINTAINERS
- arch/mips/Kconfig 14 additions, 33 deletionsarch/mips/Kconfig
- arch/mips/ath79/setup.c 2 additions, 2 deletionsarch/mips/ath79/setup.c
- arch/mips/bmips/setup.c 2 additions, 2 deletionsarch/mips/bmips/setup.c
- arch/mips/boot/compressed/decompress.c 17 additions, 0 deletionsarch/mips/boot/compressed/decompress.c
- arch/mips/boot/compressed/head.S 0 additions, 16 deletionsarch/mips/boot/compressed/head.S
- arch/mips/boot/dts/cavium-octeon/dlink_dsr-1000n.dts 18 additions, 2 deletionsarch/mips/boot/dts/cavium-octeon/dlink_dsr-1000n.dts
- arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts 0 additions, 12 deletionsarch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts
- arch/mips/boot/tools/relocs_64.c 11 additions, 8 deletionsarch/mips/boot/tools/relocs_64.c
- arch/mips/cavium-octeon/executive/cvmx-bootmem.c 1 addition, 1 deletionarch/mips/cavium-octeon/executive/cvmx-bootmem.c
- arch/mips/cavium-octeon/executive/cvmx-helper-board.c 0 additions, 22 deletionsarch/mips/cavium-octeon/executive/cvmx-helper-board.c
- arch/mips/cavium-octeon/octeon-irq.c 1 addition, 13 deletionsarch/mips/cavium-octeon/octeon-irq.c
- arch/mips/cavium-octeon/octeon-platform.c 69 additions, 56 deletionsarch/mips/cavium-octeon/octeon-platform.c
- arch/mips/cavium-octeon/setup.c 19 additions, 1 deletionarch/mips/cavium-octeon/setup.c
- arch/mips/cavium-octeon/smp.c 1 addition, 0 deletionsarch/mips/cavium-octeon/smp.c
- arch/mips/cobalt/setup.c 2 additions, 2 deletionsarch/mips/cobalt/setup.c
- arch/mips/configs/ath25_defconfig 119 additions, 0 deletionsarch/mips/configs/ath25_defconfig
- arch/mips/configs/cavium_octeon_defconfig 2 additions, 0 deletionsarch/mips/configs/cavium_octeon_defconfig
- arch/mips/include/asm/bootinfo.h 4 additions, 0 deletionsarch/mips/include/asm/bootinfo.h
- arch/mips/include/asm/dsemul.h 92 additions, 0 deletionsarch/mips/include/asm/dsemul.h
Please register or sign in to comment