From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Masahiro Yamada <masahiroy@kernel.org>
Cc: Dave Airlie <airlied@redhat.com>, Rob Clark <robdclark@gmail.com>,
Sean Paul <seanpaul@chromium.org>,
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Rob Clark <robdclark@chromium.org>,
DRI <dri-devel@lists.freedesktop.org>
Subject: Re: linux-next: manual merge of the drm-msm tree with the kbuild tree
Date: Thu, 16 May 2024 09:20:50 +1000 [thread overview]
Message-ID: <20240516092050.2a258c6f@canb.auug.org.au> (raw)
In-Reply-To: <20240513120312.55d97d04@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 5383 bytes --]
Hi all,
On Mon, 13 May 2024 12:03:12 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Tue, 7 May 2024 12:51:32 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the drm-msm tree got a conflict in:
> >
> > drivers/gpu/drm/msm/Makefile
> >
> > between commit:
> >
> > 7c972986689b ("kbuild: use $(src) instead of $(srctree)/$(src) for source directory")
> >
> > from the kbuild tree and commits:
> >
> > 0fddd045f88e ("drm/msm: generate headers on the fly")
> > 07a2f8716c41 ("drm/msm/gen_header: allow skipping the validation")
> >
> > from the drm-msm 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 drivers/gpu/drm/msm/Makefile
> > index b8cc007fc1b9,718968717ad5..000000000000
> > --- a/drivers/gpu/drm/msm/Makefile
> > +++ b/drivers/gpu/drm/msm/Makefile
> > @@@ -1,10 -1,11 +1,11 @@@
> > # SPDX-License-Identifier: GPL-2.0
> > -ccflags-y := -I $(srctree)/$(src)
> > +ccflags-y := -I $(src)
> > + ccflags-y += -I $(obj)/generated
> > -ccflags-y += -I $(srctree)/$(src)/disp/dpu1
> > -ccflags-$(CONFIG_DRM_MSM_DSI) += -I $(srctree)/$(src)/dsi
> > -ccflags-$(CONFIG_DRM_MSM_DP) += -I $(srctree)/$(src)/dp
> > +ccflags-y += -I $(src)/disp/dpu1
> > +ccflags-$(CONFIG_DRM_MSM_DSI) += -I $(src)/dsi
> > +ccflags-$(CONFIG_DRM_MSM_DP) += -I $(src)/dp
> >
> > - msm-y := \
> > + adreno-y := \
> > adreno/adreno_device.o \
> > adreno/adreno_gpu.o \
> > adreno/a2xx_gpu.o \
> > @@@ -140,11 -145,68 +145,68 @@@ msm-display-$(CONFIG_DRM_MSM_DSI) += ds
> > dsi/dsi_manager.o \
> > dsi/phy/dsi_phy.o
> >
> > - msm-$(CONFIG_DRM_MSM_DSI_28NM_PHY) += dsi/phy/dsi_phy_28nm.o
> > - msm-$(CONFIG_DRM_MSM_DSI_20NM_PHY) += dsi/phy/dsi_phy_20nm.o
> > - msm-$(CONFIG_DRM_MSM_DSI_28NM_8960_PHY) += dsi/phy/dsi_phy_28nm_8960.o
> > - msm-$(CONFIG_DRM_MSM_DSI_14NM_PHY) += dsi/phy/dsi_phy_14nm.o
> > - msm-$(CONFIG_DRM_MSM_DSI_10NM_PHY) += dsi/phy/dsi_phy_10nm.o
> > - msm-$(CONFIG_DRM_MSM_DSI_7NM_PHY) += dsi/phy/dsi_phy_7nm.o
> > + msm-display-$(CONFIG_DRM_MSM_DSI_28NM_PHY) += dsi/phy/dsi_phy_28nm.o
> > + msm-display-$(CONFIG_DRM_MSM_DSI_20NM_PHY) += dsi/phy/dsi_phy_20nm.o
> > + msm-display-$(CONFIG_DRM_MSM_DSI_28NM_8960_PHY) += dsi/phy/dsi_phy_28nm_8960.o
> > + msm-display-$(CONFIG_DRM_MSM_DSI_14NM_PHY) += dsi/phy/dsi_phy_14nm.o
> > + msm-display-$(CONFIG_DRM_MSM_DSI_10NM_PHY) += dsi/phy/dsi_phy_10nm.o
> > + msm-display-$(CONFIG_DRM_MSM_DSI_7NM_PHY) += dsi/phy/dsi_phy_7nm.o
> > +
> > + msm-y += $(adreno-y) $(msm-display-y)
> >
> > obj-$(CONFIG_DRM_MSM) += msm.o
> > +
> > + ifeq (y,$(CONFIG_DRM_MSM_VALIDATE_XML))
> > + headergen-opts += --validate
> > + else
> > + headergen-opts += --no-validate
> > + endif
> > +
> > + quiet_cmd_headergen = GENHDR $@
> > - cmd_headergen = mkdir -p $(obj)/generated && $(PYTHON3) $(srctree)/$(src)/registers/gen_header.py \
> > - $(headergen-opts) --rnn $(srctree)/$(src)/registers --xml $< c-defines > $@
> > ++ cmd_headergen = mkdir -p $(obj)/generated && $(PYTHON3) $(src)/registers/gen_header.py \
> > ++ $(headergen-opts) --rnn $(src)/registers --xml $< c-defines > $@
> > +
> > + $(obj)/generated/%.xml.h: $(src)/registers/adreno/%.xml \
> > + $(src)/registers/adreno/adreno_common.xml \
> > + $(src)/registers/adreno/adreno_pm4.xml \
> > + $(src)/registers/freedreno_copyright.xml \
> > + $(src)/registers/gen_header.py \
> > + $(src)/registers/rules-fd.xsd \
> > + FORCE
> > + $(call if_changed,headergen)
> > +
> > + $(obj)/generated/%.xml.h: $(src)/registers/display/%.xml \
> > + $(src)/registers/freedreno_copyright.xml \
> > + $(src)/registers/gen_header.py \
> > + $(src)/registers/rules-fd.xsd \
> > + FORCE
> > + $(call if_changed,headergen)
> > +
> > + ADRENO_HEADERS = \
> > + generated/a2xx.xml.h \
> > + generated/a3xx.xml.h \
> > + generated/a4xx.xml.h \
> > + generated/a5xx.xml.h \
> > + generated/a6xx.xml.h \
> > + generated/a6xx_gmu.xml.h \
> > + generated/adreno_common.xml.h \
> > + generated/adreno_pm4.xml.h \
> > +
> > + DISPLAY_HEADERS = \
> > + generated/dsi_phy_7nm.xml.h \
> > + generated/dsi_phy_10nm.xml.h \
> > + generated/dsi_phy_14nm.xml.h \
> > + generated/dsi_phy_20nm.xml.h \
> > + generated/dsi_phy_28nm_8960.xml.h \
> > + generated/dsi_phy_28nm.xml.h \
> > + generated/dsi.xml.h \
> > + generated/hdmi.xml.h \
> > + generated/mdp4.xml.h \
> > + generated/mdp5.xml.h \
> > + generated/mdp_common.xml.h \
> > + generated/sfpb.xml.h
> > +
> > + $(addprefix $(obj)/,$(adreno-y)): $(addprefix $(obj)/,$(ADRENO_HEADERS))
> > + $(addprefix $(obj)/,$(msm-display-y)): $(addprefix $(obj)/,$(DISPLAY_HEADERS))
> > +
> > + targets += $(ADRENO_HEADERS) $(DISPLAY_HEADERS)
>
> This is now conflict between the drm tree and the kbuild tree.
And 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 --]
next prev parent reply other threads:[~2024-05-15 23:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-07 2:51 linux-next: manual merge of the drm-msm tree with the kbuild tree Stephen Rothwell
2024-05-13 2:03 ` Stephen Rothwell
2024-05-15 23:20 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-05-06 2:13 Stephen Rothwell
2024-05-06 2:29 ` Stephen Rothwell
2024-05-06 10:44 ` Masahiro Yamada
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=20240516092050.2a258c6f@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=airlied@redhat.com \
--cc=dmitry.baryshkov@linaro.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=robdclark@chromium.org \
--cc=robdclark@gmail.com \
--cc=seanpaul@chromium.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 read-only IMAP folder(s) and NNTP newsgroup(s).