Merge tag 'powerpc-5.2-7' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 Jun 2019 03:20:52 +0000 (11:20 +0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 Jun 2019 03:20:52 +0000 (11:20 +0800)
commit39132f746eceed6beecb16c7b79600fb54eb8b2b
tree2fe6deca641d09195e1f4ce9dfee094bb53a4ba0
parent7c15f41e8743df676f6cb0615e74e8ba30994d6a
parente13e7cd4c0c1cc9984d9b6a8663e10d76b53f2aa
Merge tag 'powerpc-5.2-7' of git://git./linux/kernel/git/powerpc/linux

Pull powerpc fix from Michael Ellerman:
 "One fix for a regression in my commit adding KUAP (Kernel User Access
  Prevention) on Radix, which incorrectly touched the AMR in the early
  machine check handler.

  Thanks to Nicholas Piggin"

* tag 'powerpc-5.2-7' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/64s/exception: Fix machine check early corrupting AMR