From: Jani Nikula <jani.nikula@intel.com>
To: Dave Airlie <airlied@redhat.com>
Cc: "Neil Armstrong" <narmstrong@baylibre.com>,
dri-devel@lists.freedesktop.org,
"Lucas De Marchi" <lucas.demarchi@intel.com>,
"José Roberto de Souza" <jose.souza@intel.com>,
"Daniel Vetter" <daniel.vetter@ffwll.ch>,
"Sean Paul" <seanpaul@chromium.org>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Rodrigo Vivi" <rodrigo.vivi@intel.com>,
"Janusz Krzysztofik" <janusz.krzysztofik@linux.intel.com>,
"Thierry Reding" <treding@nvidia.com>,
"Daniel Stone" <daniels@collabora.com>
Subject: Re: [PATCH drm-tip] rerere-cache: Fix drm/drm-next merge conflict resolution
Date: Fri, 12 Apr 2019 11:46:33 +0300 [thread overview]
Message-ID: <87wojzhaqe.fsf@intel.com> (raw)
In-Reply-To: <2173849.8TjdhqGAES@jkrzyszt-desk.ger.corp.intel.com>
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
prev parent reply other threads:[~2019-04-12 8:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87wojzhaqe.fsf@intel.com \
--to=jani.nikula@intel.com \
--cc=airlied@redhat.com \
--cc=daniel.vetter@ffwll.ch \
--cc=daniels@collabora.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=janusz.krzysztofik@linux.intel.com \
--cc=jose.souza@intel.com \
--cc=kraxel@redhat.com \
--cc=lucas.demarchi@intel.com \
--cc=narmstrong@baylibre.com \
--cc=rodrigo.vivi@intel.com \
--cc=seanpaul@chromium.org \
--cc=treding@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.