Linux kernel bug fix: drm/drv: Fix incorrect resolution of merge conflict
Subsystem: gpu (drivers/gpu/drm/drm_drv.c)
Bug type: hang, severity: medium
Files changed: drivers/gpu/drm/drm_drv.c
Introduced by Dave Airlie on 2019-04-15 15:51:49 +1000; fixed by Janusz Krzysztofik on 2019-04-18 06:42:22 +1000 (lifetime: 2 days)