From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Masahiro Yamada <masahiroy@kernel.org>
Cc: Rob Herring <robherring2@gmail.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Rob Herring <robh@kernel.org>,
Viresh Kumar <viresh.kumar@linaro.org>
Subject: Re: linux-next: manual merge of the devicetree tree with the kbuild tree
Date: Tue, 23 Feb 2021 09:55:55 +1100 [thread overview]
Message-ID: <20210223095555.70ee4c0c@canb.auug.org.au> (raw)
In-Reply-To: <20210215093202.36611afd@canb.auug.org.au>
[-- 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 --]
prev parent reply other threads:[~2021-02-22 22:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210223095555.70ee4c0c@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=robh@kernel.org \
--cc=robherring2@gmail.com \
--cc=viresh.kumar@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).