From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thierry Reding <thierry.reding@gmail•com>,
Dave Airlie <airlied@linux•ie>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Andy Yan <andy.yan@rock-chips•com>,
Philipp Zabel <p.zabel@pengutronix•de>,
Ajay Kumar <ajaykumar.rs@samsung•com>
Subject: linux-next: manual merge of the drm-panel tree with the drm tree
Date: Tue, 27 Jan 2015 13:39:05 +1100 [thread overview]
Message-ID: <20150127133905.6a2b75bc@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 963 bytes --]
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@canb•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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
reply other threads:[~2015-01-27 2:39 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150127133905.6a2b75bc@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@linux$(echo .)ie \
--cc=ajaykumar.rs@samsung$(echo .)com \
--cc=andy.yan@rock-chips$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=p.zabel@pengutronix$(echo .)de \
--cc=thierry.reding@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox