From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 9 Nov 2018 22:21:24 +0000 (-0600)
Subject: Merge tag 'mips_fixes_4.20_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips... 
X-Git-Tag: v5.15~7613
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=26eaed4671af3c4108b266504aed1103fb68a378;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'mips_fixes_4.20_2' of git://git./linux/kernel/git/mips/linux

Pull MIPS fixes from Paul Burton:
 "A couple of small MIPS fixes for 4.20:

   - Extend an array to avoid overruns on some Octeon hardware, fixing a
     bug introduced in 4.3.

   - Fix a coherent DMA regression for systems without cache-coherent
     DMA introduced in the 4.20 merge window"

* tag 'mips_fixes_4.20_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: Fix `dma_alloc_coherent' returning a non-coherent allocation
  MIPS: OCTEON: fix out of bounds array access on CN68XX
---

26eaed4671af3c4108b266504aed1103fb68a378