From 8c5a5f315d49804fd3fa727dc10464056343863c Mon Sep 17 00:00:00 2001 From: zzzsyyy Date: Wed, 24 Apr 2024 19:50:49 +0800 Subject: linux_xanmod: 6.6.28-xanmod1 -> 6.6.28-xanmod2 (cherry picked from commit b99a510a43b2beafdb253489597400bf45d50063) --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index e94b74fb00d73..d083cc5e2bac0 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -7,7 +7,8 @@ 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"; }; -- cgit 1.4.1 From 14e0588ea26ebcce5b7ce67aa59f9d031f7e96b3 Mon Sep 17 00:00:00 2001 From: zzzsyyy Date: Wed, 24 Apr 2024 19:59:22 +0800 Subject: linux_xanmod_latest: 6.8.7-xanmod1 -> 6.8.7-xanmod2 (cherry picked from commit 2b53188c8dc5ca681094967b091f168f071c029a) --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index d083cc5e2bac0..0666ecf6169e0 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -14,7 +14,8 @@ let mainVariant = { version = "6.8.7"; - hash = "sha256-S9UooZhMtvfyL2BVUfMBxvPLkZvXm37duWSjcpk5dvY="; + suffix = "xanmod2"; + hash = "sha256-/RhtRASEedYI4Zf9pUiiyDD3SgOL46cutTXo68gjBg8="; variant = "main"; }; -- cgit 1.4.1 From e6c94a6176c42a62a4b226f36d9a2c65db285965 Mon Sep 17 00:00:00 2001 From: zzzsyyy Date: Wed, 24 Apr 2024 20:08:10 +0800 Subject: xanmod-kernels: disable writeback throttling by default follows the commit https://gitlab.com/xanmod/linux/-/commit/b5ad63a6135deb8498ef4476a0a257600ffceafd (cherry picked from commit ddf4c3d5dce50403692407e39aa863545c8d930c) --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 0666ecf6169e0..8d87ee3598ec6 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -47,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 = { -- cgit 1.4.1