Re: [PATCH drm-tip] rerere-cache: Fix drm/drm-next merge conflict resolution

2019-04-12 Thread Jani Nikula
On Fri, 12 Apr 2019, Janusz Krzysztofik wrote: > A change introduced by commit ba3bf37e150a ("drm/drv: drm_dev_unplug(): > Move out drm_dev_put() call") to drivers/gpu/drm/drm_drv.c has been > reverted by that incorrect merge conflict resolution, fix it. > > That has been apparently introduced in

[PATCH drm-tip] rerere-cache: Fix drm/drm-next merge conflict resolution

2019-04-11 Thread Janusz Krzysztofik
A change introduced by commit ba3bf37e150a ("drm/drv: drm_dev_unplug(): Move out drm_dev_put() call") to drivers/gpu/drm/drm_drv.c has been reverted by that incorrect merge conflict resolution, fix it. That has been apparently introduced into the rerere-cache branch by commit dc780f3f8eb4 ("2019y