diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-20 14:31:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-20 14:31:00 -0800 |
| commit | c8ce94b8fe5324aca4c10baeb53dea2d5775a170 (patch) | |
| tree | 3e8c9eea0080a1a48f0d41782693f2dfcdedf275 /include/linux/dma-direct.h | |
| parent | Merge tag 'media/v4.20-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media (diff) | |
| parent | MIPS: Loongson3,SGI-IP27: Simplify max_low_pfn calculation (diff) | |
| download | linux-dev-c8ce94b8fe5324aca4c10baeb53dea2d5775a170.tar.xz linux-dev-c8ce94b8fe5324aca4c10baeb53dea2d5775a170.zip | |
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 '')
0 files changed, 0 insertions, 0 deletions