Received-SPF: pass (google.com: domain of linux-kernel+bounces-169249-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Mon, 6 May 2024 12:13:08 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rob Clark <robdclark@gmail.com>, Sean Paul <seanpaul@chromium.org>,
 Masahiro Yamada <masahiroy@kernel.org>
Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>, Linux Kernel Mailing
 List <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the drm-msm tree with the kbuild tree
Message-ID: <20240506121308.09de6f33@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/rKlP7nQpnY_B6VZOoCGjD3g";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/rKlP7nQpnY_B6VZOoCGjD3g
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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 commit:

  0fddd045f88e ("drm/msm: generate headers on the fly")

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.

--=20
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/msm/Makefile
index b8cc007fc1b9,c861de58286c..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 \

--Sig_/rKlP7nQpnY_B6VZOoCGjD3g
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmY4PLQACgkQAVBC80lX
0Gwncwf/RsPVt/ra49kzVFxmTm3yjd3W4Ag0ZanEWo1LMeOge/9rsgT4SKNo7xlt
si6Tu4i+yA+coCkitwsZl0e4Kkb09OfGTT7ORR9WHwll3bMPdPj6pL0RoMJNROgA
qUpqBN2xsM7gfGX1jhcZ+oV56xPeklfBvidFRWu/Atc2QP1D69SD2/BfHyZqSgBl
2dZ4ajr6HSIo49FC6M8Cv3Bs71PAIS/s8SNh9ZTqW7shXyf1+8Xc04MtvVr+qS/f
IQA+TdPedseOLjkh9dB3X++WqeAroM5Op4RwMAH+BcJ7RX2Bx/hskyLwF4Pj4YuK
i1ejTyUzJ/Nnays7OPxv/86ILeeL9g==
=uwbM
-----END PGP SIGNATURE-----

--Sig_/rKlP7nQpnY_B6VZOoCGjD3g--