If the variable types can be resolved in the more recent efivar-devel, then the first patch should not be merged. The ull literals
should likely gain new names.
I think the issues here have been fixed by 4df989abdf893326cb866e153b24ddaf2b29d0d7 and by the newer f36 container image? If I'm wrong, please re-open this.
This may or may not be appropriate.
If the variable types can be resolved in the more recent efivar-devel, then the first patch should not be merged. The ull literals should likely gain new names.