Subject: Re: linux-next: manual merge of the tip tree with the xtensa tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 27 Nov 2019 08:33:14 +1100

Hi all,

On Mon, 11 Nov 2019 14:31:54 +1100 Stephen Rothwell <[email-masked]> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   arch/xtensa/kernel/vmlinux.lds.S
> 
> between commit:
> 
>   158b6b99ba7b ("xtensa: merge .fixup with .text")
> 
> from the xtensa tree and commits:
> 
>   eaf937075c9a ("vmlinux.lds.h: Move NOTES into RO_DATA")
>   94174c9b71c6 ("xtensa: Move EXCEPTION_TABLE to RO_DATA segment")
> 
> from the tip 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/xtensa/kernel/vmlinux.lds.S
> index c64abc15d38f,0043d5858f14..000000000000
> --- a/arch/xtensa/kernel/vmlinux.lds.S
> +++ b/arch/xtensa/kernel/vmlinux.lds.S
> @@@ -124,17 -126,16 +126,15 @@@ SECTION
>   
>     . = ALIGN(16);
>   
> -   RODATA
> +   RO_DATA(4096)
>   
> -   EXCEPTION_TABLE(16)
> -   NOTES
>  -  /*  Relocation table */
>  -
>  -  .fixup   : { *(.fixup) }
>  -
>     /* Data section */
>   
>  +#ifdef CONFIG_XIP_KERNEL
>  +  INIT_TEXT_SECTION(PAGE_SIZE)
>  +#else
>     _sdata = .;
> -   RW_DATA_SECTION(XCHAL_ICACHE_LINESIZE, PAGE_SIZE, THREAD_SIZE)
> +   RW_DATA(XCHAL_ICACHE_LINESIZE, PAGE_SIZE, THREAD_SIZE)
>     _edata = .;
>   
>     /* Initialization code and data: */

This is now a conflict between the xtensa tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell