about summary refs log tree commit diff
path: root/pkgs/os-specific/linux/kernel/common-config.nix
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2024-03-25 14:00:25 +0100
committerK900 <me@0upti.me>2024-03-27 09:04:19 +0300
commitb9b838fe2d0a2cdb29308d0d03cdaf9a43923073 (patch)
tree9fe6008db76639cf3704f41ef9577b9d940a601d /pkgs/os-specific/linux/kernel/common-config.nix
parentaad4e3686181f29d8d5ebd0fb1becc8e1c5a86ae (diff)
linux_testing: 6.8-rc7 -> 6.9-rc1
DAMON_DBGFS has been renamed to DAMON_DBGFS_DEPRECATED.  Let's just
drop it now.

(cherry picked from commit c7a64c7213bdd765b90641549f5365b78b779776)
Diffstat (limited to 'pkgs/os-specific/linux/kernel/common-config.nix')
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 82dd1c41c1a6e..1749fcbbcbfef 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -132,7 +132,7 @@ let
       DAMON_VADDR = whenAtLeast "5.15" yes;
       DAMON_PADDR = whenAtLeast "5.16" yes;
       DAMON_SYSFS = whenAtLeast "5.18" yes;
-      DAMON_DBGFS = whenAtLeast "5.15" yes;
+      DAMON_DBGFS = whenBetween "5.15" "6.9" yes;
       DAMON_RECLAIM = whenAtLeast "5.16" yes;
       DAMON_LRU_SORT = whenAtLeast "6.0" yes;
     };
@@ -452,7 +452,7 @@ let
       EXT4_FS_SECURITY  = yes;
       EXT4_ENCRYPTION   = whenOlder "5.1" yes;
 
-      NTFS_FS            = whenAtLeast "5.15" no;
+      NTFS_FS            = whenBetween "5.15" "6.9" no;
       NTFS3_LZX_XPRESS   = whenAtLeast "5.15" yes;
       NTFS3_FS_POSIX_ACL = whenAtLeast "5.15" yes;