CommitterLinus Torvalds (1)
AuthorLinus Torvalds (1)
Branchesmaster (1)


Linux/linux c8ce94b — arch/mips/configs cavium_octeon_defconfig, arch/mips/kernel traps.c setup.c

by Linus Torvalds on ⎇
Merge tag 'mips_fixes_4.20_3' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

Pull MIPS fixes from Paul Burton:
 "A few MIPS fixes for 4.20:

   - Re-enable the Cavium Octeon USB driver in its defconfig after it
     was accidentally removed back in 4.14.

   - Have early memblock allocations be performed bottom-up to more
     closely match the behaviour we used to have with bootmem, which
     seems a safer choice since we've seen fallout from the change made
     in the 4.20 merge window.

   - Simplify max_low_pfn calculation in the NUMA code for the Loongson3
     and SGI IP27 platforms to both clean up the code & ensure
     max_low_pfn has been set appropriately before it is used"

* tag 'mips_fixes_4.20_3' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: Loongson3,SGI-IP27: Simplify max_low_pfn calculation
  MIPS: Let early memblock_alloc*() allocate memories bottom-up
  MIPS: OCTEON: cavium_octeon_defconfig: re-enable OCTEON USB driver
DeltaFile
+2-10arch/mips/loongson64/loongson-3/numa.c
+1-10arch/mips/sgi-ip27/ip27-memory.c
+1-2arch/mips/kernel/traps.c
+1-0arch/mips/configs/cavium_octeon_defconfig
+1-0arch/mips/kernel/setup.c
+6-225 files

UnifiedSplitRaw