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

2017-08-21 Thread Masahiro Yamada
Hi Boris, 2017-08-22 14:37 GMT+09:00 Boris Brezillon : > Le Tue, 22 Aug 2017 11:56:14 +1000, > Stephen Rothwell 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 ("kbu

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

2017-08-21 Thread Boris Brezillon
Le Tue, 22 Aug 2017 11:56:14 +1000, Stephen Rothwell 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

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

2017-08-21 Thread 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: 129f6c4820d