From: Philipp Rudo on
gitlab.com
Merge Request:
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1144
The last commit addresses
https://bugzilla.redhat.com/show_bug.cgi?id=1876435
and is preceded by two cleanups.
The first commit is strictly speaking independent. If requested I can
move it
to a separate MR.