Messages in this thread | | | Date | Tue, 25 Mar 2014 14:59:43 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the omap_dss2 tree with the drm tree |
| |
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in drivers/video/fbdev/exynos/Kconfig between commit 2e4e678aa8a4 ("drm/exynos: Move dp driver from video/ to drm/") from the drm tree and commits 07e521b66cf0 ("video: exynos: Remove OF dependency for Exynos DP") and 844901baede6 ("video: move fbdev to drivers/video/fbdev") from the omap_dss2 tree.
git said this:
CONFLICT (rename/rename): Rename "drivers/video/exynos/exynos_dp_reg.h"->"drivers/gpu/drm/exynos/exynos_dp_reg.h" in branch "HEAD" rename "drivers/video/exynos/exynos_dp_reg.h"->"drivers/video/fbdev/exynos/exynos_dp_reg.h" in "omap_dss2/for-next" CONFLICT (rename/rename): Rename "drivers/video/exynos/exynos_dp_reg.c"->"drivers/gpu/drm/exynos/exynos_dp_reg.c" in branch "HEAD" rename "drivers/video/exynos/exynos_dp_reg.c"->"drivers/video/fbdev/exynos/exynos_dp_reg.c" in "omap_dss2/for-next" CONFLICT (rename/rename): Rename "drivers/video/exynos/exynos_dp_core.h"->"drivers/gpu/drm/exynos/exynos_dp_core.h" in branch "HEAD" rename "drivers/video/exynos/exynos_dp_core.h"->"drivers/video/fbdev/exynos/exynos_dp_core.h" in "omap_dss2/for-next" CONFLICT (rename/rename): Rename "drivers/video/exynos/exynos_dp_core.c"->"drivers/gpu/drm/exynos/exynos_dp_core.c" in branch "HEAD" rename "drivers/video/exynos/exynos_dp_core.c"->"drivers/video/fbdev/exynos/exynos_dp_core.c" in "omap_dss2/for-next"
I fixed it up and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |