Subject: linux-next: manual merge of the drm-panel tree with the tegra tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 17 Aug 2015 13:28:29 +1000

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                    [email-masked]

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