Hello, on current linux-next ARCH=riscv allmodconfig breaks with: CC arch/riscv/kernel/elf_kexec.o arch/riscv/kernel/elf_kexec.c:345:5: error: redefinition of ‘arch_kexec_apply_relocations_add’ 345 | int arch_kexec_apply_relocations_add(struct purgatory_info *pi, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from arch/riscv/kernel/elf_kexec.c:16: include/linux/kexec.h:236:1: note: previous definition of ‘arch_kexec_apply_relocations_add’ with type ‘int(struct purgatory_info *, Elf64_Shdr *, const Elf64_Shdr *, const Elf64_Shdr *)’ {aka ‘int(struct purgatory_info *, struct elf64_shdr *, const struct elf64_shdr *, const struct elf64_shdr *)’} 236 | arch_kexec_apply_relocations_add(struct purgatory_info *pi, Elf_Shdr *section, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ (I think) because there is a conflict between the two commits: 233c1e6c319c kexec_file: drop weak attribute from arch_kexec_apply_relocations[_add] 838b3e28488f RISC-V: Load purgatory in kexec_file And so next is broken starting from 164a9037b1d33f28ba27671c16ec1c23d4a11acf which merges the riscv tree. Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | https://www.pengutronix.de/ |