Hi Stephen, Daniel,

On Tue, Mar 07, 2017 at 11:10:19AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the sunxi tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> drivers/gpu/drm/sun4i/sun4i_crtc.c: In function 'sun4i_crtc_enable_vblank':
> drivers/gpu/drm/sun4i/sun4i_crtc.c:109:31: error: 'struct sun4i_crtc' has no member named 'drv'
>   struct sun4i_drv *drv = scrtc->drv;
>                                ^
> drivers/gpu/drm/sun4i/sun4i_crtc.c: In function 'sun4i_crtc_disable_vblank':
> drivers/gpu/drm/sun4i/sun4i_crtc.c:121:31: error: 'struct sun4i_crtc' has no member named 'drv'
>   struct sun4i_drv *drv = scrtc->drv;
>                                ^
> 
> Caused by commit
> 
>   50480a78e282 ("drm: sun4i: use vblank hooks in struct drm_crtc_funcs")
> 
> from the drm-misc tree interacting with commit
> 
>   1b8d109585df ("drm/sun4i: Add backend and tcon pointers to sun4i_crtc")
> 
> from the sunxi tree.

I just rebased my tree on top of the latest drm-misc tag
(drm-misc-next-2017-03-06). It should compile, and not have merge
conflicts anymore.

Thanks!
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com