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
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,