From: Don Zickus on
gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1552#note_8129...
If we think this is not going to change, then I am in favor of applying this
now so developers can use os-build. It should be auto-resolve during next
daily merge.