Hi Boris,
2017-08-22 14:37 GMT+09:00 Boris Brezillon <boris.brezillon@xxxxxxxxxxxxxxxxxx>:
> Le Tue, 22 Aug 2017 11:56:14 +1000,
> Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
