From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Jul 2018 18:44:12 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
X-Git-Tag: v4.18-rc5~16
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e6ef760731ada512d7258c5ed48423144f831eab;p=tomoyo%2Ftomoyo-test1.git

Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm

Pull ARM fixes from Russell King:
 "A couple of small fixes this time around from Steven for an
  interaction between ftrace and kernel read-only protection, and
  Vladimir for nommu"

* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8780/1: ftrace: Only set kernel memory back to read-only after boot
  ARM: 8775/1: NOMMU: Use instr_sync instead of plain isb in common code
---

e6ef760731ada512d7258c5ed48423144f831eab