From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 20 Nov 2018 22:31:00 +0000 (-0800)
Subject: Merge tag 'mips_fixes_4.20_3' of git://git.kernel.org/pub/scm/linux/kernel/git/mips... 
X-Git-Tag: v5.4-rc1~2184
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c8ce94b8fe5324aca4c10baeb53dea2d5775a170;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'mips_fixes_4.20_3' of git://git./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
---

c8ce94b8fe5324aca4c10baeb53dea2d5775a170