• Linus Torvalds's avatar
    Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 857b50f5
    Linus Torvalds authored
    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
      ...
    857b50f5
Kbuild 494 Bytes