Changes in Makefile

0fc8f6200d2313278fbf4539bbab74677c685531 - Merge drm/drm-fixes into drm-misc-fixes

Mon, 27 Apr 2026 10:26:49 +0200

Merge drm/drm-fixes into drm-misc-fixesGetting fixes and updates from v7.1-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/fs/ceph/Makefile

ac2dc6d57425ffa9629941d7c9d7c0e51082cb5a - Merge tag 'ceph-for-7.1-rc1' of https://github.com/ceph/ceph-client

Fri, 24 Apr 2026 22:47:19 +0200

Merge tag 'ceph-for-7.1-rc1' of https://github.com/ceph/ceph-clientPull ceph updates from Ilya Dryomov: "We have a series from Alex which extends CephFS client metrics with support for per-subvolume data I/O performance and latency tracking (metadata operations aren't included) and a good variety of fixes and cleanups across RBD and CephFS"* tag 'ceph-for-7.1-rc1' of https://github.com/ceph/ceph-client: ceph: add subvolume metrics collection and reporting ceph: parse subvolume_id from InodeStat v9 and store in inode ceph: handle InodeStat v8 versioned field in reply parsing libceph: Fix slab-out-of-bounds access in auth message processing rbd: fix null-ptr-deref when device_add_disk() fails crush: cleanup in crush_do_rule() method ceph: clear s_cap_reconnect when ceph_pagelist_encode_32() fails ceph: only d_add() negative dentries when they are unhashed libceph: update outdated comment in ceph_sock_write_space() libceph: Remove obsolete session key alignment logic ceph: fix num_ops off-by-one when crypto allocation fails libceph: Prevent potential null-ptr-deref in ceph_handle_auth_reply() List of files: /linux/fs/ceph/Makefile

b1137e0b3d4bad1cad73fa9bac763c74ddd1813d - ceph: add subvolume metrics collection and reporting

Tue, 10 Feb 2026 10:06:26 +0100

ceph: add subvolume metrics collection and reportingAdd complete infrastructure for per-subvolume I/O metrics collectionand reporting to the MDS. This enables administrators to monitor I/Opatterns at the subvolume granularity, which is useful for multi-tenantCephFS deployments.This patch adds:- CEPHFS_FEATURE_SUBVOLUME_METRICS feature flag for MDS negotiation- CEPH_SUBVOLUME_ID_NONE constant (0) for unknown/unset state- Red-black tree based metrics tracker for efficient per-subvolume aggregation with kmem_cache for entry allocations- Wire format encoding matching the MDS C++ AggregatedIOMetrics struct- Integration with the existing CLIENT_METRICS message- Recording of I/O operations from file read/write and writeback paths- Debugfs interfaces for monitoring (metrics/subvolumes, metrics/metric_features)Metrics tracked per subvolume include:- Read/write operation counts- Read/write byte counts- Read/write latency sums (for average calculation)The metrics are periodically sent to the MDS as part of the existingmetrics reporting infrastructure when the MDS advertises support forthe SUBVOLUME_METRICS feature.CEPH_SUBVOLUME_ID_NONE enforces subvolume_id immutability. Followingthe FUSE client convention, 0 means unknown/unset. Once an inode hasa valid (non-zero) subvolume_id, it should not change during theinode's lifetime.Signed-off-by: Alex Markuze Reviewed-by: Viacheslav Dubeyko Signed-off-by: Ilya Dryomov List of files: /linux/fs/ceph/Makefile

a23e1966932464e1c5226cb9ac4ce1d5fc10ba22 - Merge branch 'next' into for-linus

Mon, 15 Jul 2024 23:03:44 +0200

Merge branch 'next' into for-linusPrepare input updates for 6.11 merge window. List of files: /linux/fs/ceph/Makefile

6f47c7ae8c7afaf9ad291d39f0d3974f191a7946 - Merge tag 'v6.9' into next

Tue, 28 May 2024 06:37:18 +0200

Merge tag 'v6.9' into nextSync up with the mainline to bring in the new cleanup API. List of files: /linux/fs/ceph/Makefile

