lkml.org 
[lkml]   [2020]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the csky tree with Linus' tree
From
Date
Fixed with new rebase on linux-5.5-rc4 for csky linux-next

Best Regards
Guo Ren



> 在 2020年1月6日,上午6:20,Stephen Rothwell <sfr@canb.auug.org.au> 写道:
>
> Hi all,
>
> FIXME: Add owner of second tree to To:
> Add author(s)/SOB of conflicting commits.
>
> Today's linux-next merge of the csky tree got a conflict in:
>
> arch/csky/kernel/vmlinux.lds.S
>
> between commit:
>
> eaf937075c9a ("vmlinux.lds.h: Move NOTES into RO_DATA")
>
> from Linus' tree and commit:
>
> 338ef1d06f0c ("csky: Tightly-Coupled Memory or Sram support")
>
> from the csky 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/csky/kernel/vmlinux.lds.S
> index 2ff37beaf2bf,02b35d916fe7..000000000000
> --- a/arch/csky/kernel/vmlinux.lds.S
> +++ b/arch/csky/kernel/vmlinux.lds.S
> @@@ -49,10 -51,59 +51,58 @@@ SECTION
>
>
> _sdata = .;
> - RO_DATA_SECTION(PAGE_SIZE)
> - RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)
> + RO_DATA(PAGE_SIZE)
> + RW_DATA(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)
> _edata = .;
>
> + #ifdef CONFIG_HAVE_TCM
> + .tcm_start : {
> + . = ALIGN(PAGE_SIZE);
> + __tcm_start = .;
> + }
> +
> + .text_data_tcm FIXADDR_TCM : AT(__tcm_start)
> + {
> + . = ALIGN(4);
> + __stcm_text_data = .;
> + *(.tcm.text)
> + *(.tcm.rodata)
> + #ifndef CONFIG_HAVE_DTCM
> + *(.tcm.data)
> + #endif
> + . = ALIGN(4);
> + __etcm_text_data = .;
> + }
> +
> + . = ADDR(.tcm_start) + SIZEOF(.tcm_start) + SIZEOF(.text_data_tcm);
> +
> + #ifdef CONFIG_HAVE_DTCM
> + #define ITCM_SIZE CONFIG_ITCM_NR_PAGES * PAGE_SIZE
> +
> + .dtcm_start : {
> + __dtcm_start = .;
> + }
> +
> + .data_tcm FIXADDR_TCM + ITCM_SIZE : AT(__dtcm_start)
> + {
> + . = ALIGN(4);
> + __stcm_data = .;
> + *(.tcm.data)
> + . = ALIGN(4);
> + __etcm_data = .;
> + }
> +
> + . = ADDR(.dtcm_start) + SIZEOF(.data_tcm);
> +
> + .tcm_end : AT(ADDR(.dtcm_start) + SIZEOF(.data_tcm)) {
> + #else
> + .tcm_end : AT(ADDR(.tcm_start) + SIZEOF(.text_data_tcm)) {
> + #endif
> + . = ALIGN(PAGE_SIZE);
> + __tcm_end = .;
> + }
> + #endif
> +
> - NOTES
> EXCEPTION_TABLE(L1_CACHE_BYTES)
> BSS_SECTION(L1_CACHE_BYTES, PAGE_SIZE, L1_CACHE_BYTES)
> VBR_BASE

\
 
 \ /
  Last update: 2020-01-06 16:47    [W:0.144 / U:0.052 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site