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

Pull cgroup/for-6.16-fixes to receive c853d187 ("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>