linux-next: manual merge of the l2-mtd tree with the kbuild-current tree

linux-next: manual merge of the l2-mtd tree with the kbuild-current tree

[Stephen Rothwell]

Hi Brian,

Today's linux-next merge of the l2-mtd tree got a conflict in:

  include/asm-generic/vmlinux.lds.h

between commit:

  cb87481ee89d ("kbuild: linker script do not match C names unless LD_DEAD_CODE_DATA_ELIMINATION is configured")

from the kbuild-current tree and commit:

  129f6c4820dd ("mtd: only use __xipram annotation when XIP_KERNEL is set")

from the l2-mtd 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 include/asm-generic/vmlinux.lds.h
index 9623d78f8494,ff507c178327..000000000000
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@@ -214,9 -198,13 +214,10 @@@

  /*
   * .data section
 - * LD_DEAD_CODE_DATA_ELIMINATION option enables -fdata-sections generates
 - * .data.identifier which needs to be pulled in with .data, but don't want to
 - * pull in .data..stuff which has its own requirements. Same for bss.
   */
  #define DATA_DATA                                                     \
+       *(.xiptext)                                                     \
 -      *(.data .data.[0-9a-zA-Z_]*)                                    \
 +      *(DATA_MAIN)                                                    \
        *(.ref.data)                                                    \
        *(.data..shared_aligned) /* percpu related */                   \
        MEM_KEEP(init.data)                                             \

Re: linux-next: manual merge of the l2-mtd tree with the kbuild-current tree

[Boris Brezillon]

Le Tue, 22 Aug 2017 11:56:14 +1000,
Stephen Rothwell <sfr@canb.auug.org.au> a écrit :

> Hi Brian,
> 
> Today's linux-next merge of the l2-mtd tree got a conflict in:
> 
>   include/asm-generic/vmlinux.lds.h
> 
> between commit:
> 
>   cb87481ee89d ("kbuild: linker script do not match C names unless LD_DEAD_CODE_DATA_ELIMINATION is configured")

Masahiro, according to this message [1], you queued the above patch to
your fixes branch. Do you plan to send a fixes PR to Linus before
-rc7? If that's the case I'll merge -rc7 in l2-mtd/master, otherwise
I'll need an immutable branch.

Thanks,

Boris

[1]https://www.spinics.net/lists/arm-kernel/msg599088.html

> 
> from the kbuild-current tree and commit:
> 
>   129f6c4820dd ("mtd: only use __xipram annotation when XIP_KERNEL is set")
> 
> from the l2-mtd 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.
> 

Re: linux-next: manual merge of the l2-mtd tree with the kbuild-current tree

[Masahiro Yamada]

Hi Boris,


2017-08-22 14:37 GMT+09:00 Boris Brezillon <boris.brezillon@free-electrons.com>:
> Le Tue, 22 Aug 2017 11:56:14 +1000,
> Stephen Rothwell <sfr@canb.auug.org.au> a écrit :
>
>> Hi Brian,
>>
>> Today's linux-next merge of the l2-mtd tree got a conflict in:
>>
>>   include/asm-generic/vmlinux.lds.h
>>
>> between commit:
>>
>>   cb87481ee89d ("kbuild: linker script do not match C names unless LD_DEAD_CODE_DATA_ELIMINATION is configured")
>
> Masahiro, according to this message [1], you queued the above patch to
> your fixes branch. Do you plan to send a fixes PR to Linus before
> -rc7?


Yes.  I am planning to do so.




> If that's the case I'll merge -rc7 in l2-mtd/master, otherwise
> I'll need an immutable branch.
>

-- 
Best Regards
Masahiro Yamada