[Merge] ~xnox/shim:post-15.4-bugfixes into ~ubuntu-core-dev/shim/+git/shim:master

[Dimitri John Ledkov]

Dimitri John Ledkov has proposed merging ~xnox/shim:post-15.4-bugfixes into ~ubuntu-core-dev/shim/+git/shim:master.

Commit message:
Add two more cherrypicks from upstream.

Requested reviews:
  Ubuntu Core Development Team (ubuntu-core-dev)
Related bugs:
  Bug #1925139 in shim (Ubuntu): "efi: Failed to lookup EFI memory descriptor"
  https://bugs.launchpad.net/ubuntu/+source/shim/+bug/1925139
  Bug #1925140 in shim (Ubuntu): "fix insecure mode booting"
  https://bugs.launchpad.net/ubuntu/+source/shim/+bug/1925140

For more details, see:
https://code.launchpad.net/~xnox/shim/+git/shim/+merge/401454
-- 
Your team Ubuntu Core Development Team is requested to review the proposed merge of ~xnox/shim:post-15.4-bugfixes into ~ubuntu-core-dev/shim/+git/shim:master.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 4042 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20210420/5e770841/attachment.diff>