From: Tejun Heo <tj@kernel.org>
Date: Tue, 17 Jun 2025 20:08:45 +0000 (-1000)
Subject: Merge branch 'for-6.16-fixes' into for-6.17
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=633e6bad31249fe53721030bfb9e1f4d1f0007fe;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'for-6.16-fixes' into for-6.17

Pull cgroup/for-6.16-fixes to receive c853d18706de ("cgroup: adjust criteria
for rstat subsystem cpu lock access") which conflicts with the NMI-safe
css_rstat_updated() changes in for-6.17. As the latter removes the affected
CPU locks, resolve the conflicts by taking for-6.17 sides.

Signed-off-by: Tejun Heo <tj@kernel.org>
---

633e6bad31249fe53721030bfb9e1f4d1f0007fe