From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 27 Nov 2016 16:22:59 +0000 (-0800)
Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
X-Git-Tag: v5.15~12414
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ff17bf8a0d2d60a343db304b835c0e83efa660d9;p=platform%2Fkernel%2Flinux-starfive.git

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

Pull MIPS fixes from Ralf Baechle:
 "Another round of MIPS fixes for 4.9:

   - Fix unreadable output in __do_page_fault due to the KERN_CONT
     patchset

   - Correctly handle MIPS R6 fixes to the c0_wired register"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: mm: Fix output of __do_page_fault
  MIPS: Mask out limit field when calculating wired entry count
---

ff17bf8a0d2d60a343db304b835c0e83efa660d9