Hi Joerg,
Today's linux-next merge of the iommu tree got a conflict in
drivers/gpu/drm/msm/Kconfig between commit 3083894f7f29 ("drm/msm:
COMPILE_TEST support") from the drm tree and commit 4c071c7b851b
("drm/msm: Fix link error with !MSM_IOMMU") from the iommu tree.
I fixed it up (see below)
Hi Joerg,
Today's linux-next merge of the iommu tree got a conflict in
drivers/gpu/drm/msm/Kconfig between commit 3083894f7f29 (drm/msm:
COMPILE_TEST support) from the drm tree and commit 4c071c7b851b
(drm/msm: Fix link error with !MSM_IOMMU) from the iommu tree.
I fixed it up (see below) and
2 matches
Mail list logo