]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branch 'locking/urgent'
authorPeter Zijlstra <peterz@infradead.org>
Fri, 20 Dec 2024 14:31:19 +0000 (15:31 +0100)
committerPeter Zijlstra <peterz@infradead.org>
Fri, 20 Dec 2024 14:31:19 +0000 (15:31 +0100)
Sync with urgent -- avoid conflicts.

Signed-off-by: Peter Zijlstra <peterz@infradead.org>

Trivial merge