drm-tip merge conflict caused by recent merge of amd-drm-next into drm-next

[Hans de Goede]

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.

Regards,

Hans