linux-kernel - linux-next: manual merge of the drm-msm tree with the kbuild tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240506121308.09de6f33@canb.auug.org.au>
Date: Mon, 6 May 2024 12:13:08 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Rob Clark <robdclark@...il.com>, Sean Paul <seanpaul@...omium.org>,
 Masahiro Yamada <masahiroy@...nel.org>
Cc: Dmitry Baryshkov <dmitry.baryshkov@...aro.org>, Linux Kernel Mailing
 List <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the drm-msm tree with the kbuild tree

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.

-- 
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 := -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 \

Content of type "application/pgp-signature" skipped