From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 4 May 2019 19:24:05 +0000 (-0700)
Subject: Merge tag 'powerpc-5.1-7' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc... 
X-Git-Tag: v5.1~5
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6203838dec05352bc357625b1e9ba0a10d3bca35;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'powerpc-5.1-7' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

Pull powerpc fix from Michael Ellerman:
 "One regression fix.

  Changes we merged to STRICT_KERNEL_RWX on 32-bit were causing crashes
  under load on some machines depending on memory layout.

  Thanks to Christophe Leroy"

* tag 'powerpc-5.1-7' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/32s: Fix BATs setting with CONFIG_STRICT_KERNEL_RWX
---

6203838dec05352bc357625b1e9ba0a10d3bca35