* linux-next: manual merge of the drm-panel tree with the tegra tree
@ 2015-08-17 3:28 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2015-08-17 3:28 UTC (permalink / raw)
To: Thierry Reding, Stephen Warren, Colin Cross, Olof Johansson
Cc: linux-next, linux-kernel
Hi Thierry,
Today's linux-next merge of the drm-panel tree got a conflict in:
arch/arm/configs/multi_v7_defconfig
between commit:
258d9bc5e77f ("ARM: tegra: Update multi_v7_defconfig")
from the tegra tree and commit:
330b48bd700d ("drm/bridge: Add vendor prefixes")
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 arch/arm/configs/multi_v7_defconfig
index 019e1396925e,48b0362a0f0e..000000000000
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -440,11 -430,8 +440,11 @@@ CONFIG_VIDEO_RENESAS_VSP1=
CONFIG_VIDEO_ADV7180=m
CONFIG_VIDEO_ML86V7667=m
CONFIG_DRM=y
+# CONFIG_DRM_I2C_CH7006 is not set
+# CONFIG_DRM_I2C_SIL164 is not set
- CONFIG_DRM_PTN3460=m
- CONFIG_DRM_PS8622=m
+ CONFIG_DRM_NXP_PTN3460=m
+ CONFIG_DRM_PARADE_PS8622=m
+CONFIG_DRM_NOUVEAU=m
CONFIG_DRM_EXYNOS=m
CONFIG_DRM_EXYNOS_DSI=y
CONFIG_DRM_EXYNOS_FIMD=y
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-08-17 3:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-17 3:28 linux-next: manual merge of the drm-panel tree with the tegra tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).