projects / platform / kernel / linux-rpi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b2909a4 596143e)
Merge branch 'for-next/fixes' into for-next/core
authorWill Deacon <will@kernel.org>
Fri, 29 Oct 2021 11:27:53 +0000 (12:27 +0100)
committerWill Deacon <will@kernel.org>
Fri, 29 Oct 2021 11:27:53 +0000 (12:27 +0100)
commite6359798f62da66a4a48061d2324a69ea59ff39b
tree5695107ae49a82d8d80f8a0e72a9f40b7a8b1a96tree | snapshot
parentb2909a447ec3f3713b142bf8592733f51e4661fccommit | diff
parent596143e3aec35c93508d6b7a05ddc999ee209b61commit | diff
Merge branch 'for-next/fixes' into for-next/core

Merge for-next/fixes to resolve conflicts in arm64_hugetlb_cma_reserve().

* for-next/fixes:
  acpi/arm64: fix next_platform_timer() section mismatch error
  arm64/hugetlb: fix CMA gigantic page order for non-4K PAGE_SIZE
arch/arm64/mm/hugetlbpage.c diff1 | diff2 | blob | history
Domain: System / Kernel;