From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 3 Jul 2016 02:10:21 +0000 (-0700)
Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
X-Git-Tag: MMI-PSA29.97-13-9~7625
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4f302921c1458d790ae21147f7043f4e6b6a1085;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'upstream' of git://git.linux-mips.org/ralf/upstream-linus

Pull MIPS fix from Ralf Baechle:
 "Only a single fix for 4.7 pending at this point.  It fixes an issue
  that may lead to corruption of the cache mode bits in the page table"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: Fix possible corruption of cache mode by mprotect.
---

4f302921c1458d790ae21147f7043f4e6b6a1085