linux-kernel - linux-next: manual merge of the drm-panel 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]

Message-ID: <20150127133905.6a2b75bc@canb.auug.org.au>
Date:	Tue, 27 Jan 2015 13:39:05 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thierry Reding <thierry.reding@...il.com>,
	Dave Airlie <airlied@...ux.ie>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Andy Yan <andy.yan@...k-chips.com>,
	Philipp Zabel <p.zabel@...gutronix.de>,
	Ajay Kumar <ajaykumar.rs@...sung.com>
Subject: linux-next: manual merge of the drm-panel tree with the drm tree

Hi Thierry,

Today's linux-next merge of the drm-panel tree got a conflict in
drivers/gpu/drm/bridge/Kconfig between commit b21f4b658df8 ("drm: imx:
imx-hdmi: move imx-hdmi to bridge/dw_hdmi") from the drm tree and
commit c338dcdcc7b6 ("drm/bridge: ptn3460: Convert to I2C driver
model") from the drm-panel 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/bridge/Kconfig
index b70f3c8d4e8a,146e67bb037b..000000000000
--- a/drivers/gpu/drm/bridge/Kconfig
+++ b/drivers/gpu/drm/bridge/Kconfig
@@@ -1,10 -1,8 +1,13 @@@
  config DRM_PTN3460
  	tristate "PTN3460 DP/LVDS bridge"
  	depends on DRM
+ 	depends on OF
  	select DRM_KMS_HELPER
+ 	select DRM_PANEL
  	---help---
+ 	  ptn3460 eDP-LVDS bridge chip driver.
 +
 +config DRM_DW_HDMI
 +	tristate
 +	depends on DRM
 +	select DRM_KMS_HELPER

Content of type "application/pgp-signature" skipped