03c11eb3b16dc0058589751dfd91f254be2be613 - Merge tag 'v6.8-rc4' into x86/percpu, to resolve conflicts and refresh the branch

Wed, 14 Feb 2024 10:45:07 +0100

Merge tag 'v6.8-rc4' into x86/percpu, to resolve conflicts and refresh the branchConflicts: arch/x86/include/asm/percpu.h arch/x86/include/asm/text-patching.hSigned-off-by: Ingo Molnar List of files: /linux/fs/ceph/Makefile

a1c613ae4c322ddd58d5a8539dbfba2a0380a8c0 - Merge drm/drm-next into drm-intel-gt-next

Tue, 24 Oct 2023 10:50:22 +0200

Merge drm/drm-next into drm-intel-gt-nextWork that needs to land in drm-intel-gt-next depends on two patches onlypresent in drm-intel-next, absence of which is causing a merge conflict: 3b918f4f0c8b ("drm/i915/pxp: Optimize GET_PARAM:PXP_STATUS") ac765b7018f6 ("drm/i915/pxp/mtl: intel_pxp_init_hw needs runtime-pm inside pm-complete")Signed-off-by: Tvrtko Ursulin List of files: /linux/fs/ceph/Makefile

20cd569d7ee8fce24e8753f0f43af6c420557b1f - Merge branch 'for-6.7/config_pm' into for-linus

Wed, 01 Nov 2023 00:07:35 +0100

Merge branch 'for-6.7/config_pm' into for-linus- #ifdef CONFIG_PM removal from HID code (Thomas Weißschuh) List of files: /linux/fs/ceph/Makefile

a940daa52167e9db8ecce82213813b735a9d9f23 - Merge branch 'linus' into smp/core

Tue, 17 Oct 2023 21:40:46 +0200

Merge branch 'linus' into smp/corePull in upstream to get the fixes so depending changes can be applied. List of files: /linux/fs/ceph/Makefile

57390019b68b83f96eb98f490367b9df1f2d77cb - Merge drm/drm-next into drm-misc-next

Wed, 11 Oct 2023 09:50:59 +0200

Merge drm/drm-next into drm-misc-nextUpdating drm-misc-next to the state of Linux v6.6-rc2.Signed-off-by: Thomas Zimmermann List of files: /linux/fs/ceph/Makefile

de80193308f43d3ae52cd3561e8ba77cd1437311 - Merge tag 'v6.6-rc4' into perf/core, to pick up fixes

Tue, 03 Oct 2023 09:32:25 +0200

Merge tag 'v6.6-rc4' into perf/core, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/fs/ceph/Makefile

6f23fc47c1b2ac226704fb7294f43ed3b0965e51 - Merge tag 'v6.6-rc2' into locking/core, to pick up fixes

Mon, 18 Sep 2023 22:17:15 +0200

Merge tag 'v6.6-rc2' into locking/core, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/fs/ceph/Makefile

a3f9e4bc1ec9d8f1e352eb7c1cbaea3168246be7 - Merge drm/drm-next into drm-intel-next

Fri, 15 Sep 2023 10:23:38 +0200

Merge drm/drm-next into drm-intel-nextSync to v6.6-rc1.Signed-off-by: Jani Nikula List of files: /linux/fs/ceph/Makefile

c900529f3d9161bfde5cca0754f83b4d3c3e0220 - Merge drm/drm-fixes into drm-misc-fixes

Tue, 12 Sep 2023 08:53:30 +0200

Merge drm/drm-fixes into drm-misc-fixesForwarding to v6.6-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/fs/ceph/Makefile

7ba2090ca64ea1aa435744884124387db1fac70f - Merge tag 'ceph-for-6.6-rc1' of https://github.com/ceph/ceph-client

Wed, 06 Sep 2023 21:10:15 +0200

