Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 10 Jul 2016 16:13:02 +0000 (09:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 10 Jul 2016 16:13:02 +0000 (09:13 -0700)
commit617a8d6bc19edd075e8111c6770f79cae75be51f
treed443d45f20a3b591e692f27e22699a139e18bf27
parentee40fb2948fc99096836995d4f3ddcc0efbac790
parent88d02a2ba6c52350f9a73ff1b01a5be839c3ca17
Merge branch 'upstream' of git://git.linux-mips.org/ralf/upstream-linus

Pull MIPS fix from Ralf Baechle:
 "Another week with just a single 4.7 fix.

  This fixes a possible 'loss' of the huge page bit from pmd on
  permission change"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: Fix page table corruption on THP permission changes.