Merge tag 'efi-next-for-v6.1' into loongarch-next

LoongArch architecture changes for 6.1 depend on the efi changes to
work, so merge them to create a base.

diff --cc arch/loongarch/Kconfig
Simple merge

diff --cc arch/loongarch/kernel/head.S
index 3318643,8f89f39..7e57ae8
--- 1/arch/loongarch/kernel/head.S
--- 2/arch/loongarch/kernel/head.S
+++ b/arch/loongarch/kernel/head.S
@@@ -12,10 -12,28 +12,30 @@@
  #include <asm/loongarch.h>
  #include <asm/stackframe.h>
  
+ #ifdef CONFIG_EFI_STUB
+ 
+ #include "efi-header.S"
+ 
+       __HEAD
+ 
+ _head:
+       .word   MZ_MAGIC                /* "MZ", MS-DOS header */
+       .org    0x3c                    /* 0x04 ~ 0x3b reserved */
+       .long   pe_header - _head       /* Offset to the PE header */
+ 
+ pe_header:
+       __EFI_PE_HEADER
+ 
+ SYM_DATA(kernel_asize, .long _end - _text);
+ SYM_DATA(kernel_fsize, .long _edata - _text);
+ SYM_DATA(kernel_offset, .long kernel_offset - _text);
+ 
+ #endif
+ 
        __REF
  
 +      .align 12
 +
  SYM_CODE_START(kernel_entry)                  # kernel entry point
  
        /* Config direct window and set PG */

diff --cc arch/loongarch/kernel/vmlinux.lds.S
Simple merge

diff --cc drivers/firmware/efi/libstub/Makefile
Simple merge

diff --cc drivers/firmware/efi/libstub/x86-stub.c
Simple merge