Merge tag 'ceph-for-6.6-rc1' of https://github.com/ceph/ceph-clientPull ceph updates from Ilya Dryomov: "Mixed with some fixes and cleanups, this brings in reasonably complete fscrypt support to CephFS! The list of things which don't work with encryption should be fairly short, mostly around the edges: fallocate (not supported well in CephFS to begin with), copy_file_range (requires re-encryption), non-default striping patterns. This was a multi-year effort principally by Jeff Layton with assistance from Xiubo Li, Luís Henriques and others, including several dependant changes in the MDS, netfs helper library and fscrypt framework itself"* tag 'ceph-for-6.6-rc1' of https://github.com/ceph/ceph-client: (53 commits) ceph: make num_fwd and num_retry to __u32 ceph: make members in struct ceph_mds_request_args_ext a union rbd: use list_for_each_entry() helper libceph: do not include crypto/algapi.h ceph: switch ceph_lookup/atomic_open() to use new fscrypt helper ceph: fix updating i_truncate_pagecache_size for fscrypt ceph: wait for OSD requests' callbacks to finish when unmounting ceph: drop messages from MDS when unmounting ceph: update documentation regarding snapshot naming limitations ceph: prevent snapshot creation in encrypted locked directories ceph: add support for encrypted snapshot names ceph: invalidate pages when doing direct/sync writes ceph: plumb in decryption during reads ceph: add encryption support to writepage and writepages ceph: add read/modify/write to ceph_sync_write ceph: align data in pages in ceph_sync_write ceph: don't use special DIO path for encrypted inodes ceph: add truncate size handling support for fscrypt ceph: add object version support for sync read libceph: allow ceph_osdc_new_request to accept a multi-op read ... List of files: /linux/fs/ceph/Makefile

2d332d5bc424404911540006a8bb450fbb96b178 - ceph: fscrypt_auth handling for ceph

Mon, 27 Jul 2020 16:16:09 +0200

ceph: fscrypt_auth handling for cephMost fscrypt-enabled filesystems store the crypto context in an xattr,but that's problematic for ceph as xatts are governed by the XATTR cap,but we really want the crypto context as part of the AUTH cap.Because of this, the MDS has added two new inode metadata fields:fscrypt_auth and fscrypt_file. The former is used to hold the cryptocontext, and the latter is used to track the real file size.Parse new fscrypt_auth and fscrypt_file fields in inode traces. For now,we don't use fscrypt_file, but fscrypt_auth is used to hold the fscryptcontext.Allow the client to use a setattr request for setting the fscrypt_authfield. Since this is not a standard setattr request from the VFS, we adda new field to __ceph_setattr that carries ceph-specific inode attrs.Have the set_context op do a setattr that sets the fscrypt_auth value,and get_context just return the contents of that field (since it shouldalways be available).Signed-off-by: Jeff Layton Reviewed-by: Xiubo Li Reviewed-and-tested-by: Luís Henriques Reviewed-by: Milind Changire Signed-off-by: Ilya Dryomov List of files: /linux/fs/ceph/Makefile

4b4193256c8d3bc3a5397b5cd9494c2ad386317d - Merge branch 'next' into for-linus

Tue, 15 Dec 2020 01:27:23 +0100

Merge branch 'next' into for-linusPrepare input updates for 5.11 merge window. List of files: /linux/fs/ceph/Makefile

05909cd9a0c8811731b38697af13075e8954314f - Merge tag 'v5.9' into next

Wed, 18 Nov 2020 03:13:23 +0100

Merge tag 'v5.9' into nextSync up with mainline to bring in the latest DTS files. List of files: /linux/fs/ceph/Makefile

ead5d1f4d877e92c051e1a1ade623d0d30e71619 - Merge branch 'master' into for-next

Tue, 01 Sep 2020 14:19:48 +0200

Merge branch 'master' into for-nextSync with Linus' branch in order to be able to apply fixupsof more recent patches. List of files: /linux/fs/ceph/Makefile

3b5d1afd1f13bcab85eaa28223ad396694f929e3 - Merge branch 'for-next' into for-linus

Mon, 03 Aug 2020 08:10:08 +0200

Merge branch 'for-next' into for-linus List of files: /linux/fs/ceph/Makefile