diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-21 01:31:00 +0300 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-21 01:31:00 +0300 | 
| commit | c8ce94b8fe5324aca4c10baeb53dea2d5775a170 (patch) | |
| tree | 3e8c9eea0080a1a48f0d41782693f2dfcdedf275 /lib/netdev-notifier-error-inject.c | |
| parent | 06e68fed32826b44aa9ffcf282c14d3c58918a70 (diff) | |
| parent | 1229ace4a4a2e2c982a32fb075dc1bf95423924f (diff) | |
| download | linux-c8ce94b8fe5324aca4c10baeb53dea2d5775a170.tar.xz | |
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
Diffstat (limited to 'lib/netdev-notifier-error-inject.c')
0 files changed, 0 insertions, 0 deletions
