From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 435B612DDA5; Mon, 13 May 2024 02:09:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715566169; cv=none; b=ALVzt6z2ZY0sfoBpeopTUAs8lUzfHGAcy10hY3h3nk5AueT8kn4u/Yb/1swlRIVn8h3mxUmeiywzUDPLXKtPfPcOHeDb1fG0pTsHhZT1IJ/JhysZ6EXCvvX+VMMzBU+O2/HD0VtBedBOYWSkb6gmuXQBUXKgsvgYEjaj23dttcg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715566169; c=relaxed/simple; bh=2MepeWenM74/RNmnRFkqhzelH92s04DuLWY14zmnYPI=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=nVHhpDYCiO7OFBOfwKiXuhtQJrkF/LBQy3r87LsG2BXWHpr53UqDkgXCxAtYe3MUGHeo5JWqOMgZHa/xTiqafyJNc4a4E0bMZ/etV+bc/fPQDgAbwYfPeAU1gfw3WFV+LTNI7+H6z4dborfZ6XjjZ5b2s0GnuPJYJtaPKZez0KY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=O9/knpBP; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="O9/knpBP" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1715565816; bh=TtDK2gOuNrhXeYNzr0rt8E+fUCAbs13e9V2OgjizcpY=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=O9/knpBPUmsq3UAOQDPuMQfdLEnsCcuS3OEBhtXQxjwnBMUg0j5cPusEgEZ6P5I4j Gtzfm+Q/31klVULeGIFLK5X8on9B4QmRq5HR2itGgrAdOxWrjA0zO9uKnxuw8fisdg r9WrrjGbJ6gkbRgh/ZNdcSwJY/+sAimXgIy4G2FT1Bp6w5+vcOmAbHzfKB5y0892sU n9FT2zQz18gW5eznPFKAmEk7sfL1JjMMK7QiK+Lol7tXHrzoaHNAc0o6DqJNgN8XSh 9yMMALmtxITZlKzYmfcz6PgW7UhvV+xysqw+ZrYdwuO53gCvlJT5txQA3Oy5IA9ZKj 8wkruX8WPLXnQ== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Vd2pJ2mPSz4wqM; Mon, 13 May 2024 12:03:36 +1000 (AEST) Date: Mon, 13 May 2024 12:03:12 +1000 From: Stephen Rothwell To: Masahiro Yamada , Dave Airlie Cc: Rob Clark , Sean Paul , Dmitry Baryshkov , Linux Kernel Mailing List , Linux Next Mailing List , Rob Clark , DRI Subject: Re: linux-next: manual merge of the drm-msm tree with the kbuild tree Message-ID: <20240513120312.55d97d04@canb.auug.org.au> In-Reply-To: <20240507125132.2af57c71@canb.auug.org.au> References: <20240507125132.2af57c71@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/9ovoDOjjHk/AwKL8atjs=DW"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/9ovoDOjjHk/AwKL8atjs=DW Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Tue, 7 May 2024 12:51:32 +1000 Stephen Rothwell w= rote: > > Today's linux-next merge of the drm-msm tree got a conflict in: >=20 > drivers/gpu/drm/msm/Makefile >=20 > between commit: >=20 > 7c972986689b ("kbuild: use $(src) instead of $(srctree)/$(src) for sour= ce directory") >=20 > from the kbuild tree and commits: >=20 > 0fddd045f88e ("drm/msm: generate headers on the fly") > 07a2f8716c41 ("drm/msm/gen_header: allow skipping the validation") >=20 > from the drm-msm tree. >=20 > 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. >=20 > 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 :=3D -I $(srctree)/$(src) > +ccflags-y :=3D -I $(src) > + ccflags-y +=3D -I $(obj)/generated > -ccflags-y +=3D -I $(srctree)/$(src)/disp/dpu1 > -ccflags-$(CONFIG_DRM_MSM_DSI) +=3D -I $(srctree)/$(src)/dsi > -ccflags-$(CONFIG_DRM_MSM_DP) +=3D -I $(srctree)/$(src)/dp > +ccflags-y +=3D -I $(src)/disp/dpu1 > +ccflags-$(CONFIG_DRM_MSM_DSI) +=3D -I $(src)/dsi > +ccflags-$(CONFIG_DRM_MSM_DP) +=3D -I $(src)/dp > =20 > - msm-y :=3D \ > + adreno-y :=3D \ > adreno/adreno_device.o \ > adreno/adreno_gpu.o \ > adreno/a2xx_gpu.o \ > @@@ -140,11 -145,68 +145,68 @@@ msm-display-$(CONFIG_DRM_MSM_DSI) +=3D ds > dsi/dsi_manager.o \ > dsi/phy/dsi_phy.o > =20 > - msm-$(CONFIG_DRM_MSM_DSI_28NM_PHY) +=3D dsi/phy/dsi_phy_28nm.o > - msm-$(CONFIG_DRM_MSM_DSI_20NM_PHY) +=3D dsi/phy/dsi_phy_20nm.o > - msm-$(CONFIG_DRM_MSM_DSI_28NM_8960_PHY) +=3D dsi/phy/dsi_phy_28nm_8960.o > - msm-$(CONFIG_DRM_MSM_DSI_14NM_PHY) +=3D dsi/phy/dsi_phy_14nm.o > - msm-$(CONFIG_DRM_MSM_DSI_10NM_PHY) +=3D dsi/phy/dsi_phy_10nm.o > - msm-$(CONFIG_DRM_MSM_DSI_7NM_PHY) +=3D dsi/phy/dsi_phy_7nm.o > + msm-display-$(CONFIG_DRM_MSM_DSI_28NM_PHY) +=3D dsi/phy/dsi_phy_28nm.o > + msm-display-$(CONFIG_DRM_MSM_DSI_20NM_PHY) +=3D dsi/phy/dsi_phy_20nm.o > + msm-display-$(CONFIG_DRM_MSM_DSI_28NM_8960_PHY) +=3D dsi/phy/dsi_phy_28= nm_8960.o > + msm-display-$(CONFIG_DRM_MSM_DSI_14NM_PHY) +=3D dsi/phy/dsi_phy_14nm.o > + msm-display-$(CONFIG_DRM_MSM_DSI_10NM_PHY) +=3D dsi/phy/dsi_phy_10nm.o > + msm-display-$(CONFIG_DRM_MSM_DSI_7NM_PHY) +=3D dsi/phy/dsi_phy_7nm.o > +=20 > + msm-y +=3D $(adreno-y) $(msm-display-y) > =20 > obj-$(CONFIG_DRM_MSM) +=3D msm.o > +=20 > + ifeq (y,$(CONFIG_DRM_MSM_VALIDATE_XML)) > + headergen-opts +=3D --validate > + else > + headergen-opts +=3D --no-validate > + endif > +=20 > + quiet_cmd_headergen =3D GENHDR $@ > - cmd_headergen =3D mkdir -p $(obj)/generated && $(PYTHON3) $(srctr= ee)/$(src)/registers/gen_header.py \ > - $(headergen-opts) --rnn $(srctree)/$(src)/registers --xml $< c-= defines > $@ > ++ cmd_headergen =3D mkdir -p $(obj)/generated && $(PYTHON3) $(src)/= registers/gen_header.py \ > ++ $(headergen-opts) --rnn $(src)/registers --xml $< c-defines > $@ > +=20 > + $(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) > +=20 > + $(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) > +=20 > + ADRENO_HEADERS =3D \ > + 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 \ > +=20 > + DISPLAY_HEADERS =3D \ > + 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 > +=20 > + $(addprefix $(obj)/,$(adreno-y)): $(addprefix $(obj)/,$(ADRENO_HEADERS)) > + $(addprefix $(obj)/,$(msm-display-y)): $(addprefix $(obj)/,$(DISPLAY_HE= ADERS)) > +=20 > + targets +=3D $(ADRENO_HEADERS) $(DISPLAY_HEADERS) This is now conflict between the drm tree and the kbuild tree. --=20 Cheers, Stephen Rothwell --Sig_/9ovoDOjjHk/AwKL8atjs=DW Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZBdOAACgkQAVBC80lX 0Gz3bQgAkiAXFF6nLBuTsHzu71fph5uUENv2IXjpd4DL5oKiZBdEZ0g7c4FlwrxL 4mrcTtYQ5N508pjgpcmhmCUxXjigZ33iFbdGP6niVHhMbiI5vZXkbvQICPg1LFW/ 7j4Yhd+cw0SnlE9dIG39mJs6SABD31ixspMK2xYmGvJl1VamXSKL4e1LkC7IpTgg n0SHaiJb6L5ej2XKFPeYY6atbOJvGNVGUi52/04dSoD5gHXovsZQkyprjoe+6dan LV7CCKzT+2QgA2nbzhOazGfRjfgrCANMvzc5he4u2HR2bK+vC6RdWGRnV2lR4oga c1KETvoShadWUD8+6cLtL/At2kaSmA== =L/I+ -----END PGP SIGNATURE----- --Sig_/9ovoDOjjHk/AwKL8atjs=DW--