Merge tag 'for-linus' of git://github.com/stffrdhrn/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 Jul 2018 19:38:14 +0000 (12:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 Jul 2018 19:38:14 +0000 (12:38 -0700)
commit8d2b6f6b4a805ca74174e779bddde9ad075d3d43
tree4b17b221938b7684aaa1f71c2d540971d0975cbd
parent4e33d7d47943aaa84a5904472cf2f9c6d6b0a6ca
parentae15a41a641449f536578b0d9ec0e4ade130deb5
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