Re: [git pull] drm main pull for 3.4-rc1

Dave Airlie
2012-03-21T17:47:37Z

On Wed, Mar 21, 2012 at 5:31 PM, InKi Dae <daeinki@gmail.com> wrote:
> Hi Linus,
>
> now mainline has a duplicated patch set for exynos drm driver so
> please revert the patch below from mainline before merging with
> drm-next to avoid conflict.
> subject: drm exynos: use drm_fb_helper_set_par directly
> commit id: 34418c25d64844625118b5eedc493f7904d77659
>
> this patch had already been included in Dave's drm-next. I am sorry to trouble.

Inki it shouldn't be a problem, Linus can resolve conflicts fine. If
there is any.

Dave.