From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 May 2020 15:51:39 +0000 (-0700)
Subject: Merge tag 'powerpc-5.7-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc... 
X-Git-Tag: v5.7-rc7~19
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/c8347bbf19f265c1bd254ca148f27caa71e77d61

Merge tag 'powerpc-5.7-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

Pull powerpc fixes from Michael Ellerman:

 - a revert of a recent change to the PTE bits for 32-bit BookS, which
   broke swap.

 - a "fix" to disable STRICT_KERNEL_RWX for 64-bit in Kconfig, as it's
   causing crashes for some people.

Thanks to Christophe Leroy and Rui Salvaterra.

* tag 'powerpc-5.7-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/64s: Disable STRICT_KERNEL_RWX
  Revert "powerpc/32s: reorder Linux PTE bits to better match Hash PTE bits."
---

c8347bbf19f265c1bd254ca148f27caa71e77d61