Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Oct 2021 18:16:38 +0000 (11:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Oct 2021 18:16:38 +0000 (11:16 -0700)
commitf4d0cc426f77df6890aa868f96c2de89686aae8a
treead620f9093d91971d4a5488214166f620aa8f8c6
parented47291911d375f7d0bf63b9afb7516988305d94
parent596143e3aec35c93508d6b7a05ddc999ee209b61
Merge tag 'arm64-fixes' of git://git./linux/kernel/git/arm64/linux

Pull arm64 fixes from Catalin Marinas:

 - Fix CMA gigantic page order for 16K/64K page sizes

 - Fix section mismatch error in drivers/acpi/arm64/gtdt.c

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  acpi/arm64: fix next_platform_timer() section mismatch error
  arm64/hugetlb: fix CMA gigantic page order for non-4K PAGE_SIZE