Merge branch 'upstream' of git://

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

   - Correctly handle MIPS R6 fixes to the c0_wired register"

* 'upstream' of git://
  MIPS: mm: Fix output of __do_page_fault
  MIPS: Mask out limit field when calculating wired entry count