From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 6 Jun 2024 16:39:36 +0000 (-0700)
Subject: Merge tag 'efi-fixes-for-v6.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.10-rc3~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a34adf6010d723abc26c9f50ac2b326bf5ae0b9e;p=thirdparty%2Fkernel%2Fstable.git

Merge tag 'efi-fixes-for-v6.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi

Pull EFI fixes from Ard Biesheuvel:

 - Ensure that .discard sections are really discarded in the EFI zboot
   image build

 - Return proper error numbers from efi-pstore

 - Add __nocfi annotations to EFI runtime wrappers

* tag 'efi-fixes-for-v6.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
  efi: Add missing __nocfi annotations to runtime wrappers
  efi: pstore: Return proper errors on UEFI failures
  efi/libstub: zboot.lds: Discard .discard sections
---

a34adf6010d723abc26c9f50ac2b326bf5ae0b9e