From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 25 Apr 2025 22:51:28 +0000 (-0700)
Subject: Merge tag 'ceph-for-6.15-rc4' of https://github.com/ceph/ceph-client
X-Git-Tag: v6.15-rc4~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=349b7d77f5a104cf4a81f5400184c6c446792bd3;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'ceph-for-6.15-rc4' of https://github.com/ceph/ceph-client

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
---

349b7d77f5a104cf4a81f5400184c6c446792bd3