Re: [PATCH 4/8] drm/rcar-du: fix merge conflict for state->alpha

2018-05-25 Thread Laurent Pinchart
Hi Arnd, Thank you for the patch. On Friday, 25 May 2018 18:50:11 EEST Arnd Bergmann wrote: > The "alpha" struct member was removed in one commit but another user > added in another, leading to a build failure: > > drivers/gpu/drm/rcar-du/rcar_du_vsp.c: In function >

Re: [PATCH 4/8] drm/rcar-du: fix merge conflict for state->alpha

2018-05-25 Thread Laurent Pinchart
Hi Arnd, Thank you for the patch. On Friday, 25 May 2018 18:50:11 EEST Arnd Bergmann wrote: > The "alpha" struct member was removed in one commit but another user > added in another, leading to a build failure: > > drivers/gpu/drm/rcar-du/rcar_du_vsp.c: In function >

[PATCH 4/8] drm/rcar-du: fix merge conflict for state->alpha

2018-05-25 Thread Arnd Bergmann
The "alpha" struct member was removed in one commit but another user added in another, leading to a build failure: drivers/gpu/drm/rcar-du/rcar_du_vsp.c: In function 'rcar_du_vsp_plane_atomic_duplicate_state': drivers/gpu/drm/rcar-du/rcar_du_vsp.c:325:6: error: 'struct rcar_du_vsp_plane_state'

[PATCH 4/8] drm/rcar-du: fix merge conflict for state->alpha

2018-05-25 Thread Arnd Bergmann
The "alpha" struct member was removed in one commit but another user added in another, leading to a build failure: drivers/gpu/drm/rcar-du/rcar_du_vsp.c: In function 'rcar_du_vsp_plane_atomic_duplicate_state': drivers/gpu/drm/rcar-du/rcar_du_vsp.c:325:6: error: 'struct rcar_du_vsp_plane_state'