From: Daniel Vetter <daniel@ffwll.ch>
To: Helge Deller <deller@gmx.de>
Cc: Thomas Zimmermann <tzimmermann@suse.de>, dri-devel@lists.freedesktop.org
Subject: Re: dim question: How to revert patches?
Date: Wed, 27 Apr 2022 16:21:15 +0200 [thread overview]
Message-ID: <YmlRW2fAabBqWc+0@phenom.ffwll.local> (raw)
In-Reply-To: <c79789fb-642d-ee9e-32a6-fc7f79d9e3b4@gmx.de>
On Thu, Apr 14, 2022 at 10:37:55PM +0200, Helge Deller wrote:
> Hello dri-devel & dim users,
Apologies for late reply, I'm way behind on stuff.
> I committed this patch to the drm-misc-next branch:
>
> commit d6cd978f7e6b6f6895f8d0c4ce6e5d2c8e979afe
> video: fbdev: fbmem: fix pointer reference to null device field
>
> then I noticed that it was fixed already in another branch which led to this error:
>
> Merging drm-misc/drm-misc-next... dim:
> dim: FAILURE: Could not merge drm-misc/drm-misc-next
> dim: See the section "Resolving Conflicts when Rebuilding drm-tip"
> dim: in the drm-tip.rst documentation for how to handle this situation.
>
> I fixed it by reverting that patch above with this new commit in the drm-misc-next branch:
>
> commit cabfa2bbe617ddf0a0cc4d01f72b584dae4939ad (HEAD -> drm-misc-next, drm-misc/for-linux-next, drm-misc/drm-misc-next)
> Author: Helge Deller <deller@gmx.de>
> Revert "video: fbdev: fbmem: fix pointer reference to null device field"
>
> My question (as "dim" newbie):
> Was that the right solution?
The patch wasn't really broken, so revert feels a bit silly. The hint was
to look at the documentation referenced by the error message - the issue
was only in rebuilding the integration tree:
https://drm.pages.freedesktop.org/maintainer-tools/drm-tip.html#resolving-conflicts-when-rebuilding-drm-tip
This should cover you even for really rare conflict situations.
> Is there a possibility to drop those two patches from the drm-misc-next branch before it gets pushed upstream?
It's a shared tree, mistakes are forever. The only time we did a forced
push ever is when someone managed to push their local pile of hacks or
something, and we're catching those pretty well now with a server-side
test to make sure you're using dim to push.
It's also no big deal, and next time you get a conflict just resolve it
in drm-tip per the docs and it's all fine.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
next prev parent reply other threads:[~2022-04-27 14:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-14 20:37 dim question: How to revert patches? Helge Deller
2022-04-27 14:21 ` Daniel Vetter [this message]
2022-04-27 19:20 ` Helge Deller
2022-04-28 12:12 ` Daniel Vetter
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=YmlRW2fAabBqWc+0@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=deller@gmx.de \
--cc=dri-devel@lists.freedesktop.org \
--cc=tzimmermann@suse.de \
/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.