Re: linux-next: manual merge of the asm-generic tree with the kbuild tree

Hi all, On Wed, 28 Mar 2018 09:02:22 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the asm-generic tree got a conflict in: > > arch/metag/boot/dts/Makefile > > between commit: > > b985b71d295f ("kbuild: mark $(targets) as .SECONDARY and remove

Re: linux-next: manual merge of the asm-generic tree with the kbuild tree

Hi all, On Wed, 28 Mar 2018 09:02:22 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the asm-generic tree got a conflict in: > > arch/metag/boot/dts/Makefile > > between commit: > > b985b71d295f ("kbuild: mark $(targets) as .SECONDARY and remove .PRECIOUS > markers") > >

Re: linux-next: manual merge of the asm-generic tree with the kbuild tree

Hi all, On Thu, 15 Mar 2018 09:42:01 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the asm-generic tree got a conflict in: > > arch/blackfin/kernel/bfin_ksyms.c > > between commit: > > 4d9c7a5907dd ("kbuild: rename built-in.o to built-in.a") > >

Re: linux-next: manual merge of the asm-generic tree with the kbuild tree

Hi all, On Thu, 15 Mar 2018 09:42:01 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the asm-generic tree got a conflict in: > > arch/blackfin/kernel/bfin_ksyms.c > > between commit: > > 4d9c7a5907dd ("kbuild: rename built-in.o to built-in.a") > > from the kbuild tree and

linux-next: manual merge of the asm-generic tree with the kbuild tree

Hi all, Today's linux-next merge of the asm-generic tree got a conflict in: arch/metag/boot/dts/Makefile between commit: b985b71d295f ("kbuild: mark $(targets) as .SECONDARY and remove .PRECIOUS markers") from the kbuild tree and commit: bb6fb6dfcc17 ("metag: Remove arch/metag/")

linux-next: manual merge of the asm-generic tree with the kbuild tree

Hi all, Today's linux-next merge of the asm-generic tree got a conflict in: arch/metag/boot/dts/Makefile between commit: b985b71d295f ("kbuild: mark $(targets) as .SECONDARY and remove .PRECIOUS markers") from the kbuild tree and commit: bb6fb6dfcc17 ("metag: Remove arch/metag/")

linux-next: manual merge of the asm-generic tree with the kbuild tree

Hi Arnd, Today's linux-next merge of the asm-generic tree got a conflict in: arch/blackfin/kernel/bfin_ksyms.c between commit: 4d9c7a5907dd ("kbuild: rename built-in.o to built-in.a") from the kbuild tree and commit: e7e57f690e38 ("arch: remove blackfin port") from the asm-generic

linux-next: manual merge of the asm-generic tree with the kbuild tree

Hi Arnd, Today's linux-next merge of the asm-generic tree got a conflict in: arch/blackfin/kernel/bfin_ksyms.c between commit: 4d9c7a5907dd ("kbuild: rename built-in.o to built-in.a") from the kbuild tree and commit: e7e57f690e38 ("arch: remove blackfin port") from the asm-generic