* linux-next: manual merge of the devicetree tree with the kbuild tree
@ 2021-02-05 3:45 Stephen Rothwell
2021-02-14 22:32 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2021-02-05 3:45 UTC (permalink / raw)
To: Rob Herring, Masahiro Yamada
Cc: Linux Kernel Mailing List, Linux Next Mailing List, Rob Herring,
Viresh Kumar
[-- Attachment #1: Type: text/plain, Size: 1714 bytes --]
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..000000000000
--- 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the devicetree tree with the kbuild tree
2021-02-05 3:45 linux-next: manual merge of the devicetree tree with the kbuild tree Stephen Rothwell
@ 2021-02-14 22:32 ` Stephen Rothwell
2021-02-22 22:55 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2021-02-14 22:32 UTC (permalink / raw)
To: Rob Herring, Masahiro Yamada
Cc: Linux Kernel Mailing List, Linux Next Mailing List, Rob Herring,
Viresh Kumar
[-- Attachment #1: Type: text/plain, Size: 1987 bytes --]
Hi all,
On Fri, 5 Feb 2021 14:45:40 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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..000000000000
> --- 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the devicetree tree with the kbuild tree
2021-02-14 22:32 ` Stephen Rothwell
@ 2021-02-22 22:55 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2021-02-22 22:55 UTC (permalink / raw)
To: Masahiro Yamada
Cc: Rob Herring, Linux Kernel Mailing List, Linux Next Mailing List,
Rob Herring, Viresh Kumar
[-- Attachment #1: Type: text/plain, Size: 2242 bytes --]
Hi all,
On Mon, 15 Feb 2021 09:32:02 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Fri, 5 Feb 2021 14:45:40 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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..000000000000
> > --- 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-02-22 22:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-05 3:45 linux-next: manual merge of the devicetree tree with the kbuild tree Stephen Rothwell
2021-02-14 22:32 ` Stephen Rothwell
2021-02-22 22:55 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).