Messages in this thread | | | Date | Thu, 8 Oct 2020 10:13:41 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the risc-v tree with the risc-v-fixes tree |
| |
Hi all,
Today's linux-next merge of the risc-v tree got a conflict in:
arch/riscv/kernel/vmlinux.lds.S
between commit:
84814460eef9 ("riscv: Fixup bootup failure with HARDENED_USERCOPY")
from the risc-v-fixes tree and commit:
cb7d2dd5612a ("RISC-V: Add PE/COFF header for EFI stub")
from the risc-v tree.
I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.
-- Cheers, Stephen Rothwell
diff --cc arch/riscv/kernel/vmlinux.lds.S index 34d00d9e6eac,9795359cb9da..000000000000 --- a/arch/riscv/kernel/vmlinux.lds.S +++ b/arch/riscv/kernel/vmlinux.lds.S @@@ -66,8 -71,11 +70,13 @@@ SECTION _etext = .; } + #ifdef CONFIG_EFI + . = ALIGN(PECOFF_SECTION_ALIGNMENT); + __pecoff_text_end = .; + #endif + + INIT_DATA_SECTION(16) + /* Start of data section */ _sdata = .; RO_DATA(SECTION_ALIGN) [unhandled content-type:application/pgp-signature] | |