Messages in this thread | | | Date | Wed, 15 Jan 2014 15:20:41 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the iommu tree with the drm tree |
| |
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 can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/gpu/drm/msm/Kconfig index bb103fb4519e,d3de8e1ae915..000000000000 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig @@@ -2,7 -2,9 +2,8 @@@ config DRM_MSM tristate "MSM DRM" depends on DRM - depends on ARCH_MSM - depends on ARCH_MSM8960 + depends on (ARCH_MSM && ARCH_MSM8960) || (ARM && COMPILE_TEST) + depends on MSM_IOMMU select DRM_KMS_HELPER select SHMEM select TMPFS [unhandled content-type:application/pgp-signature] | |