Janusz Krzysztofik bd53280ef0 drm/drv: Fix incorrect resolution of merge conflict ... Commit f06ddb5309 ("BackMerge v5.1-rc5 into drm-next") incorrectly resolved a merge conflict related to a patch having been merged twice: - commit 3f04e0a6cf ("drm: Fix drm_release() and device unplug") introduced as a standalone fix via drm-fixes branch, - commit 1ee57d4d75 ("drm: Fix drm_release() and device unplug") applied as patch 1/2 of a series on drm-next branch. That incorrect resolution of the conflict effectively reverted a change introduced to drivers/gpu/drm/drm_drv.c by patch 2/2 of that series - commit ba3bf37e15 ("drm/drv: drm_dev_unplug(): Move out drm_dev_put() call"). Fix it. Fixes: f06ddb5309 ("BackMerge v5.1-rc5 into drm-next") Signed-off-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com> Signed-off-by: Dave Airlie <airlied@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190417133232.16232-1-janusz.krzysztofik@linux.intel.com		2019-04-18 06:42:22 +10:00
..
drm	drm/drv: Fix incorrect resolution of merge conflict	2019-04-18 06:42:22 +10:00
host1x	gpu: host1x: Fix compile error when IOMMU API is not available	2019-04-11 10:35:39 +02:00
ipu-v3
vga
Makefile