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

From	Masahiro Yamada <yamada.masahiro@socionext.com>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the l2-mtd tree with the kbuild-current tree
Date	2017-08-22 07:50 +0200
Message-ID	<uhaeB-6o2-3@gated-at.bofh.it> (permalink)
References	<uh6E2-3Of-15@gated-at.bofh.it> <uha4V-6ko-7@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the l2-mtd tree with the kbuild-current  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-08-22 04:00 +0200
  Re: linux-next: manual merge of the l2-mtd tree with the  kbuild-current tree Boris Brezillon <boris.brezillon@free-electrons.com> - 2017-08-22 07:40 +0200
    Re: linux-next: manual merge of the l2-mtd tree with the  kbuild-current tree Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-08-22 07:50 +0200

csiph-web