Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Oct 2022 16:56:25 +0000 (09:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Oct 2022 16:56:25 +0000 (09:56 -0700)
commit038239640e3afc8370a4de9880cbd4f942154fc3
treebc87a879fe6ebeceb267d4def7f307bd4e56805f
parent75003fa726e990883bba5b38c4c4d873dab45d62
parent14ca1a4690750bb54e1049e49f3140ef48958a6e
Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

Pull ARM fixes from Russell King:
 "Three fixes for ARM:

   - unbreak the RiscPC build

   - fix wrong pg_level in page table dumper

   - make MT_MEMORY_RO really read-only with LPAE"

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 9247/1: mm: set readonly for MT_MEMORY_RO with ARM_LPAE
  ARM: 9244/1: dump: Fix wrong pg_level in walk_pmd()
  ARM: 9243/1: riscpc: Unbreak the build