Subject: linux-next: manual merge of the arm64 tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 21 May 2025 11:34:26 +1000

Hi all,

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

  arch/arm64/kernel/image-vars.h

between commit:

  117c3b21d3c7 ("arm64: Rework checks for broken Cavium HW in the PI code")

from Linus' tree and commit:

  90530521079e ("arm64/boot: Disallow BSS exports to startup code")

from the arm64 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/arm64/kernel/image-vars.h
index 2004b4f41ade,c5266430284b..000000000000
--- a/arch/arm64/kernel/image-vars.h
+++ b/arch/arm64/kernel/image-vars.h
@@@ -36,37 -42,34 +42,30 @@@ PROVIDE(__pi___memcpy			= __pi_memcpy)
  PROVIDE(__pi___memmove			= __pi_memmove);
  PROVIDE(__pi___memset			= __pi_memset);
  
- PROVIDE(__pi_id_aa64isar1_override	= id_aa64isar1_override);
- PROVIDE(__pi_id_aa64isar2_override	= id_aa64isar2_override);
- PROVIDE(__pi_id_aa64mmfr0_override	= id_aa64mmfr0_override);
- PROVIDE(__pi_id_aa64mmfr1_override	= id_aa64mmfr1_override);
- PROVIDE(__pi_id_aa64mmfr2_override	= id_aa64mmfr2_override);
- PROVIDE(__pi_id_aa64pfr0_override	= id_aa64pfr0_override);
- PROVIDE(__pi_id_aa64pfr1_override	= id_aa64pfr1_override);
- PROVIDE(__pi_id_aa64smfr0_override	= id_aa64smfr0_override);
- PROVIDE(__pi_id_aa64zfr0_override	= id_aa64zfr0_override);
- PROVIDE(__pi_arm64_sw_feature_override	= arm64_sw_feature_override);
- PROVIDE(__pi_arm64_use_ng_mappings	= arm64_use_ng_mappings);
- PROVIDE(__pi__ctype			= _ctype);
- PROVIDE(__pi_memstart_offset_seed	= memstart_offset_seed);
+ PI_EXPORT_SYM(id_aa64isar1_override);
+ PI_EXPORT_SYM(id_aa64isar2_override);
+ PI_EXPORT_SYM(id_aa64mmfr0_override);
+ PI_EXPORT_SYM(id_aa64mmfr1_override);
+ PI_EXPORT_SYM(id_aa64mmfr2_override);
+ PI_EXPORT_SYM(id_aa64pfr0_override);
+ PI_EXPORT_SYM(id_aa64pfr1_override);
+ PI_EXPORT_SYM(id_aa64smfr0_override);
+ PI_EXPORT_SYM(id_aa64zfr0_override);
+ PI_EXPORT_SYM(arm64_sw_feature_override);
+ PI_EXPORT_SYM(arm64_use_ng_mappings);
 -#ifdef CONFIG_CAVIUM_ERRATUM_27456
 -PI_EXPORT_SYM(cavium_erratum_27456_cpus);
 -PI_EXPORT_SYM(is_midr_in_range_list);
 -#endif
+ PI_EXPORT_SYM(_ctype);
  
- PROVIDE(__pi_init_idmap_pg_dir		= init_idmap_pg_dir);
- PROVIDE(__pi_init_idmap_pg_end		= init_idmap_pg_end);
- PROVIDE(__pi_init_pg_dir		= init_pg_dir);
- PROVIDE(__pi_init_pg_end		= init_pg_end);
- PROVIDE(__pi_swapper_pg_dir		= swapper_pg_dir);
+ PI_EXPORT_SYM(swapper_pg_dir);
  
- PROVIDE(__pi__text			= _text);
- PROVIDE(__pi__stext               	= _stext);
- PROVIDE(__pi__etext               	= _etext);
- PROVIDE(__pi___start_rodata       	= __start_rodata);
- PROVIDE(__pi___inittext_begin     	= __inittext_begin);
- PROVIDE(__pi___inittext_end       	= __inittext_end);
- PROVIDE(__pi___initdata_begin     	= __initdata_begin);
- PROVIDE(__pi___initdata_end       	= __initdata_end);
- PROVIDE(__pi__data                	= _data);
- PROVIDE(__pi___bss_start		= __bss_start);
- PROVIDE(__pi__end			= _end);
+ PI_EXPORT_SYM(_text);
+ PI_EXPORT_SYM(_stext);
+ PI_EXPORT_SYM(_etext);
+ PI_EXPORT_SYM(__start_rodata);
+ PI_EXPORT_SYM(__inittext_begin);
+ PI_EXPORT_SYM(__inittext_end);
+ PI_EXPORT_SYM(__initdata_begin);
+ PI_EXPORT_SYM(__initdata_end);
+ PI_EXPORT_SYM(_data);
  
  #ifdef CONFIG_KVM