From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: Hans de Goede <hdegoede@redhat.com>,
Alex Deucher <alexander.deucher@amd.com>,
"dri-devel@lists.freedesktop.org"
<dri-devel@lists.freedesktop.org>
Cc: Dave Airlie <airlied@redhat.com>
Subject: Re: drm-tip merge conflict caused by recent merge of amd-drm-next into drm-next
Date: Tue, 8 Nov 2022 12:13:16 +0000 [thread overview]
Message-ID: <9368ba5b-73a9-4e72-a71d-9c34e202ce7a@linux.intel.com> (raw)
In-Reply-To: <1b0aa084-45ec-32e0-e425-94df04d32ba3@redhat.com>
On 08/11/2022 09:24, Hans de Goede wrote:
> Hi Alex, et al.,
>
> I just pushed 2 simple DMI quirk patches
> (for drivers/gpu/drm/drm_panel_orientation_quirks.c)
> to drm-misc-fixes.
>
> At the end of the dim push-branch I noticed that
> rebuilding drm-tip failed due to a merge error
> when merging in drm-next .
>
> Looking at the 3-way diff of the conflict, this seems
> to be caused by amd-drm-next-6.2-2022-11-04 landing
> in drm-next.
>
> I'm not familiar with the code causing the conflict
> and I believe this is best resolved by someone who
> is more familiar with the code.
We really do need a better process for these things. In recent past I
tried pinging on IRC but that was a bit hit and miss. More miss than hit
even.
This one I actually fixed up, since I had an i915 conflict to deal with
due drm-intel-fixes, it looked straight forward and did not feel like
waiting. Please guys do check if I did it correctly.
Regards,
Tvrtko
prev parent reply other threads:[~2022-11-08 12:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-08 9:24 drm-tip merge conflict caused by recent merge of amd-drm-next into drm-next Hans de Goede
2022-11-08 12:13 ` Tvrtko Ursulin [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=9368ba5b-73a9-4e72-a71d-9c34e202ce7a@linux.intel.com \
--to=tvrtko.ursulin@linux.intel.com \
--cc=airlied@redhat.com \
--cc=alexander.deucher@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=hdegoede@redhat.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).