diff options
| author | Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com> | 2019-04-17 15:32:31 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-04-18 06:42:22 +1000 |
| commit | bd53280ef042301ea9663824568ecba5a88b2f9d (patch) | |
| tree | 309d4317b17d036518b7e7ac342176a60f92719a /kernel | |
| parent | f06ddb53096b4cddad2c530125a78a3c2a1d28a4 (diff) | |
| download | linux-bd53280ef042301ea9663824568ecba5a88b2f9d.tar.bz2 | |
drm/drv: Fix incorrect resolution of merge conflict
Commit f06ddb53096b ("BackMerge v5.1-rc5 into drm-next") incorrectly
resolved a merge conflict related to a patch having been merged twice:
- commit 3f04e0a6cfeb ("drm: Fix drm_release() and device unplug")
introduced as a standalone fix via drm-fixes branch,
- commit 1ee57d4d75fb ("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 ba3bf37e150a ("drm/drv: drm_dev_unplug(): Move out drm_dev_put()
call"). Fix it.
Fixes: f06ddb53096b ("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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions