* [PATCH drm-tip] rerere-cache: Fix drm/drm-next merge conflict resolution
@ 2019-04-12 6:42 Janusz Krzysztofik
2019-04-12 8:46 ` Jani Nikula
0 siblings, 1 reply; 2+ messages in thread
From: Janusz Krzysztofik @ 2019-04-12 6:42 UTC (permalink / raw)
To: Dave Airlie
Cc: Neil Armstrong, Jani Nikula, dri-devel, Lucas De Marchi,
José Roberto de Souza, Daniel Vetter, Sean Paul,
Gerd Hoffmann, Rodrigo Vivi, Janusz Krzysztofik, Thierry Reding,
Daniel Stone
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH drm-tip] rerere-cache: Fix drm/drm-next merge conflict resolution
2019-04-12 6:42 [PATCH drm-tip] rerere-cache: Fix drm/drm-next merge conflict resolution Janusz Krzysztofik
@ 2019-04-12 8:46 ` Jani Nikula
0 siblings, 0 replies; 2+ messages in thread
From: Jani Nikula @ 2019-04-12 8:46 UTC (permalink / raw)
To: Dave Airlie
Cc: Neil Armstrong, dri-devel, Lucas De Marchi,
José Roberto de Souza, Daniel Vetter, Sean Paul,
Gerd Hoffmann, Rodrigo Vivi, Janusz Krzysztofik, Thierry Reding,
Daniel Stone
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-04-12 8:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-12 6:42 [PATCH drm-tip] rerere-cache: Fix drm/drm-next merge conflict resolution Janusz Krzysztofik
2019-04-12 8:46 ` Jani Nikula
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.