diff options
| author |   Will Deacon <will@kernel.org> | 2021-10-29 12:27:53 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2021-10-29 12:27:53 +0100 |
| commit | e6359798f62da66a4a48061d2324a69ea59ff39b (patch) | |
| tree | 5695107ae49a82d8d80f8a0e72a9f40b7a8b1a96 /drivers/fpga/fpga-mgr.c | |
| parent | Merge branch 'for-next/vdso' into for-next/core (diff) | |
| parent | acpi/arm64: fix next_platform_timer() section mismatch error (diff) | |
| download | linux-dev-e6359798f62da66a4a48061d2324a69ea59ff39b.tar.xz linux-dev-e6359798f62da66a4a48061d2324a69ea59ff39b.zip | |
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
Diffstat (limited to 'drivers/fpga/fpga-mgr.c')
0 files changed, 0 insertions, 0 deletions