From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Tejun Heo <tj@kernel•org>, Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@kernel•org>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: Gabriele Monaco <gmonaco@redhat•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Waiman Long <longman@redhat•com>
Subject: linux-next: manual merge of the cgroup tree with the tip tree
Date: Tue, 25 Nov 2025 16:15:18 +1100 [thread overview]
Message-ID: <20251125161518.3d40b57f@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1362 bytes --]
Hi all,
Today's linux-next merge of the cgroup tree got a conflict in:
kernel/cgroup/cpuset.c
between commit:
7dec062cfcf2 ("timers/migration: Exclude isolated cpus from hierarchy")
from the tip tree and commit:
be04e96ba911 ("cgroup/cpuset: Globally track isolated_cpus update")
from the cgroup 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 kernel/cgroup/cpuset.c
index 72891976475c,1e3aadc09d3a..000000000000
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@@ -1397,16 -1477,14 +1477,18 @@@ static void update_isolation_cpumasks(v
{
int ret;
- lockdep_assert_cpus_held();
-
- if (!isolcpus_updated)
+ if (!isolated_cpus_updating)
return;
+ lockdep_assert_cpus_held();
+
ret = workqueue_unbound_exclude_cpumask(isolated_cpus);
WARN_ON_ONCE(ret < 0);
+
+ ret = tmigr_isolated_exclude_cpumask(isolated_cpus);
+ WARN_ON_ONCE(ret < 0);
++
+ isolated_cpus_updating = false;
}
/**
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-11-25 5:15 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-25 5:15 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-09-12 5:59 linux-next: manual merge of the cgroup tree with the tip tree Stephen Rothwell
2022-10-10 21:00 ` Stephen Rothwell
2015-12-21 4:41 Stephen Rothwell
2015-12-21 4:41 Stephen Rothwell
2015-12-21 4:48 ` Tejun Heo
2016-01-11 15:15 ` Ingo Molnar
2015-10-16 5:40 Stephen Rothwell
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=20251125161518.3d40b57f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=gmonaco@redhat$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=longman@redhat$(echo .)com \
--cc=mingo@kernel$(echo .)org \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=tj@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