linux-kernel - linux-next: manual merge of the iommu tree with the drm 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 for Android: free password hash cracker in your pocket

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

Date:	Wed, 15 Jan 2014 15:20:41 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Joerg Roedel <joro@...tes.org>, Dave Airlie <airlied@...ux.ie>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Rob Clark <robdclark@...il.com>
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@...b.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

Content of type "application/pgp-signature" skipped