On Tue, Mar 7, 2017 at 7:59 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the sunxi tree got a conflict in:
>
> drivers/gpu/drm/sun4i/sun4i_drv.c
>
> between commit:
>
> 50480a78e282 ("drm: sun4i: use vblank hooks in struct drm_crtc_funcs")
>
> from the drm-misc tree an
Hi all,
Today's linux-next merge of the sunxi tree got a conflict in:
drivers/gpu/drm/sun4i/sun4i_drv.c
between commit:
50480a78e282 ("drm: sun4i: use vblank hooks in struct drm_crtc_funcs")
from the drm-misc tree and commit:
1c313a69e3ea ("drm/sun4i: Move layers from sun4i_drv to sun4i
Hi Maxime,
Today's linux-next merge of the sunxi tree got a conflict in:
drivers/gpu/drm/sun4i/sun4i_drv.c
between commit:
366e292df678 ("drm/sun4i: Remove open-coded drm_connector_register_all()")
from the drm-misc tree and commit:
7aa2e2b731b3 ("drm/sun4i: Convert to connector registe
