On Friday, May 30, 2014 1:42 AM, Tomasz Figa wrote: > On 29.05.2014 18:36, Lee Jones wrote: > > There appears to have been a merge error on commit: > > > > 2b76813: drm/exynos: hdmi: remove the i2c drivers and use > > > > The original submission can be found at: > > > > https://patchwork.kernel.org/patch/3559541/ > > > > It looks like the commit was only half applied. This patch aims > > to finish what was started by Daniel. (+cc Inki Dae) Hi Lee Jones, A similar patch was already applied to drm-exynos git. [1] However, 'drivers/gpu/drm/exynos/exynos_hdmi.h' was not removed yet. Thus, additional patch to remove this 'exynos_hdmi.h' should be submitted. Thank you. [1] http://git.kernel.org/cgit/linux/kernel/git/daeinki/drm-exynos.git/commit/?h=exynos-drm-next&id=73c0a75ca9919c12525fd02eb49f9c3a34e0 d2d9 Best regards, Jingoo Han > > > > Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx> > > --- > > drivers/gpu/drm/exynos/exynos_ddc.c | 63 -------------------------------- > > drivers/gpu/drm/exynos/exynos_hdmi.h | 23 ------------ > > drivers/gpu/drm/exynos/exynos_hdmiphy.c | 65 --------------------------------- > > 3 files changed, 151 deletions(-) > > delete mode 100644 drivers/gpu/drm/exynos/exynos_ddc.c > > delete mode 100644 drivers/gpu/drm/exynos/exynos_hdmi.h > > delete mode 100644 drivers/gpu/drm/exynos/exynos_hdmiphy.c > > > > Obviously there is nothing to review, but still: > > Reviewed-by: Tomasz Figa <t.figa@xxxxxxxxxxx> > > Thanks for the patch. > > Best regards, > Tomasz -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
 |