Subject: linux-next: manual merge of the kthread tree with the risc-v tree

From: Mark Brown <[email-masked]>
Date: Wed, 21 Jan 2026 16:13:35 +0000

Hi all,

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

  include/linux/cpu.h

between commit:

  d3d1efd48b3b6 ("prctl: add arch-agnostic prctl()s for indirect branch tracking")

from the risc-v tree and commit:

  658d3c155c301 ("sched/arm64: Move fallback task cpumask to HK_TYPE_DOMAIN")

from the kthread 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.

diff --cc include/linux/cpu.h
index 8239cd95a0053,0b48af25ab5cb..0000000000000
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@@ -229,8 -229,8 +229,12 @@@ static inline bool cpu_attack_vector_mi
  #define smt_mitigations SMT_MITIGATIONS_OFF
  #endif
  
 +int arch_get_indir_br_lp_status(struct task_struct *t, unsigned long __user *status);
 +int arch_set_indir_br_lp_status(struct task_struct *t, unsigned long status);
 +int arch_lock_indir_br_lp_status(struct task_struct *t, unsigned long status);
 +
+ struct cpumask;
+ 
+ bool arch_isolated_cpus_can_update(struct cpumask *new_cpus);
+ 
  #endif /* _LINUX_CPU_H_ */