Merge branch 'for-next/smt-control' into for-next/core

* for-next/smt-control:
  : Support SMT control on arm64
  arm64: Kconfig: Enable HOTPLUG_SMT
  arm64: topology: Support SMT control on ACPI based system
  arch_topology: Support SMT control for OF based system
  cpu/SMT: Provide a default topology_is_primary_thread()

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/kernel/topology.c
index 9e3583720668a4eb2107afa82fd13f3a2e8fabae,0bcea4f89ea821c3bbf87c6d985570dfcc07c30b..5d07ee85bdae47db194d2da689f8eebc368f890c
--- 1/arch/arm64/kernel/topology.c
--- 2/arch/arm64/kernel/topology.c
+++ b/arch/arm64/kernel/topology.c
@@@ -15,9 -15,10 +15,11 @@@
  #include <linux/arch_topology.h>
  #include <linux/cacheinfo.h>
  #include <linux/cpufreq.h>
+ #include <linux/cpu_smt.h>
  #include <linux/init.h>
  #include <linux/percpu.h>
 +#include <linux/sched/isolation.h>
+ #include <linux/xarray.h>
  
  #include <asm/cpu.h>
  #include <asm/cputype.h>

diff --cc drivers/base/arch_topology.c
Simple merge