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

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

[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-03m-25d-06h-59m-12s UTC: drm-tip rerere cache update").

Fixes: dc780f3f8eb4 ("2019y-03m-25d-06h-59m-12s UTC: drm-tip rerere cache update")
Signed-off-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
---
 rr-cache/a587fa1cbcdfe705a4c65972f33dfe3448fb3550/postimage | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rr-cache/a587fa1cbcdfe705a4c65972f33dfe3448fb3550/postimage b/rr-cache/a587fa1cbcdfe705a4c65972f33dfe3448fb3550/postimage
index e87799e3e7ff..50d849d1bc6e 100644
--- a/rr-cache/a587fa1cbcdfe705a4c65972f33dfe3448fb3550/postimage
+++ b/rr-cache/a587fa1cbcdfe705a4c65972f33dfe3448fb3550/postimage
@@ -508,7 +508,6 @@ void drm_dev_unplug(struct drm_device *dev)
 	synchronize_srcu(&drm_unplug_srcu);
 
 	drm_dev_unregister(dev);
-	drm_dev_put(dev);
 }
 EXPORT_SYMBOL(drm_dev_unplug);
 
-- 
2.20.1




_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

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

[Jani Nikula]

On Fri, 12 Apr 2019, Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com> 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 into the rerere-cache branch by commit 
> dc780f3f8eb4 ("2019y-03m-25d-06h-59m-12s UTC: drm-tip rerere cache update").
>
> Fixes: dc780f3f8eb4 ("2019y-03m-25d-06h-59m-12s UTC: drm-tip rerere cache update")
> Signed-off-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>

Please talk to maintainers on #dri-devel or #intel-gfx instead of
sending patches to rr-cache.

BR,
Jani.

> ---
>  rr-cache/a587fa1cbcdfe705a4c65972f33dfe3448fb3550/postimage | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/rr-cache/a587fa1cbcdfe705a4c65972f33dfe3448fb3550/postimage b/rr-cache/a587fa1cbcdfe705a4c65972f33dfe3448fb3550/postimage
> index e87799e3e7ff..50d849d1bc6e 100644
> --- a/rr-cache/a587fa1cbcdfe705a4c65972f33dfe3448fb3550/postimage
> +++ b/rr-cache/a587fa1cbcdfe705a4c65972f33dfe3448fb3550/postimage
> @@ -508,7 +508,6 @@ void drm_dev_unplug(struct drm_device *dev)
>  	synchronize_srcu(&drm_unplug_srcu);
>  
>  	drm_dev_unregister(dev);
> -	drm_dev_put(dev);
>  }
>  EXPORT_SYMBOL(drm_dev_unplug);

-- 
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel