Bug#1022097: Fixing merging bugs

[Diederik de Haas]

Control: forwarded -1 https://gitlab.freedesktop.org/drm/amd/-/issues/2216
Control: tag -1 patch pending upstream
Control: merge -1 1022042

signature.asc
Description: This is a digitally signed message part.