Ludovic Courtès <ludo@gnu.org> writes:

> Hi Marius,
>
> I’m unable to cherry-pick ecf5d5376979fadd971559367bf553df89fcc62b to
> ‘version-0.13.0’ because there are conflicts and I’m not sure how to
> resolve them.
>
> Could you take a look?

I resolved the conflicts, booted a UEFI VM, and pushed the commit.

Still works! \o/