]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
projects / thirdparty / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4017040 f452a22)
Merge tag 'ceph-for-6.15-rc4' of https://github.com/ceph/ceph-client
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Apr 2025 22:51:28 +0000 (15:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Apr 2025 22:51:28 +0000 (15:51 -0700)
Pull ceph fixes from Ilya Dryomov:
 "A small CephFS encryption-related fix and a dead code cleanup"

* tag 'ceph-for-6.15-rc4' of https://github.com/ceph/ceph-client:
  ceph: Fix incorrect flush end position calculation
  ceph: Remove osd_client deadcode

1  2 
fs/ceph/inode.c patch | diff1 | diff2 | blob | history

diff --cc fs/ceph/inode.c
Simple merge
A mirror of Linus' kernel repository