projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b8c854 8e18587)
Merge tag 'ceph-for-6.2-rc3' of https://github.com/ceph/ceph-client
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jan 2023 20:11:41 +0000 (12:11 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jan 2023 20:11:41 +0000 (12:11 -0800)
Pull ceph fixes from Ilya Dryomov:
 "Two file locking fixes from Xiubo"

* tag 'ceph-for-6.2-rc3' of https://github.com/ceph/ceph-client:
  ceph: avoid use-after-free in ceph_fl_release_lock()
  ceph: switch to vfs_inode_has_locks() to fix file lock bug


Trivial merge
ep93xx device tree rework repo: git://git.maquefel.me/linux.git