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

Hi all, On Mon, 15 Feb 2021 09:32:02 +1100 Stephen Rothwell wrote: > > On Fri, 5 Feb 2021 14:45:40 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the devicetree tree got a conflict in: > > > > scripts/Makefile.lib > > > > between commit: > > > > d73a6a04c76a ("kbui

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

Hi all, On Fri, 5 Feb 2021 14:45:40 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the devicetree tree got a conflict in: > > scripts/Makefile.lib > > between commit: > > d73a6a04c76a ("kbuild: use always-y instead of extra-y") > > from the kbuild tree and commit: > >

linux-next: manual merge of the devicetree tree with the kbuild tree

Hi all, Today's linux-next merge of the devicetree tree got a conflict in: scripts/Makefile.lib between commit: d73a6a04c76a ("kbuild: use always-y instead of extra-y") from the kbuild tree and commit: ce88c9c79455 ("kbuild: Add support to build overlays (%.dtbo)") from the devicetree