From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 2 Jul 2018 19:38:14 +0000 (-0700)
Subject: Merge tag 'for-linus' of git://github.com/stffrdhrn/linux
X-Git-Tag: v4.18-rc4~34
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=8d2b6f6b4a805ca74174e779bddde9ad075d3d43;p=linux-2.6-block.git

Merge tag 'for-linus' of git://github.com/stffrdhrn/linux

Pull OpenRISC fixes from Stafford Horne:
 "Two fixes for issues which were breaking OpenRISC boot:

   - Fix bug in __pte_free_tlb() exposed in 4.18 by Matthew Wilcox's
     page table flag addition.

   - Fix issue booting on real hardware if delay slot detection
     emulation is disabled"

* tag 'for-linus' of git://github.com/stffrdhrn/linux:
  openrisc: entry: Fix delay slot exception detection
  openrisc: Call destructor during __pte_free_tlb
---

8d2b6f6b4a805ca74174e779bddde9ad075d3d43