linux-next: manual merge of the efi tree with the loongarch tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the efi tree got a conflict in:

  arch/loongarch/kernel/efi.c

between commit:

  113b340ca07a ("LoongArch: Add FDT booting support from efi system table")

from the loongarch tree and commit:

  732ea9db9d8a ("efi: libstub: Move screen_info handling to common code")

from the efi tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/loongarch/kernel/efi.c
index 47d03b133053,d75ce73e8ff8..000000000000
--- a/arch/loongarch/kernel/efi.c
+++ b/arch/loongarch/kernel/efi.c
@@@ -54,17 -52,27 +54,38 @@@ void __init efi_runtime_init(void
  	set_bit(EFI_RUNTIME_SERVICES, &efi.flags);
  }
  
 +void __init *efi_fdt_pointer(void)
 +{
 +	if (!efi_systab)
 +		return NULL;
 +
 +	if (fdt_pointer == EFI_INVALID_TABLE_ADDR)
 +		return NULL;
 +
 +	return early_memremap_ro(fdt_pointer, SZ_64K);
 +}
 +
+ unsigned long __initdata screen_info_table = EFI_INVALID_TABLE_ADDR;
+ 
+ static void __init init_screen_info(void)
+ {
+ 	struct screen_info *si;
+ 
+ 	if (screen_info_table == EFI_INVALID_TABLE_ADDR)
+ 		return;
+ 
+ 	si = early_memremap(screen_info_table, sizeof(*si));
+ 	if (!si) {
+ 		pr_err("Could not map screen_info config table\n");
+ 		return;
+ 	}
+ 	screen_info = *si;
+ 	memset(si, 0, sizeof(*si));
+ 	early_memunmap(si, sizeof(*si));
+ 
+ 	memblock_reserve(screen_info.lfb_base, screen_info.lfb_size);
+ }
+ 
  void __init efi_init(void)
  {
  	int size;

Attachment: pgpKf0cPGG4Ol.pgp
Description: OpenPGP digital signature