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 ("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 tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer when your tree
> > is submitted for merging. You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.
> >
> > diff --cc scripts/Makefile.lib
> > index 6f248ff91982,b00855b247e0..
> > --- a/scripts/Makefile.lib
> > +++ b/scripts/Makefile.lib
> > @@@ -85,12 -81,14 +85,14 @@@ always-y += $(userprogs-always-y) $(use
> >
> > # DTB
> > # If CONFIG_OF_ALL_DTBS is enabled, all DT blobs are built
> > -extra-y += $(dtb-y)
> > -extra-$(CONFIG_OF_ALL_DTBS) += $(dtb-)
> > +always-y += $(dtb-y)
> > +always-$(CONFIG_OF_ALL_DTBS) += $(dtb-)
> >
> > ifneq ($(CHECK_DTBS),)
> > -extra-y += $(patsubst %.dtb,%.dt.yaml, $(dtb-y))
> > -extra-y += $(patsubst %.dtbo,%.dt.yaml, $(dtb-y))
> > -extra-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtb,%.dt.yaml, $(dtb-))
> > -extra-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtbo,%.dt.yaml, $(dtb-))
> > +always-y += $(patsubst %.dtb,%.dt.yaml, $(dtb-y))
> > ++always-y += $(patsubst %.dtbo,%.dt.yaml, $(dtb-y))
> > +always-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtb,%.dt.yaml, $(dtb-))
> > ++always-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtbo,%.dt.yaml, $(dtb-))
> > endif
> >
> > # Add subdir path
>
> With the merge window about to open, this is a reminder that this
> conflict still exists.
This is now a conflict between the kbuild tree and Linus' tree.
--
Cheers,
Stephen Rothwell
pgpJfQ0oDS58f.pgp
Description: OpenPGP digital signature
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:
>
> ce88c9c79455 ("kbuild: Add support to build overlays (%.dtbo)")
>
> from the devicetree tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> diff --cc scripts/Makefile.lib
> index 6f248ff91982,b00855b247e0..
> --- a/scripts/Makefile.lib
> +++ b/scripts/Makefile.lib
> @@@ -85,12 -81,14 +85,14 @@@ always-y += $(userprogs-always-y) $(use
>
> # DTB
> # If CONFIG_OF_ALL_DTBS is enabled, all DT blobs are built
> -extra-y += $(dtb-y)
> -extra-$(CONFIG_OF_ALL_DTBS) += $(dtb-)
> +always-y+= $(dtb-y)
> +always-$(CONFIG_OF_ALL_DTBS)+= $(dtb-)
>
> ifneq ($(CHECK_DTBS),)
> -extra-y += $(patsubst %.dtb,%.dt.yaml, $(dtb-y))
> -extra-y += $(patsubst %.dtbo,%.dt.yaml, $(dtb-y))
> -extra-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtb,%.dt.yaml, $(dtb-))
> -extra-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtbo,%.dt.yaml, $(dtb-))
> +always-y += $(patsubst %.dtb,%.dt.yaml, $(dtb-y))
> ++always-y += $(patsubst %.dtbo,%.dt.yaml, $(dtb-y))
> +always-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtb,%.dt.yaml, $(dtb-))
> ++always-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtbo,%.dt.yaml, $(dtb-))
> endif
>
> # Add subdir path
With the merge window about to open, this is a reminder that this
conflict still exists.
--
Cheers,
Stephen Rothwell
pgpYDMK33W5ro.pgp
Description: OpenPGP digital signature
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 tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc scripts/Makefile.lib
index 6f248ff91982,b00855b247e0..
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@@ -85,12 -81,14 +85,14 @@@ always-y += $(userprogs-always-y) $(use
# DTB
# If CONFIG_OF_ALL_DTBS is enabled, all DT blobs are built
-extra-y += $(dtb-y)
-extra-$(CONFIG_OF_ALL_DTBS) += $(dtb-)
+always-y += $(dtb-y)
+always-$(CONFIG_OF_ALL_DTBS) += $(dtb-)
ifneq ($(CHECK_DTBS),)
-extra-y += $(patsubst %.dtb,%.dt.yaml, $(dtb-y))
-extra-y += $(patsubst %.dtbo,%.dt.yaml, $(dtb-y))
-extra-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtb,%.dt.yaml, $(dtb-))
-extra-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtbo,%.dt.yaml, $(dtb-))
+always-y += $(patsubst %.dtb,%.dt.yaml, $(dtb-y))
++always-y += $(patsubst %.dtbo,%.dt.yaml, $(dtb-y))
+always-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtb,%.dt.yaml, $(dtb-))
++always-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtbo,%.dt.yaml, $(dtb-))
endif
# Add subdir path
pgpCq2QYy4R1z.pgp
Description: OpenPGP digital signature
