about summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2024-05-01 18:01:22 +0000
committerGitHub <noreply@github.com>2024-05-01 18:01:22 +0000
commit67f8ba4a30028468182899667963ca1ad074224d (patch)
treea98f430f6bde3e78136139d40e784197ede6d45b /pkgs/os-specific
parent2b32fd65a31d54e9858734ad488df2a6434b4e8a (diff)
parent6b39739b77c4ab3f39ee3276677ce94af3e2b39c (diff)
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/kernel/xanmod-kernels.nix9
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index e94b74fb00d73..8d87ee3598ec6 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -7,13 +7,15 @@ let
   # kernel config in the xanmod version commit
   ltsVariant = {
     version = "6.6.28";
-    hash = "sha256-0ld4pZIddfkGytxzqgC7AGD3gc2H9mhZbhpbFLD3G+s=";
+    suffix = "xanmod2";
+    hash = "sha256-U5L7i/g808GuUZhLjHE+v0VOQVdTPe+Tnx/rLQoGxx4=";
     variant = "lts";
   };
 
   mainVariant = {
     version = "6.8.7";
-    hash = "sha256-S9UooZhMtvfyL2BVUfMBxvPLkZvXm37duWSjcpk5dvY=";
+    suffix = "xanmod2";
+    hash = "sha256-/RhtRASEedYI4Zf9pUiiyDD3SgOL46cutTXo68gjBg8=";
     variant = "main";
   };
 
@@ -45,6 +47,9 @@ let
       HZ = freeform "250";
       HZ_250 = yes;
       HZ_1000 = no;
+
+      # Disable writeback throttling by default
+      BLK_WBT_MQ = lib.mkOverride 60 no;
     };
 
     extraMeta = {