lkml.org 
[lkml]   [2017]   [Aug]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: linux-next: manual merge of the l2-mtd tree with the kbuild-current tree
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

\
 
 \ /
  Last update: 2017-08-22 07:46    [W:0.036 / U:3.052 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site