Hi Linus, Please pull the changes below - they mostly address issues introduced this merge window, except for Heinrich's patch. The following changes since commit 3f68e69520d3d52d66a6ad872a75b7d8f2ea7665: riscv/efi_stub: Add support for RISCV_EFI_BOOT_PROTOCOL (2022-05-19 10:22:17 +0200) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git tags/efi-next-for-v5.19-2 for you to fetch changes up to 75ed63d919400b803691a0c757ee23c6f767a625: efi: clean up Kconfig dependencies on CONFIG_EFI (2022-06-01 14:08:13 +0200) ---------------------------------------------------------------- Follow-up tweaks for the EFI changes in v5.19 - fix new DXE service invocations for mixed mode - use correct Kconfig symbol when setting PE header flag - clean up the drivers/firmware/efi Kconfig dependencies so that features that depend on CONFIG_EFI are hidden from the UI when the symbol is not enabled. Also included is a RISC-V bugfix from Heinrich to avoid read-write mappings of read-only firmware regions in the EFI page tables. ---------------------------------------------------------------- Ard Biesheuvel (2): efi/x86: libstub: Make DXE calls mixed mode safe efi: clean up Kconfig dependencies on CONFIG_EFI Heinrich Schuchardt (1): riscv: read-only pages should not be writable Lukas Bulwahn (1): efi: x86: Fix config name for setting the NX-compatibility flag in the PE header arch/riscv/kernel/efi.c | 2 +- arch/x86/boot/header.S | 2 +- arch/x86/include/asm/efi.h | 9 ++++++ drivers/firmware/Makefile | 3 +- drivers/firmware/efi/Kconfig | 52 +++++++++++++++------------------ drivers/firmware/efi/libstub/x86-stub.c | 4 +-- 6 files changed, 38 insertions(+), 34 deletions(-)