diff options
| author | Palmer Dabbelt <palmerdabbelt@google.com> | 2020-10-02 14:29:51 -0700 |
|---|---|---|
| committer | Palmer Dabbelt <palmerdabbelt@google.com> | 2020-10-02 14:29:51 -0700 |
| commit | 8a3f30c4319dc70547f11c18da2e7b5987543aa1 (patch) | |
| tree | b9a549ff8fdba72fdfdbe909191e99c75b2e2ccb /arch/riscv/include/asm/fixmap.h | |
| parent | 54701a0d12e2e2c9f0814572b42bdd3067ffcf15 (diff) | |
| parent | 762cd288fc4a24a372f36408e69b1885967f94bb (diff) | |
| download | linux-8a3f30c4319dc70547f11c18da2e7b5987543aa1.tar.gz | |
Merge tag 'efi-riscv-shared-for-v5.10' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/efi/efi into for-next
Stable branch for v5.10 shared between the EFI and RISC-V trees
The RISC-V EFI boot and runtime support will be merged for v5.10 via
the RISC-V tree. However, it incorporates some changes that conflict
with other EFI changes that are in flight, so this tag serves as a
shared base that allows those conflicts to be resolved beforehand.
* tag 'efi-riscv-shared-for-v5.10' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/efi/efi:
efi/libstub: arm32: Use low allocation for the uncompressed kernel
efi/libstub: Export efi_low_alloc_above() to other units
efi/libstub: arm32: Base FDT and initrd placement on image address
efi: Rename arm-init to efi-init common for all arch
include: pe.h: Add RISC-V related PE definition
Diffstat (limited to 'arch/riscv/include/asm/fixmap.h')
0 files changed, 0 insertions, 0 deletions