commit c8347bbf19f265c1bd254ca148f27caa71e77d61
author Linus Torvalds <torvalds@linux-foundation.org> Fri May 22 08:51:39 2020 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Fri May 22 08:51:39 2020 -0700
tree 06b20776bda5f6f2e5b801ebd010dbd028332928
parent 051143e1602d90ea71887d92363edd539d411de5
parent 8659a0e0efdd975c73355dbc033f79ba3b31e82c

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."