projects / linux-block.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8dcb0ed c853d18)
Merge branch 'for-6.16-fixes' into for-6.17
authorTejun Heo <tj@kernel.org>
Tue, 17 Jun 2025 20:08:45 +0000 (10:08 -1000)
committerTejun Heo <tj@kernel.org>
Tue, 17 Jun 2025 20:08:45 +0000 (10:08 -1000)
commit633e6bad31249fe53721030bfb9e1f4d1f0007fe
treef81287c1395be44d26925d43fca5569b15e02a82tree
parent8dcb0ed834a3ec037c153c7757240ede9a8c9808commit | diff
parentc853d18706de8c9525126b362f747d2e480e93dfcommit | 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>
Linux 6.x block layer and io_uring tree(s)