From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 27 Jan 2023 20:49:00 +0000 (-0800)
Subject: Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e5eb2b22f0f4a1f0b98bc9b7efb352b0841a3bd2;p=linux.git

Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

Pull ARM fixes from Russell King:

 - fix nommu assignment build warning

 - fix -Wundef preprocessor warning

 - reduce __thumb2__ definitions for crypto files that require it

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 9287/1: Reduce __thumb2__ definition to crypto files that require it
  ARM: 9284/1: include <asm/pgtable.h> from proc-macros.S to fix -Wundef warnings
  ARM: 9280/1: mm: fix warning on phys_addr_t to void pointer assignment
---

e5eb2b22f0f4a1f0b98bc9b7efb352b0841a3bd2