lkml.org 
[lkml]   [2020]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [GIT PULL] RISC-V Patches for the 5.10 Merge Window, Part 1
On Mon, Oct 19, 2020 at 12:08 PM Palmer Dabbelt <palmer@dabbelt.com> wrote:
>
> There is one merge conflict, which is between my fixes and for-next branches:
>
> diff --cc arch/riscv/kernel/vmlinux.lds.S
> index 67db80e12d1f,9795359cb9da..ffaa3da375c2
> --- a/arch/riscv/kernel/vmlinux.lds.S
> +++ b/arch/riscv/kernel/vmlinux.lds.S
> @@@ -66,8 -71,11 +70,13 @@@ SECTION
> _etext = .;
> }
>
> + INIT_DATA_SECTION(16)
> +
> + #ifdef CONFIG_EFI
> + . = ALIGN(PECOFF_SECTION_ALIGNMENT);
> + __pecoff_text_end = .;
> + #endif
> +
> /* Start of data section */
> _sdata = .;
> RO_DATA(SECTION_ALIGN)

Hmm.

I put the INIT_DATA_SECTION after the __pecoff_text_end symbol. I
don't think INIT_DATA_SECTION should be considered text

I suspect it doesn't matter, but if there is some odd dependency that
I missed, this is a heads-up that my resolution doesn't look exactly
like the above.

Linus

\
 
 \ /
  Last update: 2020-10-20 03:24    [W:0.049 / U:1.744 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site