From: Mark Brown <broonie@kernel•org>
To: Frederic Weisbecker <frederic@kernel•org>
Cc: Deepak Gupta <debug@rivosinc•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Paul Walmsley <pjw@kernel•org>
Subject: linux-next: manual merge of the kthread tree with the risc-v tree
Date: Wed, 21 Jan 2026 16:13:35 +0000 [thread overview]
Message-ID: <aXD7L7Ivizu4HRY0@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1373 bytes --]
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_ */
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2026-01-21 16:13 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aXD7L7Ivizu4HRY0@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=debug@rivosinc$(echo .)com \
--cc=frederic@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=pjw@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox