Commit 89d2d7bf0698 for kernel

commit 89d2d7bf0698b7fdfc914bfd219e739e9308d332
Merge: 9628ee0c2219 2c493ac8c347
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sat Oct 24 20:07:00 2026 -1000

    Merge tag 'efi-next-for-v7.4' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi

    Pull EFI updates from Ard Biesheuvel:

     - Set the LoaderDevicePartUUID EFI variable from the stub to help
       systemd discover the file system layout when booting straight into
       Linux without GRUB or systemd-boot (Vincent Mailhol)

     - Some GUID deduplication work from Vincent

     - Remove pointless UTF16->UTF8 and vice versa conversions from the stub

     - Some kmap() -> kmap_local_page() conversions in the capsule loader

     - Add a runtime control to en/disable EFI runtime services so that
       PREEMPT_RT systems can enable them as needed

     - Add a 'nostatfs' mount option to efivarfs so that the cost of
       querying the EFI variable store (which is already rate limited) can
       be avoided entirely on systems where it is disproportionately costly

     - Rework the EFI libstub Makefile to align x86 with other
       architectures, and inherit/adapt the global CFLAGS variable rather
       than reconstruct it from scratch

     - Constify attributes of statically allocated sysfs nodes

     - Avoid register x18 when building the arm64 EFI stub, in order to
       comply with the UEFI spec, and to permit it to execute in a context
       where x18 is special

     - Preserve the physical addresses of all EFI config tables that may be
       of interest to an incoming kexec kernel

     - Add some LKDTM tests for EFI runtime crashes where the faulting
       address is inside a EFI memory region

     - Other minor bug fixes and cosmetic cleanups

    * tag 'efi-next-for-v7.4' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi: (35 commits)
      lkdtm: Add more EFI runtime tests
      efi: Initialize all configuration table addresses to EFI_INVALID_TABLE_ADDR
      efi: Retain the address of the LINUX_EFI_MEMRESERVE table
      efi/libstub: Don't replace an existing LINUX_EFI_MEMRESERVE table
      efi/runtime-wrappers: Don't park the worker after a recovered firmware fault
      efi: Use sysfs_emit() not sprintf() to generate sysfs file contents
      efi: Constify sysfs attributes
      efi/libstub: Disable kernel stack erasing in the common flags
      efi/libstub: Build the x86 stub from KBUILD_CFLAGS
      efi/libstub: Declare the x86 stub's assembly entry points
      efi/libstub: arm64: Don't use the platform register x18
      efi/libstub: Free cmdline_ptr in efi_pe_entry
      efi/riscv: libstub: Don't set image_size in handle_kernel_image()
      efi/libstub: Fix error unwind freeing fdt in allocate_new_fdt_and_exit_boot()
      efivarfs: add nostatfs mount option to skip QueryVariableInfo()
      efi/libstub: add initial Boot Loader Interface support
      efi/libstub: Add efi_snprintf() to construct wide strings
      efi/libstub: Add support for printing human readable GUIDs
      efi/libstub: Output UTF-16 directly from vsnprintf()
      efi/libstub: Avoid efi_puts() for compile time constant strings
      ...

diff --cc drivers/firmware/efi/libstub/Makefile
index 415f63105b48,da9173c12935..bbab12b8eb4b
--- a/drivers/firmware/efi/libstub/Makefile
+++ b/drivers/firmware/efi/libstub/Makefile
@@@ -40,7 -40,8 +40,8 @@@ KBUILD_CFLAGS			:= $(subst $(CC_FLAGS_F
  				   -D__NO_FORTIFY \
  				   -ffreestanding \
  				   -fno-stack-protector \
+ 				   $(DISABLE_KSTACK_ERASE) \
 -				   $(call cc-option,-fno-addrsig) \
 +				   $(CONFIG_CC_OPT_NO_ADDRSIG) \
  				   -D__DISABLE_EXPORTS

  #