diff options
| author | Tejun Heo <tj@kernel.org> | 2025-06-17 10:08:45 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2025-06-17 10:08:45 -1000 |
| commit | 633e6bad31249fe53721030bfb9e1f4d1f0007fe (patch) | |
| tree | f81287c1395be44d26925d43fca5569b15e02a82 /tools/perf/scripts/python/mem-phys-addr.py | |
| parent | 8dcb0ed834a3ec037c153c7757240ede9a8c9808 (diff) | |
| parent | c853d18706de8c9525126b362f747d2e480e93df (diff) | |
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>
Diffstat (limited to 'tools/perf/scripts/python/mem-phys-addr.py')
0 files changed, 0 insertions, 0 deletions