Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS updates from Ralf Baechle: "This is the MIPS pull request for the next kernel: - Zubair's patch series adds CMA support for MIPS. Doing so it also touches ARM64 and x86. - remove the last instance of IRQF_DISABLED from arch/mips - updates to two of the MIPS defconfig files. - cleanup of how cache coherency bits are handled on MIPS and implement support for write-combining. - platform upgrades for Alchemy - move MIPS DTS files to arch/mips/boot/dts/" * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (24 commits) MIPS: ralink: remove deprecated IRQF_DISABLED MIPS: pgtable.h: Implement the pgprot_writecombine function for MIPS MIPS: cpu-probe: Set the write-combine CCA value on per core basis MIPS: pgtable-bits: Define the CCA bit for WC writes on Ingenic cores MIPS: pgtable-bits: Move the CCA bits out of the core's ifdef blocks MIPS: DMA: Add cma support x86: use generic dma-contiguous.h arm64: use generic dma-contiguous.h asm-generic: Add dma-contiguous.h MIPS: BPF: Add new emit_long_instr macro MIPS: ralink: Move device-trees to arch/mips/boot/dts/ MIPS: Netlogic: Move device-trees to arch/mips/boot/dts/ MIPS: sead3: Move device-trees to arch/mips/boot/dts/ MIPS: Lantiq: Move device-trees to arch/mips/boot/dts/ MIPS: Octeon: Move device-trees to arch/mips/boot/dts/ MIPS: Add support for building device-tree binaries MIPS: Create common infrastructure for building built-in device-trees MIPS: SEAD3: Enable DEVTMPFS MIPS: SEAD3: Regenerate defconfigs MIPS: Alchemy: DB1300: Add touch penirq support ...
Showing
- arch/arm64/include/asm/Kbuild 1 addition, 0 deletionsarch/arm64/include/asm/Kbuild
- arch/arm64/include/asm/dma-contiguous.h 0 additions, 28 deletionsarch/arm64/include/asm/dma-contiguous.h
- arch/mips/Kconfig 6 additions, 0 deletionsarch/mips/Kconfig
- arch/mips/Makefile 11 additions, 0 deletionsarch/mips/Makefile
- arch/mips/alchemy/devboards/db1300.c 46 additions, 1 deletionarch/mips/alchemy/devboards/db1300.c
- arch/mips/alchemy/devboards/db1550.c 4 additions, 5 deletionsarch/mips/alchemy/devboards/db1550.c
- arch/mips/alchemy/devboards/platform.c 3 additions, 0 deletionsarch/mips/alchemy/devboards/platform.c
- arch/mips/boot/.gitignore 1 addition, 0 deletionsarch/mips/boot/.gitignore
- arch/mips/boot/dts/Makefile 20 additions, 0 deletionsarch/mips/boot/dts/Makefile
- arch/mips/boot/dts/danube.dtsi 0 additions, 0 deletionsarch/mips/boot/dts/danube.dtsi
- arch/mips/boot/dts/easy50712.dts 0 additions, 0 deletionsarch/mips/boot/dts/easy50712.dts
- arch/mips/boot/dts/mt7620a.dtsi 0 additions, 0 deletionsarch/mips/boot/dts/mt7620a.dtsi
- arch/mips/boot/dts/mt7620a_eval.dts 0 additions, 0 deletionsarch/mips/boot/dts/mt7620a_eval.dts
- arch/mips/boot/dts/octeon_3xxx.dts 0 additions, 0 deletionsarch/mips/boot/dts/octeon_3xxx.dts
- arch/mips/boot/dts/octeon_68xx.dts 0 additions, 0 deletionsarch/mips/boot/dts/octeon_68xx.dts
- arch/mips/boot/dts/rt2880.dtsi 0 additions, 0 deletionsarch/mips/boot/dts/rt2880.dtsi
- arch/mips/boot/dts/rt2880_eval.dts 0 additions, 0 deletionsarch/mips/boot/dts/rt2880_eval.dts
- arch/mips/boot/dts/rt3050.dtsi 0 additions, 0 deletionsarch/mips/boot/dts/rt3050.dtsi
- arch/mips/boot/dts/rt3052_eval.dts 0 additions, 0 deletionsarch/mips/boot/dts/rt3052_eval.dts
- arch/mips/boot/dts/rt3883.dtsi 0 additions, 0 deletionsarch/mips/boot/dts/rt3883.dtsi
Please register or sign in to comment