| commit | e6359798f62da66a4a48061d2324a69ea59ff39b | [log] [tgz] |
|---|---|---|
| author | Will Deacon <will@kernel.org> | Fri Oct 29 12:27:53 2021 +0100 |
| committer | Will Deacon <will@kernel.org> | Fri Oct 29 12:27:53 2021 +0100 |
| tree | 5695107ae49a82d8d80f8a0e72a9f40b7a8b1a96 | |
| parent | b2909a447ec3f3713b142bf8592733f51e4661fc [diff] | |
| parent | 596143e3aec35c93508d6b7a05ddc999ee209b61 [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